From 04cd43d8c2cd0fe0b1631c91687a2050af84fe59 Mon Sep 17 00:00:00 2001 From: Aleksandar Dimitrov Date: Mon, 1 Dec 2008 13:09:28 +0100 Subject: Fix boolean operator precedence in GridSelect keybindings The vim-like hjkl keys were ORed to the key event AND arrow keys. darcs-hash:20081201120928-62c0c-d4e57aca38d45519691a73c1a2f41eb6269239d6.gz --- XMonad/Actions/GridSelect.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'XMonad/Actions/GridSelect.hs') diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs index 76066f2..d306cdb 100644 --- a/XMonad/Actions/GridSelect.hs +++ b/XMonad/Actions/GridSelect.hs @@ -163,10 +163,10 @@ handle :: (KeySym, String) -> StateT TwoDState X (Maybe Window) handle (ks,_) (KeyEvent {ev_event_type = t}) | t == keyPress && ks == xK_Escape = return Nothing - | t == keyPress && ks == xK_Left || ks == xK_h = diffAndRefresh (-1,0) - | t == keyPress && ks == xK_Right || ks == xK_l = diffAndRefresh (1,0) - | t == keyPress && ks == xK_Down || ks == xK_j = diffAndRefresh (0,1) - | t == keyPress && ks == xK_Up || ks == xK_k = diffAndRefresh (0,-1) + | t == keyPress && (ks == xK_Left || ks == xK_h) = diffAndRefresh (-1,0) + | t == keyPress && (ks == xK_Right || ks == xK_l) = diffAndRefresh (1,0) + | t == keyPress && (ks == xK_Down || ks == xK_j) = diffAndRefresh (0,1) + | t == keyPress && (ks == xK_Up || ks == xK_k) = diffAndRefresh (0,-1) | t == keyPress && ks == xK_Return = do (TwoDState { td_curpos = pos, td_windowmap = winmap }) <- get return $ fmap (snd . snd) $ findInWindowMap pos winmap -- cgit v1.2.3