X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xmonad.hs;h=d4c323a162c12236484828adb40b75316c4ece51;hb=6b16737f1e93f88348a90debb27379aa27811fbc;hp=c59bc53dce2e26d0220e6e39aecebd637541431f;hpb=de6ac09ffa6988d0b59d6d10c52eccfbe40bb0e1;p=config%2Fdotfiles.git

diff --git a/xmonad.hs b/xmonad.hs
index c59bc53..d4c323a 100644
--- 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,13 +21,19 @@ 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
 -- http://haskell.org/haskellwiki/Xmonad/Frequently_asked_questions on
 -- 2009-06-30. Thanks. Modified to not steal focus from the master pane when a
 -- new window is created, thanks to vav in #xmonad on Freenode (2010-04-15
--- 21:59).
+-- 21:59 CEST).
 avoidMaster :: W.StackSet i l a s sd -> W.StackSet i l a s sd
 avoidMaster = W.modify' $ \c -> case c of
     W.Stack t [] (r:rs) -> W.Stack r [] (t:rs)
@@ -34,19 +41,28 @@ 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
 -- drawn when the screen has more then one window (smartBorders).
 --
--- Thanks to jrick in #xmonad on Freenode (2009-06-29 22:19) for telling me
--- how to remove the vertical tiled layout.
+-- 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) 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
@@ -59,10 +75,10 @@ myLayoutHook = toggleLayouts tiled $ smartBorders $ Mirror tiled ||| Full
 
 -- Don't spawn new windows in the master pane (which is at the top of the
 -- screen). Thanks to dschoepe, aavogt and especially vav in #xmonad on
--- Freenode (2009-06-30 02:10f).
+-- Freenode (2009-06-30 02:10f CEST).
 --
 -- Also some applications are spawned on specific workspaces. Thanks to
--- dschoepe and ivanm in #xmonad on Freenode (2009-07-12 14:50).
+-- dschoepe and ivanm in #xmonad on Freenode (2009-07-12 14:50 CEST).
 myManageHook = composeOne
     -- Browser on "2".
     [ className =? "Iceweasel"          -?> doF (W.shift "2")
@@ -78,29 +94,58 @@ myManageHook = composeOne
     , return True -?> doF avoidMaster
     -- Prevent windows which get moved to other workspaces from removing the
     -- focus of the currently selected window. Thanks to vav in #xmonad on
-    -- Freenode (2010-04-15 21:04).
+    -- Freenode (2010-04-15 21:04 CEST).
     , 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 1000 -- nobody has more than 1000 layouts
+
+nextLayoutIncluding' :: [String] -> Int -> X ()
+nextLayoutIncluding' layouts iterations = do
+    cws <- gets (W.workspace . W.current . windowset)
+    -- iterations prevents an endless loop if no valid layout can be found.
+    if not ((description $ W.layout cws) `elem` layouts) && iterations > 0
+        -- Skip over excluded layouts.
+        then do
+            sendMessageWithNoRefresh NextLayout cws
+            nextLayoutIncluding' layouts (iterations - 1)
+        -- 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).
+        -- 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
+    -- 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) to use
-    -- the default XMonad workspaces.
+    -- Thanks to MrElendig in #xmonad on Freenode (2010-06-17 17:16 CEST) to
+    -- use the default XMonad workspaces.
     [((m .|. mod4Mask, k), windows $ f i)
         | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_1 .. xK_9]
         , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
@@ -118,7 +163,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