summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Vogt <vogt.adam@gmail.com>2010-01-18 17:22:56 +0100
committerAdam Vogt <vogt.adam@gmail.com>2010-01-18 17:22:56 +0100
commitf166d6e947a048812b5d7198def7dc6f57288042 (patch)
tree88a51ea5551ef367d2a2ed3657793248f15a0ba5
parentea1566b787bca0766233d0d300658d2acd8a2b9d (diff)
downloadmetatile-f166d6e947a048812b5d7198def7dc6f57288042.tar
metatile-f166d6e947a048812b5d7198def7dc6f57288042.zip
Rename numlockMask to numberlockMask to help users of the template config.
Ignore-this: 4050ed2d1ad373386c2e2b44145f07d9 Without the change, the errors are like: > [ unrelated error messages ] > No constructor has all these fields: `numlockMask', > `terminal', [every other field set] With the change: > `numlockMask' is not a record selector > [ context where numlockMask is named ] darcs-hash:20100118162256-1499c-c473138c7c8589e7a40fa17675fd5cafe2dc4c11
-rw-r--r--XMonad/Core.hs2
-rw-r--r--XMonad/Main.hsc4
-rw-r--r--XMonad/Operations.hs4
3 files changed, 5 insertions, 5 deletions
diff --git a/XMonad/Core.hs b/XMonad/Core.hs
index f8f337b..abe5485 100644
--- a/XMonad/Core.hs
+++ b/XMonad/Core.hs
@@ -64,7 +64,7 @@ data XState = XState
, mapped :: !(S.Set Window) -- ^ the Set of mapped windows
, waitingUnmap :: !(M.Map Window Int) -- ^ the number of expected UnmapEvents
, dragging :: !(Maybe (Position -> Position -> X (), X ()))
- , numlockMask :: !KeyMask -- ^ The numlock modifier
+ , numberlockMask :: !KeyMask -- ^ The numlock modifier
, extensibleState :: !(M.Map String (Either String StateExtension))
-- ^ stores custom state information.
--
diff --git a/XMonad/Main.hsc b/XMonad/Main.hsc
index d2cddf2..7358a36 100644
--- a/XMonad/Main.hsc
+++ b/XMonad/Main.hsc
@@ -121,7 +121,7 @@ xmonad initxmc = do
st = XState
{ windowset = initialWinset
- , numlockMask = 0
+ , numberlockMask = 0
, mapped = S.empty
, waitingUnmap = M.empty
, dragging = Nothing
@@ -338,7 +338,7 @@ setNumlockMask = do
then return (setBit 0 (fromIntegral m))
else return (0 :: KeyMask)
| (m, kcs) <- ms, kc <- kcs, kc /= 0]
- modify (\s -> s { numlockMask = foldr (.|.) 0 xs })
+ modify (\s -> s { numberlockMask = foldr (.|.) 0 xs })
-- | Grab the keys back
grabKeys :: X ()
diff --git a/XMonad/Operations.hs b/XMonad/Operations.hs
index 9614d47..d784951 100644
--- a/XMonad/Operations.hs
+++ b/XMonad/Operations.hs
@@ -388,13 +388,13 @@ isClient w = withWindowSet $ return . W.member w
-- (numlock and capslock)
extraModifiers :: X [KeyMask]
extraModifiers = do
- nlm <- gets numlockMask
+ nlm <- gets numberlockMask
return [0, nlm, lockMask, nlm .|. lockMask ]
-- | Strip numlock\/capslock from a mask
cleanMask :: KeyMask -> X KeyMask
cleanMask km = do
- nlm <- gets numlockMask
+ nlm <- gets numberlockMask
return (complement (nlm .|. lockMask) .&. km)
-- | Get the 'Pixel' value for a named color