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/Config | |
| 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/Config/Arossato.hs | 4 | ||||
| -rw-r--r-- | XMonad/Config/Desktop.hs | 3 | ||||
| -rw-r--r-- | XMonad/Config/Droundy.hs | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/XMonad/Config/Arossato.hs b/XMonad/Config/Arossato.hs index f705a23..4aa0087 100644 --- a/XMonad/Config/Arossato.hs +++ b/XMonad/Config/Arossato.hs @@ -90,8 +90,7 @@ arossatoConfig = do map show [7 .. 9 :: Int] , logHook = myDynLog xmobar -- REMOVE this line if you do not have xmobar installed! , manageHook = newManageHook - , layoutHook = eventHook ServerMode $ - avoidStruts $ + , layoutHook = avoidStruts $ decorated ||| noBorders mytabs ||| otherLays @@ -99,6 +98,7 @@ arossatoConfig = do , normalBorderColor = "white" , focusedBorderColor = "black" , keys = newKeys + , handleEventHook = serverModeEventHook , focusFollowsMouse = False } where diff --git a/XMonad/Config/Desktop.hs b/XMonad/Config/Desktop.hs index c68ae44..1959aa8 100644 --- a/XMonad/Config/Desktop.hs +++ b/XMonad/Config/Desktop.hs @@ -27,9 +27,10 @@ desktopConfig = defaultConfig { logHook = ewmhDesktopsLogHook , layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig , manageHook = manageHook defaultConfig <+> manageDocks + , handleEventHook = ewmhDesktopsEventHook , keys = \c -> desktopKeys c `M.union` keys defaultConfig c } desktopKeys (XConfig {modMask = modm}) = M.fromList $ [ ((modm, xK_b), sendMessage ToggleStruts) ] -desktopLayoutModifiers layout = avoidStruts $ ewmhDesktopsLayout layout +desktopLayoutModifiers layout = avoidStruts layout diff --git a/XMonad/Config/Droundy.hs b/XMonad/Config/Droundy.hs index a78947b..6f63688 100644 --- a/XMonad/Config/Droundy.hs +++ b/XMonad/Config/Droundy.hs @@ -44,7 +44,7 @@ import XMonad.Actions.CycleWS ( moveTo, WSType( HiddenNonEmptyWS ), import XMonad.Hooks.ManageDocks ( avoidStruts, manageDocks ) import XMonad.Hooks.EwmhDesktops ( ewmhDesktopsLogHook, - ewmhDesktopsLayout ) + ewmhDesktopsEventHook ) myXPConfig :: XPConfig myXPConfig = defaultXPConfig {font="-*-lucida-medium-r-*-*-14-*-*-*-*-*-*-*" @@ -121,7 +121,7 @@ keys x = M.fromList $ config = defaultConfig { borderWidth = 1 -- Width of the window border in pixels. , XMonad.workspaces = ["mutt","iceweasel"] - , layoutHook = ewmhDesktopsLayout $ showWName $ workspaceDir "~" $ + , layoutHook = showWName $ workspaceDir "~" $ boringWindows $ smartBorders $ windowNavigation $ maximizeVertical $ toggleLayouts Full $ avoidStruts $ named "tabbed" mytab ||| @@ -135,6 +135,7 @@ config = defaultConfig , terminal = "xterm" -- The preferred terminal program. , normalBorderColor = "#222222" -- Border color for unfocused windows. , focusedBorderColor = "#00ff00" -- Border color for focused windows. + , handleEventHook = ewmhDesktopsEventHook , XMonad.modMask = mod1Mask , XMonad.keys = keys } |