mirror of
https://github.com/xmonad/xmonad-contrib.git
synced 2025-07-31 04:01:51 -07:00
Move EWMH support initialization to a startupHook
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.
This commit is contained in:
@@ -170,9 +170,8 @@ desktopConfig = defaultConfig
|
||||
{ logHook = ewmhDesktopsLogHook
|
||||
, layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig
|
||||
, manageHook = manageHook defaultConfig <+> manageDocks
|
||||
, startupHook = setDefaultCursor xC_left_ptr
|
||||
, handleEventHook = ewmhDesktopsEventHook
|
||||
, keys = \c -> desktopKeys c `M.union` keys defaultConfig c }
|
||||
, keys = \c -> desktopKeys c `M.union` keys defaultConfig c }
|
||||
|
||||
desktopKeys (XConfig {modMask = modm}) = M.fromList $
|
||||
[ ((modm, xK_b), sendMessage ToggleStruts) ]
|
||||
|
@@ -43,7 +43,7 @@ import XMonad.Actions.CycleWS ( moveTo, WSType( HiddenNonEmptyWS ),
|
||||
Direction1D( Prev, Next) )
|
||||
|
||||
import XMonad.Hooks.ManageDocks ( avoidStruts, manageDocks )
|
||||
import XMonad.Hooks.EwmhDesktops ( ewmhDesktopsLogHook,
|
||||
import XMonad.Hooks.EwmhDesktops ( ewmhDesktopsStartup, ewmhDesktopsLogHook,
|
||||
ewmhDesktopsEventHook )
|
||||
|
||||
myXPConfig :: XPConfig
|
||||
@@ -132,6 +132,7 @@ config = defaultConfig
|
||||
--mosaic 0.25 0.5
|
||||
, manageHook = manageHook defaultConfig <+> manageDocks -- add panel-handling
|
||||
, logHook = ewmhDesktopsLogHook -- actually, no logging here, just other stuff
|
||||
, startupHook = ewmhDesktopsStartup
|
||||
, terminal = "xterm" -- The preferred terminal program.
|
||||
, normalBorderColor = "#222222" -- Border color for unfocused windows.
|
||||
, focusedBorderColor = "#00ff00" -- Border color for focused windows.
|
||||
|
@@ -34,14 +34,15 @@ sjanssenConfig = do
|
||||
, ((modm, button2), (\w -> focus w >> windows W.swapMaster))
|
||||
, ((modm.|. shiftMask, button1), (\w -> focus w >> mouseResizeWindow w)) ]
|
||||
, keys = \c -> mykeys sp c `M.union` keys defaultConfig c
|
||||
, layoutHook = modifiers layouts
|
||||
, logHook = ewmhDesktopsLogHook
|
||||
, manageHook = composeAll [className =? x --> doShift w
|
||||
, layoutHook = modifiers layouts
|
||||
, logHook = ewmhDesktopsLogHook
|
||||
, startupHook = ewmhDesktopsStartup
|
||||
, manageHook = composeAll [className =? x --> doShift w
|
||||
| (x, w) <- [ ("Firefox", "web")
|
||||
, ("Ktorrent", "7")
|
||||
, ("Amarokapp", "7")]]
|
||||
<+> manageHook defaultConfig <+> manageDocks <+> manageSpawn sp
|
||||
<+> (isFullscreen --> doFullFloat)
|
||||
<+> manageHook defaultConfig <+> manageDocks <+> manageSpawn sp
|
||||
<+> (isFullscreen --> doFullFloat)
|
||||
}
|
||||
where
|
||||
tiled = HintedTile 1 0.03 0.5 TopLeft
|
||||
|
Reference in New Issue
Block a user