aboutsummaryrefslogtreecommitdiffstats
path: root/XMonad/Util
diff options
context:
space:
mode:
authorSpencer Janssen <sjanssen@cse.unl.edu>2007-11-11 22:53:14 +0100
committerSpencer Janssen <sjanssen@cse.unl.edu>2007-11-11 22:53:14 +0100
commit59fde890b1a2446389c772edd7bff8cb895024db (patch)
treec1cdb1d04565b41eb87bd6bfaf1259a22a822e55 /XMonad/Util
parent970ea52bb7d2379390b3acdb03a8e2fa2e923ccb (diff)
downloadXMonadContrib-59fde890b1a2446389c772edd7bff8cb895024db.tar.gz
XMonadContrib-59fde890b1a2446389c772edd7bff8cb895024db.tar.xz
XMonadContrib-59fde890b1a2446389c772edd7bff8cb895024db.zip
EZConfig: update for kind change in XConfig
darcs-hash:20071111215314-a5988-674cf3cd3c85ae1874c74dd5cfa41579d32c039b.gz
Diffstat (limited to 'XMonad/Util')
-rw-r--r--XMonad/Util/EZConfig.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/XMonad/Util/EZConfig.hs b/XMonad/Util/EZConfig.hs
index d2c0c5e..32f087b 100644
--- a/XMonad/Util/EZConfig.hs
+++ b/XMonad/Util/EZConfig.hs
@@ -32,24 +32,24 @@ import Graphics.X11.Xlib
-- Note that, unlike in xmonad 0.4 and previous, you can't use modMask to refer
-- to the modMask you configured earlier. You must specify mod1Mask (or
-- whichever), or add your own @myModMask = mod1Mask@ line.
-additionalKeys :: XConfig -> [((ButtonMask, KeySym), X ())] -> XConfig
+additionalKeys :: XConfig a -> [((ButtonMask, KeySym), X ())] -> XConfig a
additionalKeys conf keysList =
conf { keys = \cnf -> M.union (M.fromList keysList) (keys conf cnf) }
-- Remove standard keybidings you're not using. Example use:
-- > main = xmonad $ defaultConfig { terminal = "urxvt" }
-- > `removeKeys` [(mod1Mask .|. shiftMask, n) | n <- [xK_1 .. xK_9]]
-removeKeys :: XConfig -> [(ButtonMask, KeySym)] -> XConfig
+removeKeys :: XConfig a -> [(ButtonMask, KeySym)] -> XConfig a
removeKeys conf keyList =
conf { keys = \cnf -> keys conf cnf `M.difference` M.fromList (zip keyList $ return ()) }
-- Like additionalKeys, but for mouseBindings.
-additionalMouseBindings :: XConfig -> [((ButtonMask, Button), Window -> X ())] -> XConfig
+additionalMouseBindings :: XConfig a -> [((ButtonMask, Button), Window -> X ())] -> XConfig a
additionalMouseBindings conf mouseBindingsList =
conf { mouseBindings = \cnf -> M.union (M.fromList mouseBindingsList) (mouseBindings conf cnf) }
-- Like removeKeys, but for mouseBindings.
-removeMouseBindings :: XConfig -> [(ButtonMask, Button)] -> XConfig
+removeMouseBindings :: XConfig a -> [(ButtonMask, Button)] -> XConfig a
removeMouseBindings conf mouseBindingList =
conf { mouseBindings = \cnf -> mouseBindings conf cnf `M.difference`
M.fromList (zip mouseBindingList $ return ()) }