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

Add multiple key support for completion key

Browse Source 
This patch enables support for key binding like Ctrl + i which was not
previously possible. Technically, this changes the type of completionKey
from KeySym to (KeyMask, KeySym).
This commit is contained in:
Sibi Prabakaran
2015-12-13 10:46:05 +05:30
parent b23f56d65d
commit 727e214195
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
XMonad/Prompt.hs
View File

@@ -4,6 +4,7 @@
-- | -- |
-- Module : XMonad.Prompt -- Module : XMonad.Prompt
-- Copyright : (C) 2007 Andrea Rossato, 2015 Evgeny Kurnevsky -- Copyright : (C) 2007 Andrea Rossato, 2015 Evgeny Kurnevsky
-- 2015 Sibi Prabakaran
-- License : BSD3 -- License : BSD3
-- --
-- Maintainer : Spencer Janssen <spencerjanssen@gmail.com> -- Maintainer : Spencer Janssen <spencerjanssen@gmail.com>
@@ -144,7 +145,7 @@ data XPConfig =
-- history entries to remember -- history entries to remember
, promptKeymap :: M.Map (KeyMask,KeySym) (XP ()) , promptKeymap :: M.Map (KeyMask,KeySym) (XP ())
-- ^ Mapping from key combinations to actions -- ^ Mapping from key combinations to actions
, completionKey :: KeySym -- ^ Key that should trigger completion , completionKey :: (KeyMask, KeySym) -- ^ Key that should trigger completion
, changeModeKey :: KeySym -- ^ Key to change mode (when the prompt has multiple modes) , changeModeKey :: KeySym -- ^ Key to change mode (when the prompt has multiple modes)
, defaultText :: String -- ^ The text by default in the prompt line , defaultText :: String -- ^ The text by default in the prompt line
, autoComplete :: Maybe Int -- ^ Just x: if only one completion remains, auto-select it, , autoComplete :: Maybe Int -- ^ Just x: if only one completion remains, auto-select it,
@@ -242,7 +243,7 @@ instance Default XPConfig where
, borderColor = "white" , borderColor = "white"
, promptBorderWidth = 1 , promptBorderWidth = 1
, promptKeymap = defaultXPKeymap , promptKeymap = defaultXPKeymap
, completionKey = xK_Tab , completionKey = (0,xK_Tab)
, changeModeKey = xK_grave , changeModeKey = xK_grave
, position = Bottom , position = Bottom
, height = 18 , height = 18
@@ -489,7 +490,7 @@ handle ks@(sym,_) e@(KeyEvent {ev_event_type = t, ev_state = m}) = do
chgModeKey <- gets $ changeModeKey . config chgModeKey <- gets $ changeModeKey . config
c <- getCompletions c <- getCompletions
when (length c > 1) $ modify (\s -> s { showComplWin = True }) when (length c > 1) $ modify (\s -> s { showComplWin = True })
if complKey == sym if complKey == (m,sym)
then completionHandle c ks e then completionHandle c ks e
else if (sym == chgModeKey) then else if (sym == chgModeKey) then
do do
@@ -507,7 +508,7 @@ completionHandle c ks@(sym,_) (KeyEvent { ev_event_type = t, ev_state = m }) = d
complKey <- gets $ completionKey . config complKey <- gets $ completionKey . config
alwaysHlight <- gets $ alwaysHighlight . config alwaysHlight <- gets $ alwaysHighlight . config
case () of case () of
() | t == keyPress && sym == complKey -> () | t == keyPress && (m,sym) == complKey ->
do do
st <- get st <- get
let updateState l = case alwaysHlight of let updateState l = case alwaysHlight of
@@ -523,7 +524,7 @@ 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 && sym == complKey -> eventLoop (completionHandle c) | t == keyRelease && (m,sym) == complKey -> eventLoop (completionHandle c)
| otherwise -> keyPressHandle m ks -- some other key, handle it normally | otherwise -> keyPressHandle m 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