diff options
author | Daniel Schoepe <asgaroth_@gmx.de> | 2009-02-03 17:00:46 +0100 |
---|---|---|
committer | Daniel Schoepe <asgaroth_@gmx.de> | 2009-02-03 17:00:46 +0100 |
commit | 43e952a307c22f7098963061f7f6127974158c13 (patch) | |
tree | adeef00961b45644558d6068522e77b36f0b2ff9 /XMonad/Hooks/EwmhDesktops.hs | |
parent | a76661c77c488d648dfdae72b2b8ab98d72c338d (diff) | |
download | XMonadContrib-43e952a307c22f7098963061f7f6127974158c13.tar.gz XMonadContrib-43e952a307c22f7098963061f7f6127974158c13.tar.xz XMonadContrib-43e952a307c22f7098963061f7f6127974158c13.zip |
Adjustments to use the new event hook feature instead of Hooks.EventHook
Ignore-this: f8c239bc8e301cbd6fa509ef748af542
darcs-hash:20090203160046-cb1c6-d66821c5b8a5a60e3b76148654c6e28806b37749.gz
Diffstat (limited to '')
-rw-r--r-- | XMonad/Hooks/EwmhDesktops.hs | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/XMonad/Hooks/EwmhDesktops.hs b/XMonad/Hooks/EwmhDesktops.hs index 2340efd..bcf870d 100644 --- a/XMonad/Hooks/EwmhDesktops.hs +++ b/XMonad/Hooks/EwmhDesktops.hs @@ -15,14 +15,14 @@ module XMonad.Hooks.EwmhDesktops ( -- * Usage -- $usage - EwmhDesktopsHook, ewmhDesktopsLogHook, ewmhDesktopsLogHookCustom, - ewmhDesktopsLayout + ewmhDesktopsEventHook ) where import Data.List import Data.Maybe +import Data.Monoid import XMonad import Control.Monad @@ -30,7 +30,6 @@ import qualified XMonad.StackSet as W import XMonad.Hooks.SetWMName import XMonad.Util.WorkspaceCompare -import XMonad.Hooks.EventHook -- $usage -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@: @@ -41,9 +40,9 @@ import XMonad.Hooks.EventHook -- > myLogHook :: X () -- > myLogHook = ewmhDesktopsLogHook -- > --- > myLayoutHook = ewmhDesktopsLayout $ avoidStruts $ layoutHook defaultConfig +-- > myHandleEventHook = ewmhDesktopsEventHook -- > --- > main = xmonad defaultConfig { layoutHook = myLayouts, logHook = myLogHook } +-- > main = xmonad defaultConfig { handleEventHook = myHandleEventHook, logHook = myLogHook } -- -- 'avoidStruts' is used to automatically leave space for dock programs, and -- can be found in 'XMonad.Hooks.ManageDocks'. @@ -119,13 +118,8 @@ ewmhDesktopsLogHookCustom f = withWindowSet $ \s -> do -- -- * _NET_ACTIVE_WINDOW (activate another window, changing workspace if needed) -- -ewmhDesktopsLayout :: layout a -> HandleEvent EwmhDesktopsHook layout a -ewmhDesktopsLayout = eventHook EwmhDesktopsHook - -data EwmhDesktopsHook = EwmhDesktopsHook deriving ( Show, Read ) -instance EventHook EwmhDesktopsHook where - handleEvent _ e@ClientMessageEvent {} = do handle e - handleEvent _ _ = return () +ewmhDesktopsEventHook :: Event -> X All +ewmhDesktopsEventHook e = handle e >> return (All True) handle :: Event -> X () handle ClientMessageEvent { |