summaryrefslogtreecommitdiffstats
path: root/XMonad/Stockholm/Submap.hs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-02-12 14:17:49 +0100
committertv <tv@krebsco.de>2016-02-12 14:17:49 +0100
commit179d29fd4c765dee698058ef63295331ac603639 (patch)
treed3ccc2963bcaeffc3fda2cf661c636e91903e8d5 /XMonad/Stockholm/Submap.hs
parent2dbefe42fc5cfe9093465bf3e22ba8f82feeef6e (diff)
hello xmonad-0.12; silence all the warningsprism/tvcd/master
Diffstat (limited to 'XMonad/Stockholm/Submap.hs')
-rw-r--r--XMonad/Stockholm/Submap.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/XMonad/Stockholm/Submap.hs b/XMonad/Stockholm/Submap.hs
index 8648e6c..601afba 100644
--- a/XMonad/Stockholm/Submap.hs
+++ b/XMonad/Stockholm/Submap.hs
@@ -12,8 +12,8 @@ import XMonad hiding (keys)
-- | Like 'XMonad.Actions.Submap.submapDefault', but provides the looked up string to the default action.
submapString :: (String -> X ()) -> M.Map (KeyMask, KeySym) (X ()) -> X ()
-submapString def keys = do
- XConf { theRoot = root, display = d } <- ask
+submapString defAction keys = do
+ XConf { display = d } <- ask
(m, s, str) <- io $ allocaXEvent $ \p -> fix $ \nextkey -> do
maskEvent d keyPressMask p
@@ -22,10 +22,10 @@ submapString def keys = do
if isModifierKey keysym
then nextkey
else do
- (mbKeysym, str) <- lookupString (asKeyEvent p)
+ (_, str) <- lookupString (asKeyEvent p)
return (m, keysym, str)
-- Remove num lock mask and Xkb group state bits
m' <- cleanMask $ m .&. ((1 `shiftL` 12) - 1)
- maybe (def str) id (M.lookup (m', s) keys)
+ maybe (defAction str) id (M.lookup (m', s) keys)