From 0983b157023be1556f7b34372786e61264cf8a0b Mon Sep 17 00:00:00 2001 From: Daniel Schoepe Date: Sat, 10 Jan 2009 23:18:52 +0100 Subject: More flexible userCode function darcs-hash:20090110221852-cb1c6-80f042287c9c6b704a37a2704e29841416aeca9b --- XMonad/Operations.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'XMonad/Operations.hs') diff --git a/XMonad/Operations.hs b/XMonad/Operations.hs index 8cc1710..fe124f3 100644 --- a/XMonad/Operations.hs +++ b/XMonad/Operations.hs @@ -23,7 +23,7 @@ import XMonad.Layout (Full(..)) import qualified XMonad.StackSet as W import Data.Maybe -import Data.Monoid (appEndo) +import Data.Monoid (Endo(..)) import Data.List (nub, (\\), find) import Data.Bits ((.|.), (.&.), complement) import Data.Ratio @@ -68,7 +68,7 @@ manage w = whenX (not <$> isClient w) $ withDisplay $ \d -> do where i = W.tag $ W.workspace $ W.current ws mh <- asks (manageHook . config) - g <- fmap appEndo (runQuery mh w) `catchX` return id + g <- fmap appEndo $ userCodeDef (Endo id) (runQuery mh w) windows (g . f) -- | unmanage. A window no longer exists, remove it from the window @@ -169,7 +169,7 @@ windows f = do isMouseFocused <- asks mouseFocused unless isMouseFocused $ clearEvents enterWindowMask - asks (logHook . config) >>= userCode + asks (logHook . config) >>= userCodeDef () -- | Produce the actual rectangle from a screen and a ratio on that screen. scaleRationalRect :: Rectangle -> W.RationalRect -> Rectangle -- cgit v1.2.3