aboutsummaryrefslogtreecommitdiffstats
path: root/Operations.hs
diff options
context:
space:
mode:
authorSpencer Janssen <sjanssen@cse.unl.edu>2007-11-01 08:23:08 +0100
committerSpencer Janssen <sjanssen@cse.unl.edu>2007-11-01 08:23:08 +0100
commitbd6e06d56c5a0d6ed50422e7ecf9fef809c8db11 (patch)
tree76dcbdaf5392f74926cc85e21f0971b8a4e94020 /Operations.hs
parentcad84bdf1518c173d76fd0de04ace22eb886821a (diff)
downloadxmonad-bd6e06d56c5a0d6ed50422e7ecf9fef809c8db11.tar.gz
xmonad-bd6e06d56c5a0d6ed50422e7ecf9fef809c8db11.tar.xz
xmonad-bd6e06d56c5a0d6ed50422e7ecf9fef809c8db11.zip
Store user configuration in XConf
darcs-hash:20071101072308-a5988-e5a5231e3adcff8f03ebdab37721b19c0e19fc00.gz
Diffstat (limited to 'Operations.hs')
-rw-r--r--Operations.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Operations.hs b/Operations.hs
index 929ca9d..9799803 100644
--- a/Operations.hs
+++ b/Operations.hs
@@ -167,7 +167,7 @@ windows f = do
whenJust (W.peek ws) $ \w -> io $ setWindowBorder d w fbc
setTopFocus
- asks logHook >>= userCode
+ asks (logHook . config) >>= userCode
-- io performGC -- really helps, but seems to trigger GC bugs?
-- hide every window that was potentially visible before, but is not
@@ -211,7 +211,7 @@ setInitialProperties :: Window -> X ()
setInitialProperties w = asks normalBorder >>= \nb -> withDisplay $ \d -> do
setWMState w iconicState
io $ selectInput d w $ clientMask
- bw <- asks borderWidth
+ bw <- asks (borderWidth . config)
io $ setWindowBorderWidth d w bw
-- we must initially set the color of new windows, to maintain invariants
-- required by the border setting in 'windows'
@@ -388,7 +388,7 @@ floatLocation :: Window -> X (ScreenId, W.RationalRect)
floatLocation w = withDisplay $ \d -> do
ws <- gets windowset
wa <- io $ getWindowAttributes d w
- bw <- fi `fmap` asks borderWidth
+ bw <- fi `fmap` asks (borderWidth . config)
-- XXX horrible
let sc = fromMaybe (W.current ws) $ find (pointWithin (fi $ wa_x wa) (fi $ wa_y wa) . screenRect . W.screenDetail) $ W.screens ws