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/Actions/TagWindows.hs | |
| 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/Actions/TagWindows.hs')
| -rw-r--r-- | XMonad/Actions/TagWindows.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/XMonad/Actions/TagWindows.hs b/XMonad/Actions/TagWindows.hs index 4501e7d..01ea1d8 100644 --- a/XMonad/Actions/TagWindows.hs +++ b/XMonad/Actions/TagWindows.hs @@ -120,7 +120,7 @@ wsToList ws = crs ++ cls wsToListGlobal :: (Ord i) => StackSet i l a s sd -> [a] wsToListGlobal ws = concat ([crs] ++ rws ++ lws ++ [cls]) where - curtag = tag . workspace . current $ ws + curtag = currentTag ws (crs, cls) = (cms down, cms (reverse . up)) cms f = maybe [] f (stack . workspace . current $ ws) (lws, rws) = (mws (<), mws (>)) @@ -149,8 +149,7 @@ withTagged t f = withTagged' t (mapM_ f) withTaggedGlobal t f = withTaggedGlobal' t (mapM_ f) withTagged' :: String -> ([Window] -> X ()) -> X () -withTagged' t m = gets windowset >>= - filterM (hasTag t) . integrate' . stack . workspace . current >>= m +withTagged' t m = gets windowset >>= filterM (hasTag t) . index >>= m withTaggedGlobal' :: String -> ([Window] -> X ()) -> X () withTaggedGlobal' t m = gets windowset >>= @@ -160,7 +159,7 @@ withFocusedP :: (Window -> WindowSet -> WindowSet) -> X () withFocusedP f = withFocused $ windows . f shiftHere :: (Ord a, Eq s, Eq i) => a -> StackSet i l a s sd -> StackSet i l a s sd -shiftHere w s = shiftWin (tag . workspace . current $ s) w s +shiftHere w s = shiftWin (currentTag s) w s shiftToScreen :: (Ord a, Eq s, Eq i) => s -> a -> StackSet i l a s sd -> StackSet i l a s sd shiftToScreen sid w s = case filter (\m -> sid /= screen m) ((current s):(visible s)) of |