aboutsummaryrefslogtreecommitdiffstats
path: root/XMonad/Actions/WindowNavigation.hs
diff options
context:
space:
mode:
authorAdam Vogt <vogt.adam@gmail.com>2009-10-22 06:11:26 +0200
committerAdam Vogt <vogt.adam@gmail.com>2009-10-22 06:11:26 +0200
commit36728ae60e3effdfe645a9a34cfd2e1067a37516 (patch)
tree153d6eaf1780df2802bb8e5acefac9cbeda4d849 /XMonad/Actions/WindowNavigation.hs
parent0c9f1ac69bad6af19f3129ec50c4899bac5c149a (diff)
downloadXMonadContrib-36728ae60e3effdfe645a9a34cfd2e1067a37516.tar.gz
XMonadContrib-36728ae60e3effdfe645a9a34cfd2e1067a37516.tar.xz
XMonadContrib-36728ae60e3effdfe645a9a34cfd2e1067a37516.zip
Refer to modm as the current modMask
Ignore-this: d097c7dc1746c55e1d4078a7148f9d5a This makes the config suggestions consistent with the current template. darcs-hash:20091022041126-1499c-5dd63076fdd71a61276cfc8e648bada81d9cc586.gz
Diffstat (limited to 'XMonad/Actions/WindowNavigation.hs')
-rw-r--r--XMonad/Actions/WindowNavigation.hs18
1 files changed, 9 insertions, 9 deletions
diff --git a/XMonad/Actions/WindowNavigation.hs b/XMonad/Actions/WindowNavigation.hs
index a4769eb..6b721ec 100644
--- a/XMonad/Actions/WindowNavigation.hs
+++ b/XMonad/Actions/WindowNavigation.hs
@@ -86,15 +86,15 @@ import Graphics.X11.Xlib
-- - manageHook to draw window decos?
withWindowNavigation :: (KeySym, KeySym, KeySym, KeySym) -> XConfig l -> IO (XConfig l)
-withWindowNavigation (u,l,d,r) conf =
- withWindowNavigationKeys [ ((modMask conf , u), WNGo U),
- ((modMask conf , l), WNGo L),
- ((modMask conf , d), WNGo D),
- ((modMask conf , r), WNGo R),
- ((modMask conf .|. shiftMask, u), WNSwap U),
- ((modMask conf .|. shiftMask, l), WNSwap L),
- ((modMask conf .|. shiftMask, d), WNSwap D),
- ((modMask conf .|. shiftMask, r), WNSwap R) ]
+withWindowNavigation (u,l,d,r) conf@XConfig{modMask=modm} =
+ withWindowNavigationKeys [ ((modm , u), WNGo U),
+ ((modm , l), WNGo L),
+ ((modm , d), WNGo D),
+ ((modm , r), WNGo R),
+ ((modm .|. shiftMask, u), WNSwap U),
+ ((modm .|. shiftMask, l), WNSwap L),
+ ((modm .|. shiftMask, d), WNSwap D),
+ ((modm .|. shiftMask, r), WNSwap R) ]
conf
withWindowNavigationKeys :: [((KeyMask, KeySym), WNAction)] -> XConfig l -> IO (XConfig l)