diff options
author | Spencer Janssen <sjanssen@cse.unl.edu> | 2007-11-02 03:59:24 +0100 |
---|---|---|
committer | Spencer Janssen <sjanssen@cse.unl.edu> | 2007-11-02 03:59:24 +0100 |
commit | 06e9858d09160d03a2c57b0752ff47ade8561c2b (patch) | |
tree | 00578133f4560efa14bd4f5b2ab7f321a11dbc25 /XMonad.hs | |
parent | 6b928e8ceb91451014fbd1578709d5928f940645 (diff) | |
download | xmonad-06e9858d09160d03a2c57b0752ff47ade8561c2b.tar.gz xmonad-06e9858d09160d03a2c57b0752ff47ade8561c2b.tar.xz xmonad-06e9858d09160d03a2c57b0752ff47ade8561c2b.zip |
Float handler out of makeMain, make keys and mouseBindings dependent on XConfig for easy modMask switching
darcs-hash:20071102025924-a5988-bbddb07ed8c00cb4279db059f2513eba4ce3ecb5.gz
Diffstat (limited to 'XMonad.hs')
-rw-r--r-- | XMonad.hs | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -51,7 +51,12 @@ data XConf = XConf , config :: !XConfig -- ^ initial user configuration , theRoot :: !Window -- ^ the root window , normalBorder :: !Pixel -- ^ border color of unfocused windows - , focusedBorder :: !Pixel } -- ^ border color of the focused window + , focusedBorder :: !Pixel -- ^ border color of the focused window + , keyActions :: !(M.Map (KeyMask, KeySym) (X ())) + -- ^ a mapping of key presses to actions + , buttonActions :: !(M.Map (KeyMask, Button) (Window -> X ())) + -- ^ a mapping of button presses to actions + } -- todo, better name data XConfig = XConfig { normalBorderColor :: !String @@ -61,9 +66,10 @@ data XConfig = XConfig { normalBorderColor :: !String , manageHook :: !(Window -> String -> String -> String -> X (WindowSet -> WindowSet)) , workspaces :: ![String] , defaultGaps :: ![(Int,Int,Int,Int)] - , numlockMask :: KeyMask - , keys :: !(M.Map (ButtonMask,KeySym) (X ())) - , mouseBindings :: !(M.Map (ButtonMask, Button) (Window -> X ())) + , numlockMask :: !KeyMask + , modMask :: !KeyMask + , keys :: !(XConfig -> M.Map (ButtonMask,KeySym) (X ())) + , mouseBindings :: !(XConfig -> M.Map (ButtonMask, Button) (Window -> X ())) , borderWidth :: !Dimension , logHook :: !(X ()) } |