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

API CHANGE: Give doLayout a Stack rather than a flattened list

Browse Source
This commit is contained in:
Spencer Janssen
2007-06-11 18:26:29 +00:00
parent e7b37ca646
commit 4f5c307d6f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Operations.hs
View File

@@ -140,7 +140,8 @@ windows f = do
let n = W.tag (W.workspace w) let n = W.tag (W.workspace w)
this = W.view n ws this = W.view n ws
Just l = fmap fst $ M.lookup n fls Just l = fmap fst $ M.lookup n fls
(flt, tiled) = partition (flip M.member (W.floating ws)) (W.index this) flt = filter (flip M.member (W.floating ws)) (W.index this)
tiled = W.filter (not . flip M.member (W.floating ws)) . W.stack . W.workspace . W.current $ this
(Rectangle sx sy sw sh) = genericIndex xinesc (W.screen w) (Rectangle sx sy sw sh) = genericIndex xinesc (W.screen w)
(gt,gb,gl,gr) = genericIndex gaps (W.screen w) (gt,gb,gl,gr) = genericIndex gaps (W.screen w)
viewrect = Rectangle (sx + fromIntegral gl) (sy + fromIntegral gt) viewrect = Rectangle (sx + fromIntegral gl) (sy + fromIntegral gt)
@@ -370,7 +371,9 @@ instance Message IncMasterN
-- simple fullscreen mode, just render all windows fullscreen. -- simple fullscreen mode, just render all windows fullscreen.
-- a plea for tuple sections: map . (,sc) -- a plea for tuple sections: map . (,sc)
full :: Layout full :: Layout
full = Layout { doLayout = \sc ws -> return [ (w,sc) | w <- ws ] full = Layout { doLayout = \sc ws -> return $ case ws of
W.Empty -> []
(W.Node f _ _) -> [(f, sc)]
, modifyLayout = const (return Nothing) } -- no changes , modifyLayout = const (return Nothing) } -- no changes
-- --
@@ -378,7 +381,7 @@ full = Layout { doLayout = \sc ws -> return [ (w,sc) | w <- ws ]
-- --
tall :: Int -> Rational -> Rational -> Layout tall :: Int -> Rational -> Rational -> Layout
tall nmaster delta frac = tall nmaster delta frac =
Layout { doLayout = \r -> return . ap zip (tile frac r nmaster . length) Layout { doLayout = \r -> return . ap zip (tile frac r nmaster . length) . W.integrate
, modifyLayout = \m -> return $ msum [fmap resize (fromMessage m) , modifyLayout = \m -> return $ msum [fmap resize (fromMessage m)
,fmap incmastern (fromMessage m)] } ,fmap incmastern (fromMessage m)] }

2
XMonad.hs
View File

@@ -108,7 +108,7 @@ atom_WM_STATE = getAtom "WM_STATE"
-- 'doLayout', a pure function to layout a Window set 'modifyLayout', -- 'doLayout', a pure function to layout a Window set 'modifyLayout',
-- 'modifyLayout' can be considered a branch of an exception handler. -- 'modifyLayout' can be considered a branch of an exception handler.
-- --
data Layout = Layout { doLayout :: Rectangle -> [Window] -> X [(Window, Rectangle)] data Layout = Layout { doLayout :: Rectangle -> Stack Window -> X [(Window, Rectangle)]
, modifyLayout :: SomeMessage -> X (Maybe Layout) } , modifyLayout :: SomeMessage -> X (Maybe Layout) }
-- Based on ideas in /An Extensible Dynamically-Typed Hierarchy of Exceptions/, -- Based on ideas in /An Extensible Dynamically-Typed Hierarchy of Exceptions/,