From 46c282ff84e92da8fa4f36a4eac928abe580baff Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Mon, 30 Apr 2007 18:26:47 +0200 Subject: Add Config.hs-boot, remove defaultLayoutDesc from XConf darcs-hash:20070430162647-a5988-70420c2db283eb1585c96d977e5ac5ca3d0d1532.gz --- Operations.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Operations.hs') diff --git a/Operations.hs b/Operations.hs index ae9232b..ed25b31 100644 --- a/Operations.hs +++ b/Operations.hs @@ -29,6 +29,7 @@ import Graphics.X11.Xlib import Graphics.X11.Xlib.Extras import XMonad +import {-# SOURCE #-} Config import qualified StackSet as W @@ -41,11 +42,11 @@ import qualified StackSet as W refresh :: X () refresh = do XState { workspace = ws, layoutDescs = fls } <- get - XConf { xineScreens = xinesc, display = d, defaultLayoutDesc = dfltfl } <- ask + XConf { xineScreens = xinesc, display = d } <- ask flip mapM_ (M.assocs (W.screen2ws ws)) $ \(scn, n) -> do let sc = genericIndex xinesc scn -- temporary coercion! - fl = M.findWithDefault dfltfl n fls + fl = M.findWithDefault defaultLayoutDesc n fls mapM_ (\(w, rect) -> io $ moveWindowInside d w rect) $ case layoutType fl of Full -> fmap (flip (,) sc) $ maybeToList $ W.peekStack n ws @@ -104,11 +105,10 @@ changeSplit delta = layout $ \fl -> -- function and refresh. layout :: (LayoutDesc -> LayoutDesc) -> X () layout f = do - dfl <- asks defaultLayoutDesc modify $ \s -> let fls = layoutDescs s n = W.current . workspace $ s - fl = M.findWithDefault dfl n fls + fl = M.findWithDefault defaultLayoutDesc n fls in s { layoutDescs = M.insert n (f fl) fls } refresh -- cgit v1.2.3