summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSpencer Janssen <sjanssen@cse.unl.edu>2007-09-05 21:35:58 +0200
committerSpencer Janssen <sjanssen@cse.unl.edu>2007-09-05 21:35:58 +0200
commit0d9bb7b163c6536bfc934f2edc3d5cec1cfcd6ae (patch)
tree272177c9d67a688cd0511919107ce9cd4df858d9
parent4810f5b9b3a7b97eb633e5b154ce4ece9dd769ba (diff)
downloadmetatile-0d9bb7b163c6536bfc934f2edc3d5cec1cfcd6ae.tar
metatile-0d9bb7b163c6536bfc934f2edc3d5cec1cfcd6ae.zip
Alex Tarkovsky's docstring patch updated for conflicts
darcs-hash:20070905193558-a5988-a01c97061e0d33bd1415d2d45eb2331544f85b83
-rw-r--r--Config.hs12
1 files changed, 10 insertions, 2 deletions
diff --git a/Config.hs b/Config.hs
index 34dae0e..087e76a 100644
--- a/Config.hs
+++ b/Config.hs
@@ -91,7 +91,12 @@ borderWidth = 1
-- The default set of tiling algorithms
--
defaultLayouts :: [Layout Window]
-defaultLayouts = [ tiled , mirror tiled , full ]
+defaultLayouts = [ tiled
+ , mirror tiled
+ , full
+
+ -- Extension-provided layouts
+ ]
where
-- default tiling algorithm partitions the screen into two panes
tiled = tall nmaster delta ratio
@@ -158,6 +163,7 @@ keys = M.fromList $
-- quit, or restart
, ((modMask .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) -- @@ Quit xmonad
, ((modMask , xK_q ), restart Nothing True) -- @@ Restart xmonad
+ -- Extension-provided key bindings
] ++
-- mod-[1..9] @@ Switch to workspace N
@@ -183,4 +189,6 @@ mouseBindings = M.fromList $
-- mod-button2 @@ Raise the window to the top of the stack
, ((modMask, button2), (\w -> focus w >> swapMaster))
-- mod-button3 @@ Set the window to floating mode and resize by dragging
- , ((modMask, button3), (\w -> focus w >> mouseResizeWindow w)) ]
+ , ((modMask, button3), (\w -> focus w >> mouseResizeWindow w))
+ -- Extension-provided mouse bindings
+ ]