diff options
| author | Daniel Schoepe <daniel.schoepe@gmail.com> | 2009-11-06 12:56:01 +0100 |
|---|---|---|
| committer | Daniel Schoepe <daniel.schoepe@gmail.com> | 2009-11-06 12:56:01 +0100 |
| commit | 737258a32fe0d73c589e7200a608bc72923b5c9c (patch) | |
| tree | 807a10903dca74f6917e657000779fccf3296efe /XMonad/Config | |
| parent | 943e36b8af561ef2a6de874bbd34f53c52c37570 (diff) | |
| download | XMonadContrib-737258a32fe0d73c589e7200a608bc72923b5c9c.tar.gz XMonadContrib-737258a32fe0d73c589e7200a608bc72923b5c9c.tar.xz XMonadContrib-737258a32fe0d73c589e7200a608bc72923b5c9c.zip | |
Use X.U.ExtensibleState instead of IORefs
Ignore-this: e0e80e31e51dfe76f2b2ed597892cbba
This patch changes SpawnOn, DynamicHooks and UrgencyHooks to
use X.U.ExtensibleState instead of IORefs. This simplifies the
usage of those modules thus also breaking current configs.
darcs-hash:20091106115601-7f603-4e2ce344aca377c5c4409b139ad35ca4b1311185.gz
Diffstat (limited to 'XMonad/Config')
| -rw-r--r-- | XMonad/Config/Sjanssen.hs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/XMonad/Config/Sjanssen.hs b/XMonad/Config/Sjanssen.hs index ba7d11b..be5a72b 100644 --- a/XMonad/Config/Sjanssen.hs +++ b/XMonad/Config/Sjanssen.hs @@ -21,7 +21,7 @@ import XMonad.Layout.TwoPane import qualified Data.Map as M sjanssenConfig = do - sp <- mkSpawner :: IO Spawner + sp <- mkSpawner return . ewmh $ defaultConfig { terminal = "exec urxvt" , workspaces = ["irc", "web"] ++ map show [3 .. 9 :: Int] @@ -30,13 +30,12 @@ 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 - , logHook = dynamicLogString sjanssenPP >>= xmonadPropLog , layoutHook = modifiers layouts , manageHook = composeAll [className =? x --> doShift w | (x, w) <- [ ("Firefox", "web") , ("Ktorrent", "7") , ("Amarokapp", "7")]] - <+> manageHook defaultConfig <+> manageDocks <+> manageSpawn sp + <+> manageHook defaultConfig <+> manageDocks <+> manageSpawn <+> (isFullscreen --> doFullFloat) } where @@ -44,9 +43,9 @@ sjanssenConfig = do layouts = (tiled Tall ||| (tiled Wide ||| Full)) ||| tabbed shrinkText myTheme modifiers = avoidStruts . smartBorders - mykeys sp (XConfig {modMask = modm}) = M.fromList $ - [((modm, xK_p ), shellPromptHere sp myPromptConfig) - ,((modm .|. shiftMask, xK_Return), spawnHere sp =<< asks (terminal . config)) + mykeys (XConfig {modMask = modm}) = M.fromList $ + [((modm, xK_p ), shellPromptHere myPromptConfig) + ,((modm .|. shiftMask, xK_Return), spawnHere =<< asks (terminal . config)) ,((modm .|. shiftMask, xK_c ), kill1) ,((modm .|. shiftMask .|. controlMask, xK_c ), kill) ,((modm .|. shiftMask, xK_0 ), windows $ copyToAll) |