aboutsummaryrefslogtreecommitdiffstats
path: root/XMonad/Hooks
diff options
context:
space:
mode:
authorJustin Bogner <mail@justinbogner.com>2009-10-11 07:35:38 +0200
committerJustin Bogner <mail@justinbogner.com>2009-10-11 07:35:38 +0200
commit6684e84f50d60cea956704be91d8ad7e0975564a (patch)
tree29f580b0ca724bb735dd648e7a84714296925b15 /XMonad/Hooks
parenta072ea53173f5f552d483f39a1e00b53619a1ad7 (diff)
downloadXMonadContrib-6684e84f50d60cea956704be91d8ad7e0975564a.tar.gz
XMonadContrib-6684e84f50d60cea956704be91d8ad7e0975564a.tar.xz
XMonadContrib-6684e84f50d60cea956704be91d8ad7e0975564a.zip
Move EWMH support initialization to a startupHook
Ignore-this: bd35654d0afb0a2fec73b16ab7ac38b1 Set EWMH support atoms and the window manager name in a startup hook, rather than in the log hook: the log hook occurs far too frequently for it to make sense to set constants with it. darcs-hash:20091011053538-18f27-82f5abfaeba77a65ca836222d089c92d581b25bf.gz
Diffstat (limited to 'XMonad/Hooks')
-rw-r--r--XMonad/Hooks/EwmhDesktops.hs30
1 files changed, 10 insertions, 20 deletions
diff --git a/XMonad/Hooks/EwmhDesktops.hs b/XMonad/Hooks/EwmhDesktops.hs
index 720376f..f263941 100644
--- a/XMonad/Hooks/EwmhDesktops.hs
+++ b/XMonad/Hooks/EwmhDesktops.hs
@@ -15,6 +15,7 @@
module XMonad.Hooks.EwmhDesktops (
-- * Usage
-- $usage
+ ewmhDesktopsStartup,
ewmhDesktopsLogHook,
ewmhDesktopsLogHookCustom,
ewmhDesktopsEventHook
@@ -38,26 +39,18 @@ import XMonad.Util.WorkspaceCompare
-- > import XMonad
-- > import XMonad.Hooks.EwmhDesktops
-- >
--- > myLogHook :: X ()
--- > myLogHook = ewmhDesktopsLogHook
--- >
--- > myHandleEventHook = ewmhDesktopsEventHook
--- >
--- > 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'.
---
--- For more detailed instructions on editing the layoutHook see:
---
--- "XMonad.Doc.Extending#The_log_hook_and_external_status_bars"
+-- > main = xmonad defaultConfig { startupHook = ewmhDesktopsStartup
+-- > , handleEventHook = ewmhDesktopsEventHook
+-- > , logHook = ewmhDesktopsLogHook }
--
--- For more detailed instructions on editing the layoutHook see:
---
--- "XMonad.Doc.Extending#Editing_the_layout_hook"
-
+-- You may also be interested in 'avoidStruts' from XMonad.Hooks.ManageDocks.
+-- |
+-- Initializes EwmhDesktops and advertises EWMH support to the X
+-- server
+ewmhDesktopsStartup :: X ()
+ewmhDesktopsStartup = setSupported
-- |
-- Notifies pagers and window lists, such as those in the gnome-panel
@@ -65,7 +58,6 @@ import XMonad.Util.WorkspaceCompare
ewmhDesktopsLogHook :: X ()
ewmhDesktopsLogHook = ewmhDesktopsLogHookCustom id
-
-- |
-- Generalized version of ewmhDesktopsLogHook that allows an arbitrary
-- user-specified function to transform the workspace list (post-sorting)
@@ -74,8 +66,6 @@ ewmhDesktopsLogHookCustom f = withWindowSet $ \s -> do
sort' <- getSortByIndex
let ws = f $ sort' $ W.workspaces s
- setSupported
-
-- Number of Workspaces
setNumberOfDesktops (length ws)