twin/xmonad
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad.git synced 2025-07-26 01:31:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

support self-modifying layouts.

Browse Source
This commit is contained in:
David Roundy
2007-06-23 20:14:47 +00:00
parent d0566a28be
commit 61d7524bcd
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Operations.hs
View File

@@ -29,7 +29,7 @@ import qualified Data.Set as S
import Control.Monad.State import Control.Monad.State
import Control.Monad.Reader import Control.Monad.Reader
import Control.Arrow ((***), second) import Control.Arrow ((***), first, second)
import System.IO import System.IO
import Graphics.X11.Xlib import Graphics.X11.Xlib
@@ -156,8 +156,10 @@ windows f = do
-- just the tiled windows: -- just the tiled windows:
-- now tile the windows on this workspace, modified by the gap -- now tile the windows on this workspace, modified by the gap
rs <- runLayout l viewrect tiled `catchX` runLayout full viewrect tiled (rs, ml') <- runLayout l viewrect tiled `catchX` runLayout full viewrect tiled
mapM_ (uncurry tileWindow) rs mapM_ (uncurry tileWindow) rs
whenJust ml' $ \l' -> modify $ \ss ->
ss { layouts = M.adjust (first (const l')) n (layouts ss) }
-- now the floating windows: -- now the floating windows:
-- move/resize the floating windows, if there are any -- move/resize the floating windows, if there are any
@@ -368,7 +370,7 @@ 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 a full :: Layout a
full = Layout { doLayout = \sc (W.Stack f _ _) -> return [(f, sc)] full = Layout { doLayout = \sc (W.Stack f _ _) -> return ([(f, sc)],Nothing)
, modifyLayout = const (return Nothing) } -- no changes , modifyLayout = const (return Nothing) } -- no changes
-- --
@@ -376,7 +378,8 @@ full = Layout { doLayout = \sc (W.Stack f _ _) -> return [(f, sc)]
-- --
tall :: Int -> Rational -> Rational -> Layout a tall :: Int -> Rational -> Rational -> Layout a
tall nmaster delta frac = tall nmaster delta frac =
Layout { doLayout = \r -> return . ap zip (tile frac r nmaster . length) . W.integrate Layout { doLayout = \r -> return . (\x->(x,Nothing)) .
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)] }
@@ -391,7 +394,8 @@ mirrorRect (Rectangle rx ry rw rh) = (Rectangle ry rx rh rw)
-- | Mirror a layout, compute its 90 degree rotated form. -- | Mirror a layout, compute its 90 degree rotated form.
mirror :: Layout a -> Layout a mirror :: Layout a -> Layout a
mirror (Layout { doLayout = dl, modifyLayout = ml }) = mirror (Layout { doLayout = dl, modifyLayout = ml }) =
Layout { doLayout = \sc w -> map (second mirrorRect) `fmap` dl (mirrorRect sc) w Layout { doLayout = \sc w -> do (wrs, ml') <- dl (mirrorRect sc) w
return (map (second mirrorRect) wrs, mirror `fmap` ml')
, modifyLayout = fmap (fmap mirror) . ml } , modifyLayout = fmap (fmap mirror) . ml }
-- | tile. Compute the positions for windows using the default 2 pane tiling algorithm. -- | tile. Compute the positions for windows using the default 2 pane tiling algorithm.

6
XMonad.hs
View File

@@ -126,11 +126,11 @@ atom_WM_STATE = getAtom "WM_STATE"
-- that message and the screen is not refreshed. Otherwise, 'modifyLayout' -- that message and the screen is not refreshed. Otherwise, 'modifyLayout'
-- returns an updated 'Layout' and the screen is refreshed. -- returns an updated 'Layout' and the screen is refreshed.
-- --
data Layout a = Layout { doLayout :: Rectangle -> Stack a -> X [(a, Rectangle)] data Layout a = Layout { doLayout :: Rectangle -> Stack a -> X ([(a, Rectangle)], Maybe (Layout a))
, modifyLayout :: SomeMessage -> X (Maybe (Layout a)) } , modifyLayout :: SomeMessage -> X (Maybe (Layout a)) }
runLayout :: Layout a -> Rectangle -> StackOrNot a -> X [(a, Rectangle)] runLayout :: Layout a -> Rectangle -> StackOrNot a -> X ([(a, Rectangle)], Maybe (Layout a))
runLayout l r = maybe (return []) (doLayout l r) runLayout l r = maybe (return ([], Nothing)) (doLayout l r)
-- | Based on ideas in /An Extensible Dynamically-Typed Hierarchy of Exceptions/, -- | Based on ideas in /An Extensible Dynamically-Typed Hierarchy of Exceptions/,
-- Simon Marlow, 2006. Use extensible messages to the modifyLayout handler. -- Simon Marlow, 2006. Use extensible messages to the modifyLayout handler.