Use 'ewmh' in relevant configs

This commit is contained in:
Spencer Janssen 2009-10-23 03:50:43 +00:00
parent 4832f0fc7d
commit 5417286d6a
3 changed files with 5 additions and 13 deletions

View File

@ -166,12 +166,10 @@ import qualified Data.Map as M
-- > adjustEventInput -- > adjustEventInput
-- --
desktopConfig = defaultConfig desktopConfig = ewmh defaultConfig
{ startupHook = ewmhDesktopsStartup >> setDefaultCursor xC_left_ptr { startupHook = setDefaultCursor xC_left_ptr
, logHook = ewmhDesktopsLogHook
, layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig , layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig
, manageHook = manageHook defaultConfig <+> manageDocks , manageHook = manageHook defaultConfig <+> manageDocks
, 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 $ desktopKeys (XConfig {modMask = modm}) = M.fromList $

View File

@ -43,8 +43,7 @@ import XMonad.Actions.CycleWS ( moveTo, WSType( HiddenNonEmptyWS ),
Direction1D( Prev, Next) ) Direction1D( Prev, Next) )
import XMonad.Hooks.ManageDocks ( avoidStruts, manageDocks ) import XMonad.Hooks.ManageDocks ( avoidStruts, manageDocks )
import XMonad.Hooks.EwmhDesktops ( ewmhDesktopsStartup, ewmhDesktopsLogHook, import XMonad.Hooks.EwmhDesktops ( ewmh )
ewmhDesktopsEventHook )
myXPConfig :: XPConfig myXPConfig :: XPConfig
myXPConfig = defaultXPConfig {font="-*-lucida-medium-r-*-*-14-*-*-*-*-*-*-*" myXPConfig = defaultXPConfig {font="-*-lucida-medium-r-*-*-14-*-*-*-*-*-*-*"
@ -118,7 +117,7 @@ keys x = M.fromList $
++ ++
zip (zip (repeat (modMask x .|. shiftMask)) [xK_F1..xK_F12]) (map (withNthWorkspace copy) [0..]) zip (zip (repeat (modMask x .|. shiftMask)) [xK_F1..xK_F12]) (map (withNthWorkspace copy) [0..])
config = defaultConfig config = ewmh defaultConfig
{ borderWidth = 1 -- Width of the window border in pixels. { borderWidth = 1 -- Width of the window border in pixels.
, XMonad.workspaces = ["mutt","iceweasel"] , XMonad.workspaces = ["mutt","iceweasel"]
, layoutHook = showWName $ workspaceDir "~" $ , layoutHook = showWName $ workspaceDir "~" $
@ -131,12 +130,9 @@ config = defaultConfig
****//* combineTwo Square mytab mytab) -- ||| ****//* combineTwo Square mytab mytab) -- |||
--mosaic 0.25 0.5 --mosaic 0.25 0.5
, manageHook = manageHook defaultConfig <+> manageDocks -- add panel-handling , manageHook = manageHook defaultConfig <+> manageDocks -- add panel-handling
, logHook = ewmhDesktopsLogHook -- actually, no logging here, just other stuff
, startupHook = ewmhDesktopsStartup
, terminal = "xterm" -- The preferred terminal program. , terminal = "xterm" -- The preferred terminal program.
, normalBorderColor = "#222222" -- Border color for unfocused windows. , normalBorderColor = "#222222" -- Border color for unfocused windows.
, focusedBorderColor = "#00ff00" -- Border color for focused windows. , focusedBorderColor = "#00ff00" -- Border color for focused windows.
, handleEventHook = ewmhDesktopsEventHook
, XMonad.modMask = mod1Mask , XMonad.modMask = mod1Mask
, XMonad.keys = keys , XMonad.keys = keys
} }

View File

@ -26,7 +26,7 @@ sjanssenConfigXmobar = statusBar "exec xmobar" sjanssenPP strutkey =<< sjanssenC
sjanssenConfig = do sjanssenConfig = do
sp <- mkSpawner sp <- mkSpawner
return $ defaultConfig return . ewmh $ defaultConfig
{ terminal = "exec urxvt" { terminal = "exec urxvt"
, workspaces = ["irc", "web"] ++ map show [3 .. 9 :: Int] , workspaces = ["irc", "web"] ++ map show [3 .. 9 :: Int]
, mouseBindings = \(XConfig {modMask = modm}) -> M.fromList $ , mouseBindings = \(XConfig {modMask = modm}) -> M.fromList $
@ -35,8 +35,6 @@ sjanssenConfig = do
, ((modm.|. shiftMask, button1), (\w -> focus w >> mouseResizeWindow w)) ] , ((modm.|. shiftMask, button1), (\w -> focus w >> mouseResizeWindow w)) ]
, keys = \c -> mykeys sp c `M.union` keys defaultConfig c , keys = \c -> mykeys sp c `M.union` keys defaultConfig c
, layoutHook = modifiers layouts , layoutHook = modifiers layouts
, logHook = ewmhDesktopsLogHook
, startupHook = ewmhDesktopsStartup
, manageHook = composeAll [className =? x --> doShift w , manageHook = composeAll [className =? x --> doShift w
| (x, w) <- [ ("Firefox", "web") | (x, w) <- [ ("Firefox", "web")
, ("Ktorrent", "7") , ("Ktorrent", "7")