diff options
| author | Spencer Janssen <sjanssen@cse.unl.edu> | 2008-03-30 00:07:37 +0100 |
|---|---|---|
| committer | Spencer Janssen <sjanssen@cse.unl.edu> | 2008-03-30 00:07:37 +0100 |
| commit | 5079300ce6231b475dfd1fc9b431c3bdc0cd895e (patch) | |
| tree | 95e044609f3bf22f2b0298646390c596f2d217c6 | |
| parent | d471ba7248bc6d97b4271e3a7430372a0c442221 (diff) | |
| download | XMonadContrib-5079300ce6231b475dfd1fc9b431c3bdc0cd895e.tar.gz XMonadContrib-5079300ce6231b475dfd1fc9b431c3bdc0cd895e.tar.xz XMonadContrib-5079300ce6231b475dfd1fc9b431c3bdc0cd895e.zip | |
Remove stale status gaps code
darcs-hash:20080329230737-a5988-00c8ef14160f79347f4e40c12b2c84a9519b4d1a.gz
| -rw-r--r-- | XMonad/Hooks/DynamicLog.hs | 3 | ||||
| -rw-r--r-- | XMonad/Layout/LayoutScreens.hs | 7 | ||||
| -rw-r--r-- | XMonad/Layout/ScratchWorkspace.hs | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/XMonad/Hooks/DynamicLog.hs b/XMonad/Hooks/DynamicLog.hs index 2612b59..9dec934 100644 --- a/XMonad/Hooks/DynamicLog.hs +++ b/XMonad/Hooks/DynamicLog.hs @@ -144,8 +144,7 @@ dzen :: (XConfig (Choose Tall (Choose (Mirror Tall) Full)) -> IO ()) -> IO () dzen f = do h <- spawnPipe ("dzen2" ++ " " ++ flags) f $ defaultConfig - { defaultGaps = [(15,0,0,0)] -- for fixed - , logHook = dynamicLogWithPP dzenPP + { logHook = dynamicLogWithPP dzenPP { ppOutput = hPutStrLn h } } where fg = "'#a8a3f7'" -- n.b quoting diff --git a/XMonad/Layout/LayoutScreens.hs b/XMonad/Layout/LayoutScreens.hs index e74b9b4..3776981 100644 --- a/XMonad/Layout/LayoutScreens.hs +++ b/XMonad/Layout/LayoutScreens.hs @@ -61,10 +61,9 @@ layoutScreens nscr l = (wss, _) <- runLayout (W.Workspace "" l (Just $ W.Stack { W.focus=1, W.up=[],W.down=[1..nscr-1] })) rtrect windows $ \ws@(W.StackSet { W.current = v, W.visible = vs, W.hidden = hs }) -> let (x:xs, ys) = splitAt nscr $ map W.workspace (v:vs) ++ hs - gaps = map (statusGap . W.screenDetail) $ v:vs - (s:ss, g:gg) = (map snd wss, take nscr $ gaps ++ repeat (head gaps)) - in ws { W.current = W.Screen x 0 (SD s g) - , W.visible = zipWith3 W.Screen xs [1 ..] $ zipWith SD ss gg + s:ss = map snd wss + in ws { W.current = W.Screen x 0 (SD s) + , W.visible = zipWith3 W.Screen xs [1 ..] $ map SD ss , W.hidden = ys } getWindowRectangle :: Window -> X Rectangle diff --git a/XMonad/Layout/ScratchWorkspace.hs b/XMonad/Layout/ScratchWorkspace.hs index aea473e..56febeb 100644 --- a/XMonad/Layout/ScratchWorkspace.hs +++ b/XMonad/Layout/ScratchWorkspace.hs @@ -41,7 +41,7 @@ toggleScratchWorkspace l = then -- we don't yet have a scratch screen! if scratchName `W.tagMember` s then return () -- We'll just bail out of scratchName already exists... - else do let scratchscreen = W.Screen scratch (-1) (SD hiddenRect (0,0,0,0)) + else do let scratchscreen = W.Screen scratch (-1) (SD hiddenRect) scratch = W.Workspace scratchName defaultl Nothing s' = s { W.visible = scratchscreen: W.visible s } modify $ \st -> st { windowset = s' } |