From daadcaa31bf5bff6111a1d0cf7fee161b985cdab Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 3 Sep 2011 13:00:38 +0200 Subject: DynamicPerScreenWorkspaces mostly working --- xmonad.hs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'xmonad.hs') diff --git a/xmonad.hs b/xmonad.hs index 29dfe7a..637dd6e 100644 --- a/xmonad.hs +++ b/xmonad.hs @@ -60,11 +60,10 @@ main = xmonad $ ewmh $ defaultConfig , ("", spawn "amixer -q sset Master 5%+ unmute") , ("M1-", kill) ] - -- ++ [ (("M-C-" ++ show n, windows $ W.greedyView ws)) | (ws, n) <- zip myWorkspaces ([1..9]++[0])] - ++ [ (("M-S-" ++ show n, shiftGroup ws)) | (ws, n) <- zip myWorkspaces ([1..9]++[0])] - -- ++ [ (("M-C-" ++ show n, shiftIgnoreGroup ws)) | (ws, n) <- zip myWorkspaces ([1..9]++[0])] - ++ [ (("M-" ++ show n, view dwConfig ws)) | (ws, n) <- zip [0..] ([1..9]++[0])] - ++ [ (("M-C-" ++ show n, viewOnCurrent dwConfig ws)) | (ws, n) <- zip [0..] ([1..9]++[0])] + ++ [ ("M-" ++ show n, view dwConfig ws) | (ws, n) <- zip [0..] ([1..9]++[0])] + ++ [ ("M-C-" ++ show n, viewOnCurrent dwConfig ws) | (ws, n) <- zip [0..] ([1..9]++[0])] + ++ [ ("M-S-" ++ show n, create dwConfig ws >> shiftGroup (workspaceTag dwConfig ws) >> cleanup) | (ws, n) <- zip [0..] ([1..9]++[0])] + ++ [ ("M-S-C-" ++ show n, create dwConfig ws >> shiftIgnoreGroup (workspaceTag dwConfig ws) >> cleanup) | (ws, n) <- zip [0..] ([1..9]++[0])] ) `additionalMouseBindings` [ ((modm, button4), \_ -> sendMessage Shrink) @@ -74,8 +73,6 @@ main = xmonad $ ewmh $ defaultConfig ] -myWorkspaces = map show [1..10] - dwConfig :: DynamicWorkspaceConfig dwConfig = DynamicWorkspaceConfig { defaultWorkspaceScreen = defWSScreen , workspaceTag = show . (+1) @@ -87,7 +84,7 @@ defWSScreen 1 _ = S 0 defWSScreen _ i | i `elem` [0..7] = S 0 defWSScreen _ i | i `elem` [8,9] = S 1 -defWSScreen n i = S (i `mod` n) +defWSScreen n i = S ((i-10) `mod` n) viewOrWarp :: Int -> X () -- cgit v1.2.3