--- .cabal/share/xmonad-0.9.2/man/xmonad.hs 2011-04-22 17:37:14.000000000 -0700 +++ .xmonad/xmonad.hs 2011-04-24 00:48:26.000000000 -0700 @@ -14,6 +14,14 @@ import qualified XMonad.StackSet as W import qualified Data.Map as M +import XMonad.Hooks.DynamicLog +import XMonad.Hooks.ManageDocks +import XMonad.Layout.LayoutModifier +import System.IO +import XMonad.Util.Run +import XMonad.Prompt +import XMonad.Prompt.Shell + -- The preferred terminal program, which is used in a binding below and by -- certain contrib modules. -- @@ -74,7 +82,7 @@ [ ((modm .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf) -- launch dmenu - , ((modm, xK_p ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") + , ((modm, xK_p ), shellPrompt defaultXPConfig) -- launch gmrun , ((modm .|. shiftMask, xK_p ), spawn "gmrun") @@ -131,7 +139,7 @@ -- Use this binding with avoidStruts from Hooks.ManageDocks. -- See also the statusBar function from Hooks.DynamicLog. -- - -- , ((modm , xK_b ), sendMessage ToggleStruts) + , ((modm , xK_b ), sendMessage ToggleStruts) -- Quit xmonad , ((modm .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) @@ -189,7 +197,7 @@ -- The available layouts. Note that each layout is separated by |||, -- which denotes layout choice. -- -myLayout = tiled ||| Mirror tiled ||| Full +myLayout = avoidStruts (tiled ||| Mirror tiled ||| Full) where -- default tiling algorithm partitions the screen into two panes tiled = Tall nmaster delta ratio @@ -241,7 +249,7 @@ -- Perform an arbitrary action on each internal state change or X event. -- See the 'XMonad.Hooks.DynamicLog' extension for examples. -- -myLogHook = return () +myLogHook h = dynamicLogWithPP $ defaultPP { ppOutput = hPutStrLn h } ------------------------------------------------------------------------ -- Startup hook @@ -258,7 +266,7 @@ -- Run xmonad with the settings you specify. No need to modify this. -- -main = xmonad defaults +main = spawnPipe "xmobar" >>= xmonad . defaults -- A structure containing your configuration settings, overriding -- fields in the default config. Any you don't override, will @@ -266,7 +274,7 @@ -- -- No need to modify this. -- -defaults = defaultConfig { +defaults h = defaultConfig { -- simple stuff terminal = myTerminal, focusFollowsMouse = myFocusFollowsMouse, @@ -285,6 +293,6 @@ layoutHook = myLayout, manageHook = myManageHook, handleEventHook = myEventHook, - logHook = myLogHook, + logHook = myLogHook h, startupHook = myStartupHook }