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

X.A.CycleRecentWS: Simplify unView even more

Browse Source 
Instead of implementing `view` in reverse, we can use it directly and
then just fix the order of visible/hidden workspaces.
This commit is contained in:
Tomas Janousek 2021-05-14 10:13:21 +01:00 committed by slotThe
parent 12b30c393c
commit b65b83661b
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
XMonad/Actions/CycleRecentWS.hs
View File

@ -1,6 +1,7 @@
{-# LANGUAGE CPP #-} {-# LANGUAGE CPP #-}
{-# LANGUAGE MultiWayIf #-} {-# LANGUAGE MultiWayIf #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE PatternGuards #-}
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- | -- |
-- Module : XMonad.Actions.CycleRecentWS -- Module : XMonad.Actions.CycleRecentWS
@ -137,25 +138,16 @@ cycleWindowSets genOptions mods keyNext keyPrev = do
-- 'view' away from the old one, restore the workspace order of the -- 'view' away from the old one, restore the workspace order of the
-- former inside of the latter. This respects any new state that the -- former inside of the latter. This respects any new state that the
-- new 'WindowSet' may have accumulated. -- new 'WindowSet' may have accumulated.
unView :: forall i l a s sd. Eq i unView :: forall i l a s sd. (Eq i, Eq s)
=> StackSet i l a s sd -> StackSet i l a s sd -> StackSet i l a s sd => StackSet i l a s sd -> StackSet i l a s sd -> StackSet i l a s sd
unView w0 w unView w0 = fixOrderH . fixOrderV . view (currentTag w0)
| currentTag w0 == currentTag w = w
| v1 : vs <- visible w
, currentTag w0 == (tag . workspace) v1
= w { current = v1
, visible = insertAt (commonPrefixV (visible w0) vs) (current w) vs }
| h1 : hs <- hidden w
, currentTag w0 == tag h1
= w { current = (current w){ workspace = h1 }
, hidden = insertAt (commonPrefixH (hidden w0) hs) (workspace (current w)) hs }
| otherwise = w
where where
commonPrefixV = commonPrefix `on` fmap (tag . workspace) fixOrderV w | v : vs <- visible w = w{ visible = insertAt (pfxV (visible w0) vs) v vs }
commonPrefixH = commonPrefix `on` fmap tag | otherwise = w
fixOrderH w | h : hs <- hidden w = w{ hidden = insertAt (pfxH (hidden w0) hs) h hs }
| otherwise = w
pfxV = commonPrefix `on` fmap (tag . workspace)
pfxH = commonPrefix `on` fmap tag
insertAt :: Int -> x -> [x] -> [x] insertAt :: Int -> x -> [x] -> [x]
insertAt n x xs = let (l, r) = splitAt n xs in l ++ [x] ++ r insertAt n x xs = let (l, r) = splitAt n xs in l ++ [x] ++ r