From a28db8934185db9196420b3ba07204e5053f81d0 Mon Sep 17 00:00:00 2001 From: David Roundy Date: Sun, 11 Nov 2007 01:30:55 +0100 Subject: hide existential Layout (mostly) from user API. darcs-hash:20071111003055-72aca-77eb2071cd596e0e13746413807f375d199dbe32.gz --- XMonad/Config.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'XMonad/Config.hs') 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 -- cgit v1.2.3