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

Remove X.A.GroupNavigation.currentWindow

Browse Source 
This function does the same as X.StackSet.peek and all its uses have been
replaced with X.StackSet.peek.
This commit is contained in:
Norbert Zeh 2011-09-20 08:39:22 +00:00
parent 7f70beaf4f
commit 41d23c1749
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
XMonad/Actions/GroupNavigation.hs
View File

@ -129,18 +129,13 @@ orderedWindowList dir = withWindowSet $ \ss -> do
wins = dirfun dir
$ Fold.foldl' (><) Seq.empty
$ fmap (Seq.fromList . SS.integrate' . SS.stack) wspcs
cur = currentWindow ss
cur = SS.peek ss
return $ maybe wins (rotfun wins) cur
where
dirfun Backward = Seq.reverse
dirfun _ = id
rotfun wins x = rotate $ rotateTo (== x) wins
-- Returns the currently focused window or Nothing if no window is
-- currently focused.
currentWindow :: WindowSet -> Maybe Window
currentWindow = liftM SS.focus . SS.stack . SS.workspace . SS.current
-- Returns the ordered workspace list as specified in ~/.xmonad/xmonad.hs
orderedWorkspaceList :: WindowSet -> Seq String -> Seq WindowSpace
orderedWorkspaceList ss wsids = rotateTo isCurWS wspcs'
@ -170,7 +165,7 @@ historyHook = XS.get >>= updateHistory >>= XS.put
-- Updates the history in response to a WindowSet change
updateHistory :: HistoryDB -> X HistoryDB
updateHistory (HistoryDB oldcur oldhist) = withWindowSet $ \ss -> do
let newcur = currentWindow ss
let newcur = SS.peek ss
wins = Set.fromList $ SS.allWindows ss
newhist = flt (flip Set.member wins) (ins oldcur oldhist)
return $ HistoryDB newcur (del newcur newhist)