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

Keep track of whether messages should be given to new sublayouts in L.SubLayouts

Browse Source
This commit is contained in:
Adam Vogt 2009-06-28 06:06:08 +00:00
parent 1893d67d09
commit 1e1f2c6770
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
XMonad/Layout/SubLayouts.hs
View File

@ -277,16 +277,16 @@ instance (Read (l Window), Show (l Window), LayoutClass l Window) => LayoutModif
let gs' = updateGroup st $ toGroups osls let gs' = updateGroup st $ toGroups osls
sls <- fromGroups defl st gs' osls sls <- fromGroups defl st gs' osls
let newL :: LayoutClass l Window => Rectangle -> WorkspaceId -> (l Window,Bool) let newL :: LayoutClass l Window => Rectangle -> WorkspaceId -> (l Window) -> Bool
-> (Maybe (W.Stack Window)) -> X ([(Window, Rectangle)], l Window) -> (Maybe (W.Stack Window)) -> X ([(Window, Rectangle)], l Window)
newL rect n (ol, mess) sst = do newL rect n ol isNew sst = do
orgStack <- currentStack orgStack <- currentStack
-- this would be much cleaner with some kind of data-accessor -- this would be much cleaner with some kind of data-accessor
let chStack x = modify (\s -> s { windowset = (windowset s) let chStack x = modify (\s -> s { windowset = (windowset s)
{ W.current = (W.current $ windowset s) { W.current = (W.current $ windowset s)
{ W.workspace = (W.workspace $ W.current $ windowset s) { W.stack = x }}}}) { W.workspace = (W.workspace $ W.current $ windowset s) { W.stack = x }}}})
let handle l (y,_) let handle l (y,_)
| mess = fromMaybe l <$> handleMessage l y | not isNew = fromMaybe l <$> handleMessage l y
| otherwise = return l | otherwise = return l
kms = filter ((`elem` M.keys gs') . snd) ms kms = filter ((`elem` M.keys gs') . snd) ms
chStack sst chStack sst
@ -295,13 +295,13 @@ instance (Read (l Window), Show (l Window), LayoutClass l Window) => LayoutModif
chStack orgStack -- FIXME: merge back reordering, deletions? chStack orgStack -- FIXME: merge back reordering, deletions?
return $ fromMaybe nl `second` result return $ fromMaybe nl `second` result
(urls,ssts) = unzip [ (newL gr i l sst, sst) (urls,ssts) = unzip [ (newL gr i l isNew sst, sst)
| l <- map (second $ const True) sls | (isNew,(l,_st)) <- sls
| i <- map show [ 0 :: Int .. ] | i <- map show [ 0 :: Int .. ]
| (k,gr) <- arrs, let sst = M.lookup k gs' ] | (k,gr) <- arrs, let sst = M.lookup k gs' ]
arrs' <- sequence urls arrs' <- sequence urls
sls' <- return . Sublayout (I []) defl <$> fromGroups defl st gs' sls' <- return . Sublayout (I []) defl . map snd <$> fromGroups defl st gs'
[ (l,s) | (_,l) <- arrs' | (Just s) <- ssts ] [ (l,s) | (_,l) <- arrs' | (Just s) <- ssts ]
return (concatMap fst arrs', sls') return (concatMap fst arrs', sls')
@ -356,7 +356,7 @@ instance (Read (l Window), Show (l Window), LayoutClass l Window) => LayoutModif
where gs = toGroups sls where gs = toGroups sls
fgs gs' = do fgs gs' = do
st <- currentStack st <- currentStack
Just . Sublayout (I ms) defl <$> fromGroups defl st gs' sls Just . Sublayout (I ms) defl . map snd <$> fromGroups defl st gs' sls
-- catchLayoutMess :: LayoutMessages -> X (Maybe (Sublayout l Window)) -- catchLayoutMess :: LayoutMessages -> X (Maybe (Sublayout l Window))
-- This l must be the same as from the instance head, -- This l must be the same as from the instance head,
@ -439,7 +439,7 @@ fromGroups :: (LayoutClass layout a, Ord k) =>
-> Maybe (W.Stack k) -> Maybe (W.Stack k)
-> Groups k -> Groups k
-> [(layout a, b)] -> [(layout a, b)]
-> X [(layout a, W.Stack k)] -> X [(Bool,(layout a, W.Stack k))]
fromGroups (skips,defl) st gs sls = do fromGroups (skips,defl) st gs sls = do
defls <- mapM (iterateM nextL defl !!) skips defls <- mapM (iterateM nextL defl !!) skips
return $ fromGroups' defl defls st gs (map fst sls) return $ fromGroups' defl defls st gs (map fst sls)
@ -447,11 +447,11 @@ fromGroups (skips,defl) st gs sls = do
iterateM f = iterate (>>= f) . return iterateM f = iterate (>>= f) . return
fromGroups' :: (Ord k) => a -> [a] -> Maybe (W.Stack k) -> Groups k -> [a] fromGroups' :: (Ord k) => a -> [a] -> Maybe (W.Stack k) -> Groups k -> [a]
-> [(a, W.Stack k)] -> [(Bool,(a, W.Stack k))]
fromGroups' defl defls st gs sls = fromGroups' defl defls st gs sls =
[ fromMaybe2 (dl, single w) (l, M.lookup w gs) [ (isNew,fromMaybe2 (dl, single w) (l, M.lookup w gs))
| l <- map Just sls ++ repeat Nothing | l <- map Just sls ++ repeat Nothing
| dl <- defls ++ repeat defl | (isNew,dl) <- map ((,) False) defls ++ map ((,) True) (repeat defl)
| w <- W.integrate' $ W.filter (`notElem` unfocs) =<< st ] | w <- W.integrate' $ W.filter (`notElem` unfocs) =<< st ]
where unfocs = unfocused =<< M.elems gs where unfocs = unfocused =<< M.elems gs
single w = W.Stack w [] [] single w = W.Stack w [] []