diff options
| author | Devin Mullins <me@twifkak.com> | 2008-09-21 03:11:59 +0200 |
|---|---|---|
| committer | Devin Mullins <me@twifkak.com> | 2008-09-21 03:11:59 +0200 |
| commit | 508debd233d9bddf5f5f8c8ad071fcbe52da4f0e (patch) | |
| tree | acf8b9e46e295dbb61db0b137456d4e32505da2d /XMonad/Hooks | |
| parent | 4f7c0734e3736dce79dda5656f6bd88540d9e9d1 (diff) | |
| download | XMonadContrib-508debd233d9bddf5f5f8c8ad071fcbe52da4f0e.tar.gz XMonadContrib-508debd233d9bddf5f5f8c8ad071fcbe52da4f0e.tar.xz XMonadContrib-508debd233d9bddf5f5f8c8ad071fcbe52da4f0e.zip | |
cleanup - use currentTag
darcs-hash:20080921011159-78224-b0ac172560719cba3a1c41171d91e222a6fa1304.gz
Diffstat (limited to 'XMonad/Hooks')
| -rw-r--r-- | XMonad/Hooks/DynamicLog.hs | 2 | ||||
| -rw-r--r-- | XMonad/Hooks/EventHook.hs | 5 | ||||
| -rw-r--r-- | XMonad/Hooks/EwmhDesktops.hs | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/XMonad/Hooks/DynamicLog.hs b/XMonad/Hooks/DynamicLog.hs index d0696dc..db16042 100644 --- a/XMonad/Hooks/DynamicLog.hs +++ b/XMonad/Hooks/DynamicLog.hs @@ -256,7 +256,7 @@ dynamicLogString pp = do pprWindowSet :: WorkspaceSort -> [Window] -> PP -> WindowSet -> String pprWindowSet sort' urgents pp s = sepBy (ppWsSep pp) . map fmt . sort' $ map S.workspace (S.current s : S.visible s) ++ S.hidden s - where this = S.tag (S.workspace (S.current s)) + where this = S.currentTag s visibles = map (S.tag . S.workspace) (S.visible s) fmt w = printer pp (S.tag w) diff --git a/XMonad/Hooks/EventHook.hs b/XMonad/Hooks/EventHook.hs index 0022386..234de48 100644 --- a/XMonad/Hooks/EventHook.hs +++ b/XMonad/Hooks/EventHook.hs @@ -29,11 +29,10 @@ module XMonad.Hooks.EventHook , HandleEvent ) where -import Control.Applicative ((<$>)) import Data.Maybe import XMonad -import XMonad.StackSet (StackSet (..), Screen (..), Workspace (..)) +import XMonad.StackSet (Workspace (..), currentTag) -- $usage -- You can use this module with the following in your @@ -89,7 +88,7 @@ instance Message EventHandleMsg instance (EventHook eh, LayoutClass l a) => LayoutClass (HandleEvent eh l) a where runLayout (Workspace i (HandleEvent Nothing True eh l) ms) r = do broadcastMessage HandlerOff - iws <- (tag . workspace . current) <$> gets windowset + iws <- gets (currentTag . windowset) (wrs, ml) <- runLayout (Workspace i l ms) r return (wrs, Just $ HandleEvent (Just iws) True eh (fromMaybe l ml)) diff --git a/XMonad/Hooks/EwmhDesktops.hs b/XMonad/Hooks/EwmhDesktops.hs index 83a05a6..6eec3bf 100644 --- a/XMonad/Hooks/EwmhDesktops.hs +++ b/XMonad/Hooks/EwmhDesktops.hs @@ -83,7 +83,7 @@ ewmhDesktopsLogHookCustom f = withWindowSet $ \s -> do setDesktopNames (map W.tag ws) -- Current desktop - let curr = fromJust $ elemIndex (W.tag (W.workspace (W.current s))) $ map W.tag ws + let curr = fromJust $ elemIndex (W.currentTag s) $ map W.tag ws setCurrentDesktop curr |