diff options
author | Daniel Schoepe <daniel.schoepe@gmail.com> | 2009-09-28 11:19:46 +0200 |
---|---|---|
committer | Daniel Schoepe <daniel.schoepe@gmail.com> | 2009-09-28 11:19:46 +0200 |
commit | 31d5db467ae510b75f2e815eab7042f03e8e37c6 (patch) | |
tree | cfc11a5a910ff836442fa427a0a863d4f52047b4 /XMonad | |
parent | b03f8e33706718b1f3c4bda8dc4a058911645557 (diff) | |
download | XMonadContrib-31d5db467ae510b75f2e815eab7042f03e8e37c6.tar.gz XMonadContrib-31d5db467ae510b75f2e815eab7042f03e8e37c6.tar.xz XMonadContrib-31d5db467ae510b75f2e815eab7042f03e8e37c6.zip |
Fix for issue 315
Ignore-this: 7de748d6cbd143b073451ba92ecec659
darcs-hash:20090928091946-7f603-5b282d63ae1aab1911f7735c3b6a16ab53525321.gz
Diffstat (limited to 'XMonad')
-rw-r--r-- | XMonad/Prompt.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs index 07f80c0..fa0c8f4 100644 --- a/XMonad/Prompt.hs +++ b/XMonad/Prompt.hs @@ -345,7 +345,7 @@ handle ks@(sym,_) e@(KeyEvent {ev_event_type = t, ev_state = m}) = do when (length c > 1) $ modify (\s -> s { showComplWin = True }) if complKey == sym then completionHandle c ks e - else when (t == keyPress) $ cleanMask m >>= flip keyPressHandle ks + else when (t == keyPress) $ keyPressHandle m ks handle _ (ExposeEvent {ev_window = w}) = do st <- get when (win st == w) updateWindows @@ -424,8 +424,9 @@ defaultXPKeymap = M.fromList $ ] keyPressHandle :: KeyMask -> KeyStroke -> XP () -keyPressHandle mask (ks,str) = do +keyPressHandle m (ks,str) = do km <- gets (promptKeymap . config) + mask <- cleanMask m case M.lookup (mask,ks) km of Just action -> action >> updateWindows Nothing -> case str of |