Revert to old behavior where unmatched keys do not exit the eventloop for A.GridSelect

This commit is contained in:
Adam Vogt
2009-07-27 01:23:02 +00:00
parent b09827c2bc
commit f22c4624a3

View File

@@ -32,7 +32,6 @@ module XMonad.Actions.GridSelect (
colorRangeFromClassName colorRangeFromClassName
) where ) where
import Data.Maybe import Data.Maybe
import Data.Traversable (traverse)
import Data.Bits import Data.Bits
import Control.Applicative import Control.Applicative
import Control.Monad.State import Control.Monad.State
@@ -194,8 +193,8 @@ handle (ks,_) (KeyEvent {ev_event_type = t, ev_state = m })
| t == keyPress && ks == xK_Return = do | t == keyPress && ks == xK_Return = do
(TwoDState { td_curpos = pos, td_elementmap = elmap }) <- get (TwoDState { td_curpos = pos, td_elementmap = elmap }) <- get
return $ fmap (snd . snd) $ findInElementMap pos elmap return $ fmap (snd . snd) $ findInElementMap pos elmap
| t == keyPress = fmap join $ traverse diffAndRefresh . M.lookup (m,ks) | t == keyPress = maybe eventLoop diffAndRefresh . M.lookup (m,ks)
=<< gets (gs_navigate . td_gsconfig) =<< gets (gs_navigate . td_gsconfig)
where diffAndRefresh diff = do where diffAndRefresh diff = do
state <- get state <- get
let elmap = td_elementmap state let elmap = td_elementmap state