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

make everything work with new doLayout.

Browse Source 
This modifies all the contrib modules to work (so far as I know) with the
new contrib layout.  The exception is the LayoutHooks module, which isn't
used.  It exports an API that is inherently unsafe, so far as I can tell
(and always has been).
This commit is contained in:
David Roundy
2007-06-23 21:09:52 +00:00
parent 91a286a9fd
commit d3048ed615
13 changed files with 97 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
SimpleStacking.hs
View File

@@ -21,15 +21,16 @@ module XMonadContrib.SimpleStacking (
simpleStacking
) where
import Control.Monad.State ( modify )
import Control.Monad.State ( get )
import qualified Data.Map as M
import Data.Maybe ( catMaybes )
import Data.List ( nub, lookup )
import StackSet ( focus, tag, workspace, current, integrate )
import Data.List ( nub, lookup, delete )
import StackSet ( focus, tag, workspace, current, up, down )
import Graphics.X11.Xlib ( Window )
import XMonad
import XMonadContrib.LayoutHelpers
-- $usage
-- You can use this module for
@@ -39,14 +40,9 @@ simpleStacking :: Layout Window -> Layout Window
simpleStacking = simpleStacking' []
simpleStacking' :: [Window] -> Layout Window -> Layout Window
simpleStacking' st l = l { doLayout = dl
, modifyLayout = \m -> fmap (simpleStacking' st) `fmap` modifyLayout l m }
where dl r s = do modify $ \ state ->
state { layouts = M.adjust
(\(_,ss)->(simpleStacking'
(focus s:filter (`elem` integrate s) st) l,ss))
(tag.workspace.current.windowset $ state)
(layouts state) }
lo <- doLayout l r s
let m = map (\ (w,rr) -> (w,(w,rr))) lo
return $ catMaybes $ map ((flip lookup) m) $ nub (focus s : st ++ map fst lo)
simpleStacking' st = layoutModify dl idModMod
where dl r s wrs = let m = map (\ (w,rr) -> (w,(w,rr))) wrs
wrs' = catMaybes $ map ((flip lookup) m) $
nub (focus s : st ++ map fst wrs)
st' = focus s:filter (`elem` (up s++down s)) st
in return (wrs', Just (simpleStacking' st'))