summaryrefslogtreecommitdiffstats
path: root/XMonad/Core.hs
diff options
context:
space:
mode:
authorSpencer Janssen <spencerjanssen@gmail.com>2009-12-16 02:21:40 +0100
committerSpencer Janssen <spencerjanssen@gmail.com>2009-12-16 02:21:40 +0100
commit8b7697792fdf2124cceb64ae2945098609857346 (patch)
tree03cfec11bef00067f4cad93580cbca51e48879cc /XMonad/Core.hs
parent99120a7f1012b5fa1fe4e9944fffb16686611ef5 (diff)
downloadmetatile-8b7697792fdf2124cceb64ae2945098609857346.tar
metatile-8b7697792fdf2124cceb64ae2945098609857346.zip
Determine numlockMask automatically, fixes #120
Ignore-this: d80c82dd0a23dc7a77fdc32fd2792130 darcs-hash:20091216012140-25a6b-1730d8fef04b735b04475d1772e4825fa44cb318
Diffstat (limited to 'XMonad/Core.hs')
-rw-r--r--XMonad/Core.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/XMonad/Core.hs b/XMonad/Core.hs
index 23394f6..0961235 100644
--- a/XMonad/Core.hs
+++ b/XMonad/Core.hs
@@ -64,12 +64,14 @@ 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
, extensibleState :: !(M.Map String (Either String StateExtension))
-- ^ stores custom state information.
--
-- The module XMonad.Utils.ExtensibleState in xmonad-contrib
-- provides additional information and a simple interface for using this.
}
+
-- | XConf, the (read-only) window manager configuration.
data XConf = XConf
{ display :: Display -- ^ the X11 display
@@ -98,7 +100,6 @@ data XConfig l = XConfig
-- should also be run afterwards. mappend should be used for combining
-- event hooks in most cases.
, workspaces :: ![String] -- ^ The list of workspaces' names
- , numlockMask :: !KeyMask -- ^ The numlock modifier
, modMask :: !KeyMask -- ^ the mod modifier
, keys :: !(XConfig Layout -> M.Map (ButtonMask,KeySym) (X ()))
-- ^ The key binding: a map from key presses and actions