summaryrefslogtreecommitdiffstats
path: root/Operations.hs
diff options
context:
space:
mode:
authorSpencer Janssen <sjanssen@cse.unl.edu>2007-04-30 18:26:47 +0200
committerSpencer Janssen <sjanssen@cse.unl.edu>2007-04-30 18:26:47 +0200
commit0f366aba734661ab6cc97ed368fe683d00fcc2d3 (patch)
tree60c97016528716492060a95ad6ab7df330258938 /Operations.hs
parentd12e2d6006888fbcb325b76457fc76cdfadb2621 (diff)
downloadmetatile-0f366aba734661ab6cc97ed368fe683d00fcc2d3.tar
metatile-0f366aba734661ab6cc97ed368fe683d00fcc2d3.zip
Add Config.hs-boot, remove defaultLayoutDesc from XConf
darcs-hash:20070430162647-a5988-70420c2db283eb1585c96d977e5ac5ca3d0d1532
Diffstat (limited to 'Operations.hs')
-rw-r--r--Operations.hs8
1 files changed, 4 insertions, 4 deletions
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