X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xmonad.hs;h=e73e1c56debe1f6ff528bbc47212e4f8efd0499b;hb=9b2c4754a6c0a671faf806c0292f36f33cfa780f;hp=b3949d77daf049c98280eeb1c3c3207976932a3a;hpb=c528f3ec1893b0cf11ef112147524410423dfdb4;p=config%2Fdotfiles.git

diff --git a/xmonad.hs b/xmonad.hs
index b3949d7..e73e1c5 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -1,4 +1,6 @@
 -- XMonad configuration file.
+--
+-- Should work fine with XMonad 0.7 and above.
 
 
 import XMonad
@@ -6,16 +8,24 @@ import XMonad
 import XMonad.Layout.Reflect
 -- Necessary for avoidMaster.
 import qualified XMonad.StackSet as W
+-- Necessary for toggleLayouts.
+import XMonad.Layout.ToggleLayouts
 -- Necessary for smartBorders.
 import XMonad.Layout.NoBorders
+-- Necessary for composeOne and -?>.
+import XMonad.Hooks.ManageHelpers
+-- Necessary for `additionalKeys`.
+import XMonad.Util.EZConfig
 
 
 -- Prevent new windows from spawning in the master pane. Taken from
 -- http://haskell.org/haskellwiki/Xmonad/Frequently_asked_questions on
--- 2009-06-30. Thanks.
+-- 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).
 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 t [r] rs
+    W.Stack t [] (r:rs) -> W.Stack r [] (t:rs)
     otherwise           -> c
 
 -- Create my custom layout.
@@ -28,16 +38,20 @@ avoidMaster = W.modify' $ \c -> case c of
 --
 -- Thanks to jrick in #xmonad on Freenode (2009-06-29 22:19) for telling me
 -- how to remove the vertical tiled layout.
-myLayoutHook = smartBorders $ Mirror tiled ||| Full
+--
+-- 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
     where
     -- Default tiling algorithm partitions the screen into two panes.
     tiled   = Tall nmaster delta ratio
     -- The default number of windows in the master pane.
     nmaster = 1
-    -- Default proportion of screen occupied by master pane.
-    ratio   = 1/2
     -- Percent of screen to increment by when resizing panes.
     delta   = 3/100
+    -- Default proportion of screen occupied by master pane.
+    ratio   = 1/2
 
 -- 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
@@ -45,10 +59,38 @@ myLayoutHook = smartBorders $ Mirror tiled ||| Full
 --
 -- Also some applications are spawned on specific workspaces. Thanks to
 -- dschoepe and ivanm in #xmonad on Freenode (2009-07-12 14:50).
-myManageHook = composeAll
-    [ className =? "Iceweasel" --> doF (W.shift "2")
-    , className =? "Wireshark" --> doF (W.shift "3")
-    ] <+> doF avoidMaster
+myManageHook = composeOne
+    [ className =? "Iceweasel" -?> doF (W.shift "2")
+    , className =? "Wireshark" -?> doF (W.shift "3")
+
+    -- Don't span new windows in the master pane.
+    , 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).
+    , return True -?> doF W.focusDown
+    ]
+
+-- My workspaces, same as default ones. Used below in myKeys.
+myWorkspaces = ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+
+myKeys = [
+        -- Switch to additional layout (vertical tiled) defined by
+        -- toggleLayouts above.
+        ((mod4Mask, xK_v), sendMessage ToggleLayout)
+    ]
+    ++
+    -- When using multiple screens, switching to another workspace causes
+    -- 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
+    -- (http://www.haskell.org/haskellwiki/Xmonad/Frequently_asked_questions).
+    [((m .|. mod4Mask, k), windows $ f i)
+        | (i, k) <- zip myWorkspaces [xK_1 .. xK_9]
+        , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
 
 main = xmonad $ defaultConfig
     -- Use Windows key as main key so it doesn't conflict with any other key
@@ -64,3 +106,6 @@ main = xmonad $ defaultConfig
     -- Use unicode rxvt as my terminal.
     , terminal = "urxvt"
     }
+    `additionalKeys` myKeys
+
+-- vim: nospell