diff options
author | Spencer Janssen <sjanssen@cse.unl.edu> | 2007-12-22 11:41:14 +0100 |
---|---|---|
committer | Spencer Janssen <sjanssen@cse.unl.edu> | 2007-12-22 11:41:14 +0100 |
commit | 656c004bd143fd354667f8f1d2e8786d5cbb4b96 (patch) | |
tree | e18ba450437036df66ccd9a2e8b37986be73aa00 /XMonad/Actions/CycleWS.hs | |
parent | 0a99440e52d872287b1add151c2608f089c45c5c (diff) | |
download | XMonadContrib-656c004bd143fd354667f8f1d2e8786d5cbb4b96.tar.gz XMonadContrib-656c004bd143fd354667f8f1d2e8786d5cbb4b96.tar.xz XMonadContrib-656c004bd143fd354667f8f1d2e8786d5cbb4b96.zip |
Factor workspace sorting into a separate module
darcs-hash:20071222104114-a5988-bfd9059d0556a526c275b6d0e4a930103bd7d990.gz
Diffstat (limited to 'XMonad/Actions/CycleWS.hs')
-rw-r--r-- | XMonad/Actions/CycleWS.hs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/XMonad/Actions/CycleWS.hs b/XMonad/Actions/CycleWS.hs index f64f2fb..6e4e822 100644 --- a/XMonad/Actions/CycleWS.hs +++ b/XMonad/Actions/CycleWS.hs @@ -24,13 +24,12 @@ module XMonad.Actions.CycleWS ( toggleWS, ) where -import Data.List ( sortBy, findIndex ) +import Data.List ( findIndex ) import Data.Maybe ( fromMaybe ) -import Data.Ord ( comparing ) import XMonad hiding (workspaces) -import qualified XMonad (workspaces) import XMonad.StackSet hiding (filter) +import XMonad.Util.WorkspaceCompare -- $usage -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@ file: @@ -81,14 +80,11 @@ shiftBy d = wsBy d >>= windows . shift wsBy :: Int -> X (WorkspaceId) wsBy d = do ws <- gets windowset - spaces <- asks (XMonad.workspaces . config) - let orderedWs = sortBy (comparing (wsIndex spaces)) (workspaces ws) + sort' <- getSortByTag + let orderedWs = sort' (workspaces ws) let now = fromMaybe 0 $ findWsIndex (workspace (current ws)) orderedWs let next = orderedWs !! ((now + d) `mod` length orderedWs) return $ tag next -wsIndex :: [WorkspaceId] -> WindowSpace -> Maybe Int -wsIndex spaces ws = findIndex (== tag ws) spaces - findWsIndex :: WindowSpace -> [WindowSpace] -> Maybe Int findWsIndex ws wss = findIndex ((== tag ws) . tag) wss |