twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-07-30 19:51:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

clean up DynamicWorkspaces to handle layouts properly.

Browse Source
This commit is contained in:
David Roundy
2007-08-14 18:35:42 +00:00
parent c6167c3f2d
commit 709c2b8573
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
DynamicWorkspaces.hs
View File

@@ -19,10 +19,10 @@ module XMonadContrib.DynamicWorkspaces (
addWorkspace, removeWorkspace addWorkspace, removeWorkspace
) where ) where
import Control.Monad.State ( get, gets, modify ) import Control.Monad.State ( gets, modify )
import XMonad ( X, XState(..), Layout, trace ) import XMonad ( X, XState(..), Layout, trace )
import Operations ( windows ) import Operations ( windows, view )
import StackSet ( tagMember, StackSet(..), Screen(..), Workspace(..), import StackSet ( tagMember, StackSet(..), Screen(..), Workspace(..),
integrate, differentiate ) integrate, differentiate )
import Data.Map ( delete, insert ) import Data.Map ( delete, insert )
@@ -44,10 +44,14 @@ addWorkspace (l:ls) = do s <- gets windowset
addWorkspace [] = trace "bad layouts in XMonadContrib.DynamicWorkspaces.addWorkspace\n" addWorkspace [] = trace "bad layouts in XMonadContrib.DynamicWorkspaces.addWorkspace\n"
removeWorkspace :: X () removeWorkspace :: X ()
removeWorkspace = do XState { windowset = s, layouts = fls } <- get removeWorkspace = do s <- gets windowset
let w = tag $ workspace $ current s case s of
modify $ \st -> st { layouts = delete w fls } StackSet { current = Screen { workspace = torem }
windows removeWorkspace' , hidden = (w:_) }
-> do view $ tag w
modify $ \st -> st { layouts = delete (tag torem) $ layouts st }
windows (removeWorkspace' (tag torem))
_ -> return ()
addWorkspace' :: i -> StackSet i a sid sd -> StackSet i a sid sd addWorkspace' :: i -> StackSet i a sid sd -> StackSet i a sid sd
addWorkspace' newtag s@(StackSet { current = scr@(Screen { workspace = w }) addWorkspace' newtag s@(StackSet { current = scr@(Screen { workspace = w })
@@ -55,13 +59,13 @@ addWorkspace' newtag s@(StackSet { current = scr@(Screen { workspace = w })
= s { current = scr { workspace = Workspace newtag Nothing } = s { current = scr { workspace = Workspace newtag Nothing }
, hidden = w:ws } , hidden = w:ws }
removeWorkspace' :: StackSet i a sid sd -> StackSet i a sid sd removeWorkspace' :: (Eq i) => i -> StackSet i a sid sd -> StackSet i a sid sd
removeWorkspace' s@(StackSet { current = scr@(Screen { workspace = Workspace { stack = st } }) removeWorkspace' torem s@(StackSet { current = scr@(Screen { workspace = wc })
, hidden = (w:ws) }) , hidden = (w:ws) })
= s { current = scr { workspace = w { stack = meld st (stack w) } } | tag w == torem = s { current = scr { workspace = wc { stack = meld (stack w) (stack wc) } }
, hidden = ws } , hidden = ws }
where meld Nothing Nothing = Nothing where meld Nothing Nothing = Nothing
meld x Nothing = x meld x Nothing = x
meld Nothing x = x meld Nothing x = x
meld (Just x) (Just y) = differentiate (integrate x ++ integrate y) meld (Just x) (Just y) = differentiate (integrate x ++ integrate y)
removeWorkspace' s = s removeWorkspace' _ s = s