xmonad.hs: Whitespace only change.

[config/dotfiles.git] / xmonad.hs

diff --git a/xmonad.hs b/xmonad.hs
index eba0cfc2c7c3d906daa3212ed4400a41c70a7440..467b351f26fc319b68e698ec5935660d2a8e4822 100644 (file)
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -1,6 +1,6 @@
--- 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.
 
 
 -- "hiding" necessary for LayoutCombinators.
@@ -59,10 +59,11 @@ avoidMaster = W.modify' $ \c -> case c of
 --
 -- 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)
+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
@@ -108,16 +109,17 @@ nextLayoutIncluding :: [String] -> X ()
 nextLayoutIncluding layouts = do
     cws <- gets (W.workspace . W.current . windowset)
     sendMessageWithNoRefresh NextLayout cws
-    nextLayoutIncluding' layouts
+    nextLayoutIncluding' layouts 1000 -- nobody has more than 1000 layouts
 
-nextLayoutIncluding' :: [String] -> X ()
-nextLayoutIncluding' layouts = do
+nextLayoutIncluding' :: [String] -> Int -> X ()
+nextLayoutIncluding' layouts iterations = do
     cws <- gets (W.workspace . W.current . windowset)
-    if not $ (description $ W.layout cws) `elem` layouts
+    -- 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
+            nextLayoutIncluding' layouts (iterations - 1)
         -- Found allowed layout, show it.
         else refresh
 
@@ -136,12 +138,12 @@ myKeys = [
     ]
     ++
     -- 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.
@@ -162,7 +164,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