twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-07 23:41:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

strip numlock from mask in X.Prompt(fixes #37)

Browse Source
This commit is contained in:
Bogdan Sinitsyn
2016-02-14 14:51:00 +03:00
parent d5eb7316d1
commit 30f657a437
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
XMonad/Prompt.hs
View File

@@ -500,14 +500,15 @@ handle ks@(sym,_) e@(KeyEvent {ev_event_type = t, ev_state = m}) = do
complKey <- gets $ completionKey . config complKey <- gets $ completionKey . config
chgModeKey <- gets $ changeModeKey . config chgModeKey <- gets $ changeModeKey . config
c <- getCompletions c <- getCompletions
mCleaned <- cleanMask m
when (length c > 1) $ modify (\s -> s { showComplWin = True }) when (length c > 1) $ modify (\s -> s { showComplWin = True })
if complKey == (m,sym) if complKey == (mCleaned,sym)
then completionHandle c ks e then completionHandle c ks e
else if (sym == chgModeKey) then else if (sym == chgModeKey) then
do do
modify setNextMode modify setNextMode
updateWindows updateWindows
else when (t == keyPress) $ keyPressHandle m ks else when (t == keyPress) $ keyPressHandle mCleaned ks
handle _ (ExposeEvent {ev_window = w}) = do handle _ (ExposeEvent {ev_window = w}) = do
st <- get st <- get
when (win st == w) updateWindows when (win st == w) updateWindows
@@ -518,8 +519,9 @@ completionHandle :: [String] -> KeyStroke -> Event -> XP ()
completionHandle c ks@(sym,_) (KeyEvent { ev_event_type = t, ev_state = m }) = do completionHandle c ks@(sym,_) (KeyEvent { ev_event_type = t, ev_state = m }) = do
complKey <- gets $ completionKey . config complKey <- gets $ completionKey . config
alwaysHlight <- gets $ alwaysHighlight . config alwaysHlight <- gets $ alwaysHighlight . config
mCleaned <- cleanMask m
case () of case () of
() | t == keyPress && (m,sym) == complKey -> () | t == keyPress && (mCleaned,sym) == complKey ->
do do
st <- get st <- get
let updateState l = case alwaysHlight of let updateState l = case alwaysHlight of
@@ -535,8 +537,8 @@ completionHandle c ks@(sym,_) (KeyEvent { ev_event_type = t, ev_state = m }) = d
[] -> updateWindows >> eventLoop handle [] -> updateWindows >> eventLoop handle
[x] -> updateState [x] >> getCompletions >>= updateWins [x] -> updateState [x] >> getCompletions >>= updateWins
l -> updateState l >> updateWins l l -> updateState l >> updateWins l
| t == keyRelease && (m,sym) == complKey -> eventLoop (completionHandle c) | t == keyRelease && (mCleaned,sym) == complKey -> eventLoop (completionHandle c)
| otherwise -> keyPressHandle m ks -- some other key, handle it normally | otherwise -> keyPressHandle mCleaned ks -- some other key, handle it normally
-- some other event: go back to main loop -- some other event: go back to main loop
completionHandle _ k e = handle k e completionHandle _ k e = handle k e
@@ -674,12 +676,11 @@ emacsLikeXPKeymap' p = M.fromList $
keyPressHandle :: KeyMask -> KeyStroke -> XP () keyPressHandle :: KeyMask -> KeyStroke -> XP ()
keyPressHandle m (ks,str) = do keyPressHandle m (ks,str) = do
km <- gets (promptKeymap . config) km <- gets (promptKeymap . config)
kmask <- cleanMask m -- mask is defined in ghc7 case M.lookup (m,ks) km of
case M.lookup (kmask,ks) km of
Just action -> action >> updateWindows Just action -> action >> updateWindows
Nothing -> case str of Nothing -> case str of
"" -> eventLoop handle "" -> eventLoop handle
_ -> when (kmask .&. controlMask == 0) $ do _ -> when (m .&. controlMask == 0) $ do
let str' = if isUTF8Encoded str let str' = if isUTF8Encoded str
then decodeString str then decodeString str
else str else str