xmonad.hs: Update version requirements.

[config/dotfiles.git] / xmonad.hs

diff --git a/xmonad.hs b/xmonad.hs
index 367c93be01aa7c2d3efa19fa28f3a879e5c7e3b7..395d449cffd2c06aac43da9af34a0bed4a1ef643 100644 (file)
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -1,9 +1,10 @@
--- XMonad configuration file.
+-- xmonad configuration file.
 --
--- Should work fine with XMonad 0.7 and above.
+-- Tested with xmonad 0.9, most settings should work fine with xmonad 0.7.
 
 
-import XMonad
+-- "hiding" necessary for LayoutCombinators.
+import XMonad hiding ( (|||) )
 -- Necessary for reflectVert.
 import XMonad.Layout.Reflect
 -- Necessary for avoidMaster.
@@ -20,6 +21,12 @@ import XMonad.Util.EZConfig
 import XMonad.Hooks.SetWMName
 -- Necessary for toggleWS.
 import XMonad.Actions.CycleWS
+-- Necessary for named.
+import XMonad.Layout.Named
+-- Necessary for JumpToLayout.
+import XMonad.Layout.LayoutCombinators
+-- Necessary for Limit layout.
+import XMonad.Layout.TwoPane
 
 
 -- Prevent new windows from spawning in the master pane. Taken from
@@ -34,7 +41,8 @@ avoidMaster = W.modify' $ \c -> case c of
 
 -- Create my custom layout.
 --
--- Only use horizontal (Mirror tiled) and fullscreen layouts.
+-- Only use horizontal (Mirror tiled) and fullscreen layouts, but allow
+-- switching to other layouts with bindings.
 --
 -- The master pane is at the top of the screen. To make sure new windows don't
 -- spawn in the master pane avoidMaster (see below) is used. Borders are only
@@ -43,10 +51,18 @@ avoidMaster = W.modify' $ \c -> case c of
 -- Thanks to jrick in #xmonad on Freenode (2009-06-29 22:19 CEST) for telling
 -- me how to remove the vertical tiled layout.
 --
--- toggleLayouts is used to allow switching to vertical tiled layout but not
--- using it with meta-space (see below in key bindings). Thanks to ml| in
--- #xmonad on Freenode (2010-06-14 09:49 CEST) how to use toggleLayouts.
-myLayoutHook = toggleLayouts tiled $ smartBorders $ Mirror tiled ||| Full
+-- JumpToLayout (from LayoutCombinators) is used to jump to specific layouts,
+-- thanks to aavogt in #xmonad on Freenode (2011-06-12 22:13 CEST).
+--
+-- named is used to name layouts which allows switching to a specific layout
+-- (see below), thanks to vav in #xmonad on Freenode (2011-06-12 22:28 CEST).
+--
+-- The limit layout displays only one window in the lower pane, thanks to to
+-- Qantourisc (2010-06-12 15:15 CEST) for the hint to use TwoPane.
+myLayoutHook = named "Default" (smartBorders $ Mirror tiled)
+           ||| named "Full" (smartBorders Full)
+           ||| named "Vertical" (smartBorders tiled)
+           ||| named "Limit" (smartBorders $ Mirror $ TwoPane delta ratio)
     where
     -- Default tiling algorithm partitions the screen into two panes.
     tiled   = Tall nmaster delta ratio
@@ -82,22 +98,50 @@ myManageHook = composeOne
     , return True -?> doF W.focusDown
     ]
 
+-- Switch to next layout, but skip all layouts not in layouts argument. This
+-- allows switching to some layouts with mappings but excluding them from
+-- meta-space (which gets mapped to this function). Thanks to aavogt in
+-- #xmonad on Freenode for this function (2011-06-13 12:45 CEST) and
+-- rootzlevel in #xmonad on Freenode for fixes (2011-06-13 15:20 CEST),
+-- modified to take list of layouts to switch to, not layouts to exclude.
+nextLayoutIncluding :: [String] -> X ()
+nextLayoutIncluding layouts = do
+    cws <- gets (W.workspace . W.current . windowset)
+    sendMessageWithNoRefresh NextLayout cws
+    nextLayoutIncluding' layouts
+
+nextLayoutIncluding' :: [String] -> X ()
+nextLayoutIncluding' layouts = do
+    cws <- gets (W.workspace . W.current . windowset)
+    if not $ (description $ W.layout cws) `elem` layouts
+        -- Skip over excluded layouts.
+        then do
+            sendMessageWithNoRefresh NextLayout cws
+            nextLayoutIncluding' layouts
+        -- Found allowed layout, show it.
+        else refresh
+
 myKeys = [
-        -- Switch to additional layout (vertical tiled) defined by
-        -- toggleLayouts above.
-        ((mod4Mask, xK_v), sendMessage ToggleLayout)
+        -- Switch to next layout, but only use the listed layouts.
+        ((mod4Mask, xK_space), nextLayoutIncluding ["Default", "Full"])
+        -- Switch to vertical tiled layout.
+      , ((mod4Mask, xK_v), sendMessage $ JumpToLayout "Vertical")
+        -- Switch to limit layout which displays only one window in the lower
+        -- pane.
+      , ((mod4Mask, xK_b), sendMessage $ JumpToLayout "Limit")
+
         -- Switch to last active workspace, thanks to moljac024 in #xmonad on
         -- Freenode (2010-12-18 14:45 CET).
       , ((mod4Mask, xK_f), toggleWS)
     ]
     ++
     -- When using multiple screens, switching to another workspace causes
-    -- Xmonad to pull the workspace to the current screen if it was also
+    -- xmonad to pull the workspace to the current screen if it was also
     -- displayed on another one. This is confusing for me so the following
     -- code changes it to just switch to the screen where the workspace is
     -- already displayed.
     --
-    -- Thanks to the Xmonad FAQ, read on 2010-06-16 13:42 CEST
+    -- Thanks to the xmonad FAQ, read on 2010-06-16 13:42 CEST
     -- (http://www.haskell.org/haskellwiki/Xmonad/Frequently_asked_questions).
     -- Thanks to MrElendig in #xmonad on Freenode (2010-06-17 17:16 CEST) to
     -- use the default XMonad workspaces.
@@ -118,7 +162,7 @@ main = xmonad $ defaultConfig
     , manageHook = myManageHook
     -- Use unicode rxvt as my terminal.
     , terminal = "urxvt"
-    -- Necessary for Java so it recognizes XMonad as tiling window manager.
+    -- Necessary for Java so it recognizes xmonad as tiling window manager.
     , startupHook = setWMName "LG3D"
     }
     `additionalKeys` myKeys