X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xmonad.hs;h=469789c619ddbeb90cc3a40293ae4bc96b6c9e27;hb=99690b2935bb89cd7862196bde2995e3327b3c4a;hp=49082a4c064f35d1ce3cd0a45bf1550e3c68156a;hpb=05a1cb666629cecf220bb73ff989321770832745;p=config%2Fdotfiles.git

diff --git a/xmonad.hs b/xmonad.hs
index 49082a4..469789c 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -1,6 +1,6 @@
 -- XMonad configuration file.
 --
--- Should work fine with XMonad 0.8 and above.
+-- Should work fine with XMonad 0.7 and above.
 
 
 import XMonad
@@ -10,14 +10,18 @@ import XMonad.Layout.Reflect
 import qualified XMonad.StackSet as W
 -- Necessary for smartBorders.
 import XMonad.Layout.NoBorders
+-- Necessary for composeOne and -?>.
+import XMonad.Hooks.ManageHelpers
 
 
 -- 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.
@@ -47,10 +51,17 @@ 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
+    ]
 
 main = xmonad $ defaultConfig
     -- Use Windows key as main key so it doesn't conflict with any other key