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

merge old workspace tags with new on restart.

Browse Source
This commit is contained in:
David Roundy 2007-09-26 18:33:09 +00:00
parent 60dda50181
commit f1c1e982a2
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Main.hs
View File

@ -51,9 +51,9 @@ main = do
args <- getArgs args <- getArgs
let winset | ("--resume" : s : _) <- args let winset | ("--resume" : s : _) <- args
, [(x, "")] <- reads s = x , [(x, "")] <- reads s = W.ensureTags defaultLayout workspaces x
| otherwise = new (SomeLayout $ LayoutSelection safeLayouts) | otherwise = new defaultLayout workspaces $ zipWith SD xinesc gaps
workspaces $ zipWith SD xinesc gaps defaultLayout = SomeLayout $ LayoutSelection safeLayouts
gaps = take (length xinesc) $ defaultGaps ++ repeat (0,0,0,0) gaps = take (length xinesc) $ defaultGaps ++ repeat (0,0,0,0)
safeLayouts = if null defaultLayouts then [SomeLayout Full] else defaultLayouts safeLayouts = if null defaultLayouts then [SomeLayout Full] else defaultLayouts

19
StackSet.hs
View File

@ -24,7 +24,7 @@ module StackSet (
-- $stackOperations -- $stackOperations
peek, index, integrate, integrate', differentiate, peek, index, integrate, integrate', differentiate,
focusUp, focusDown, focusMaster, focusUp, focusDown, focusMaster,
focusWindow, tagMember, member, findIndex, focusWindow, tagMember, renameTag, ensureTags, member, findIndex,
-- * Modifying the stackset -- * Modifying the stackset
-- $modifyStackset -- $modifyStackset
insertUp, delete, delete', filter, insertUp, delete, delete', filter,
@ -39,6 +39,7 @@ module StackSet (
import Prelude hiding (filter) import Prelude hiding (filter)
import Data.Maybe (listToMaybe,fromJust) import Data.Maybe (listToMaybe,fromJust)
import qualified Data.List as L (deleteBy,find,splitAt,filter) import qualified Data.List as L (deleteBy,find,splitAt,filter)
import Data.List ( (\\) )
import qualified Data.Map as M (Map,insert,delete,empty) import qualified Data.Map as M (Map,insert,delete,empty)
-- $intro -- $intro
@ -400,6 +401,22 @@ workspaces s = workspace (current s) : map workspace (visible s) ++ hidden s
tagMember :: Eq i => i -> StackSet i l a s sd -> Bool tagMember :: Eq i => i -> StackSet i l a s sd -> Bool
tagMember t = elem t . map tag . workspaces tagMember t = elem t . map tag . workspaces
-- | Rename a given tag if present in the StackSet.
renameTag :: Eq i => i -> i -> StackSet i l a s sd -> StackSet i l a s sd
renameTag o n s = s { current = rs $ current s
, visible = map rs $ visible s
, hidden = map rw $ hidden s }
where rs scr = scr { workspace = rw $ workspace scr }
rw w = if tag w == o then w { tag = n } else w
-- | Ensure that a given set of tags is present.
ensureTags :: Eq i => l -> [i] -> StackSet i l a s sd -> StackSet i l a s sd
ensureTags l allt st = et allt (map tag (workspaces st) \\ allt) st
where et [] _ s = s
et (i:is) rn s | i `tagMember` s = et is rn s
et (i:is) [] s = et is [] (s { hidden = Workspace i l Nothing : hidden s })
et (i:is) (r:rs) s = et is rs $ renameTag r i s
-- | -- |
-- Finding if a window is in the stackset is a little tedious. We could -- Finding if a window is in the stackset is a little tedious. We could
-- keep a cache :: Map a i, but with more bookkeeping. -- keep a cache :: Map a i, but with more bookkeeping.