twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-10 17:52:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix DynamicWorkspaces.

Browse Source
This commit is contained in:
David Roundy
2007-09-25 22:06:59 +00:00
parent 14c44216dc
commit 5ff5f0ca01
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
DynamicWorkspaces.hs
View File

@@ -19,12 +19,11 @@ module XMonadContrib.DynamicWorkspaces (
addWorkspace, removeWorkspace addWorkspace, removeWorkspace
) where ) where
import Control.Monad.State ( gets, modify ) import Control.Monad.State ( gets )
import XMonad ( X, XState(..), Layout, WorkspaceId, trace ) import XMonad ( X, XState(..), SomeLayout, WorkspaceId )
import Operations import Operations
import StackSet hiding (filter, modify, delete) import StackSet hiding (filter, modify, delete)
import Data.Map ( delete, insert )
import Graphics.X11.Xlib ( Window ) import Graphics.X11.Xlib ( Window )
-- $usage -- $usage
@@ -38,12 +37,10 @@ import Graphics.X11.Xlib ( Window )
allPossibleTags :: [WorkspaceId] allPossibleTags :: [WorkspaceId]
allPossibleTags = map (:"") ['0'..] allPossibleTags = map (:"") ['0'..]
addWorkspace :: [Layout Window] -> X () addWorkspace :: SomeLayout Window -> X ()
addWorkspace (l:ls) = do s <- gets windowset addWorkspace l = do s <- gets windowset
let newtag:_ = filter (not . (`tagMember` s)) allPossibleTags let newtag:_ = filter (not . (`tagMember` s)) allPossibleTags
modify $ \st -> st { layouts = insert newtag (l,ls) $ layouts st } windows (addWorkspace' newtag l)
windows (addWorkspace' newtag)
addWorkspace [] = trace "bad layouts in XMonadContrib.DynamicWorkspaces.addWorkspace\n"
removeWorkspace :: X () removeWorkspace :: X ()
removeWorkspace = do s <- gets windowset removeWorkspace = do s <- gets windowset
@@ -51,17 +48,16 @@ removeWorkspace = do s <- gets windowset
StackSet { current = Screen { workspace = torem } StackSet { current = Screen { workspace = torem }
, hidden = (w:_) } , hidden = (w:_) }
-> do windows $ view (tag w) -> do windows $ view (tag w)
modify $ \st -> st { layouts = delete (tag torem) $ layouts st }
windows (removeWorkspace' (tag torem)) windows (removeWorkspace' (tag torem))
_ -> return () _ -> return ()
addWorkspace' :: i -> StackSet i a sid sd -> StackSet i a sid sd addWorkspace' :: i -> l -> StackSet i l a sid sd -> StackSet i l a sid sd
addWorkspace' newtag s@(StackSet { current = scr@(Screen { workspace = w }) addWorkspace' newtag l s@(StackSet { current = scr@(Screen { workspace = w })
, hidden = ws }) , hidden = ws })
= s { current = scr { workspace = Workspace newtag Nothing } = s { current = scr { workspace = Workspace newtag l Nothing }
, hidden = w:ws } , hidden = w:ws }
removeWorkspace' :: (Eq i) => i -> StackSet i a sid sd -> StackSet i a sid sd removeWorkspace' :: (Eq i) => i -> StackSet i l a sid sd -> StackSet i l a sid sd
removeWorkspace' torem s@(StackSet { current = scr@(Screen { workspace = wc }) removeWorkspace' torem s@(StackSet { current = scr@(Screen { workspace = wc })
, hidden = (w:ws) }) , hidden = (w:ws) })
| tag w == torem = s { current = scr { workspace = wc { stack = meld (stack w) (stack wc) } } | tag w == torem = s { current = scr { workspace = wc { stack = meld (stack w) (stack wc) } }