twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 03:20:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

in Prompt.Workspace sort by official workspace order.

Browse Source
This commit is contained in:
David Roundy 2008-02-29 22:30:47 +00:00
parent dca8b60cd5
commit 93cf069aab
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
XMonad/Actions/DynamicWorkspaces.hs
View File

@ -22,12 +22,11 @@ module XMonad.Actions.DynamicWorkspaces (
toNthWorkspace, withNthWorkspace toNthWorkspace, withNthWorkspace
) where ) where
import Data.List ( sort )
import XMonad hiding (workspaces) import XMonad hiding (workspaces)
import XMonad.StackSet hiding (filter, modify, delete) import XMonad.StackSet hiding (filter, modify, delete)
import XMonad.Prompt.Workspace import XMonad.Prompt.Workspace
import XMonad.Prompt ( XPConfig, mkXPrompt, XPrompt(..) ) import XMonad.Prompt ( XPConfig, mkXPrompt, XPrompt(..) )
import XMonad.Util.WorkspaceCompare ( getSortByIndex )
-- $usage -- $usage
-- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@ file: -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@ file:
@ -63,7 +62,8 @@ mkCompl l s = return $ filter (\x -> take (length s) x == s) l
withWorkspace :: XPConfig -> (String -> X ()) -> X () withWorkspace :: XPConfig -> (String -> X ()) -> X ()
withWorkspace c job = do ws <- gets (workspaces . windowset) withWorkspace c job = do ws <- gets (workspaces . windowset)
let ts = sort $ map tag ws sort <- getSortByIndex
let ts = map tag $ sort ws
job' t | t `elem` ts = job t job' t | t `elem` ts = job t
| otherwise = addHiddenWorkspace t >> job t | otherwise = addHiddenWorkspace t >> job t
mkXPrompt (Wor "") c (mkCompl ts) job' mkXPrompt (Wor "") c (mkCompl ts) job'
@ -76,13 +76,15 @@ renameWorkspace conf = workspacePrompt conf $ \w ->
in sets $ removeWorkspace' w s in sets $ removeWorkspace' w s
toNthWorkspace :: (String -> X ()) -> Int -> X () toNthWorkspace :: (String -> X ()) -> Int -> X ()
toNthWorkspace job wnum = do ws <- gets (sort . map tag . workspaces . windowset) toNthWorkspace job wnum = do sort <- getSortByIndex
ws <- gets (map tag . sort . workspaces . windowset)
case drop wnum ws of case drop wnum ws of
(w:_) -> job w (w:_) -> job w
[] -> return () [] -> return ()
withNthWorkspace :: (String -> WindowSet -> WindowSet) -> Int -> X () withNthWorkspace :: (String -> WindowSet -> WindowSet) -> Int -> X ()
withNthWorkspace job wnum = do ws <- gets (sort . map tag . workspaces . windowset) withNthWorkspace job wnum = do sort <- getSortByIndex
ws <- gets (map tag . sort . workspaces . windowset)
case drop wnum ws of case drop wnum ws of
(w:_) -> windows $ job w (w:_) -> windows $ job w
[] -> return () [] -> return ()