summaryrefslogtreecommitdiffstats
path: root/XMonad/Config.hs
diff options
context:
space:
mode:
authorDavid Roundy <droundy@darcs.net>2007-11-11 01:30:55 +0100
committerDavid Roundy <droundy@darcs.net>2007-11-11 01:30:55 +0100
commit791029f1e6b1320754314a36e75485cd44298c3d (patch)
tree01afca187cedba61f602a9f9de81e71353042bf1 /XMonad/Config.hs
parentc87dcd06f344a9bb650aaeaeea200169f343650a (diff)
downloadmetatile-791029f1e6b1320754314a36e75485cd44298c3d.tar
metatile-791029f1e6b1320754314a36e75485cd44298c3d.zip
hide existential Layout (mostly) from user API.
darcs-hash:20071111003055-72aca-77eb2071cd596e0e13746413807f375d199dbe32
Diffstat (limited to 'XMonad/Config.hs')
-rw-r--r--XMonad/Config.hs7
1 files changed, 3 insertions, 4 deletions
diff --git a/XMonad/Config.hs b/XMonad/Config.hs
index 1cab6a3..a645207 100644
--- a/XMonad/Config.hs
+++ b/XMonad/Config.hs
@@ -173,7 +173,7 @@ terminal = "xterm"
--
-- (The comment formatting character is used when generating the manpage)
--
-keys :: XConfig -> M.Map (KeyMask, KeySym) (X ())
+keys :: XConfig Layout -> M.Map (KeyMask, KeySym) (X ())
keys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
-- launching and killing programs
[ ((modMask .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf) -- %! Launch terminal
@@ -234,7 +234,7 @@ keys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
-- | Mouse bindings: default actions bound to mouse events
--
-mouseBindings :: XConfig -> M.Map (KeyMask, Button) (Window -> X ())
+mouseBindings :: XConfig Layout -> M.Map (KeyMask, Button) (Window -> X ())
mouseBindings (XConfig {XMonad.modMask = modMask}) = M.fromList $
-- mod-button1 %! Set the window to floating mode and move by dragging
[ ((modMask, button1), (\w -> focus w >> mouseMoveWindow w))
@@ -250,12 +250,11 @@ mouseBindings (XConfig {XMonad.modMask = modMask}) = M.fromList $
-- % Extension-provided definitions
-- | And, finally, the default set of configuration values itself
-defaultConfig :: XConfig
defaultConfig = XConfig
{ XMonad.borderWidth = borderWidth
, XMonad.workspaces = workspaces
, XMonad.defaultGaps = defaultGaps
- , XMonad.layoutHook = Layout layout
+ , XMonad.layoutHook = layout
, XMonad.terminal = terminal
, XMonad.normalBorderColor = normalBorderColor
, XMonad.focusedBorderColor = focusedBorderColor