From 71fec4f61a980ad58d5628a0b3957ea4cc765ff0 Mon Sep 17 00:00:00 2001 From: Alex Hirzel Date: Sun, 3 Mar 2019 10:08:25 -0500 Subject: [PATCH 1/3] Actions.GroupNavigation: fix bad import --- XMonad/Actions/GroupNavigation.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/XMonad/Actions/GroupNavigation.hs b/XMonad/Actions/GroupNavigation.hs index eb465da9..2aa960c8 100644 --- a/XMonad/Actions/GroupNavigation.hs +++ b/XMonad/Actions/GroupNavigation.hs @@ -234,8 +234,8 @@ isOnAnyVisibleWS :: Query Bool isOnAnyVisibleWS = do w <- ask ws <- liftX $ gets windowset - let allVisible = concat $ maybe [] W.integrate . W.stack . W.workspace <$> W.current ws:W.visible ws + let allVisible = concat $ maybe [] SS.integrate . SS.stack . SS.workspace <$> SS.current ws:SS.visible ws visibleWs = w `elem` allVisible - unfocused = maybe True (w /=) $ W.peek ws + unfocused = maybe True (w /=) $ SS.peek ws return $ visibleWs && unfocused From faa252e3091f87e732603c815220fd75fc5a3378 Mon Sep 17 00:00:00 2001 From: Alex Hirzel Date: Sun, 3 Mar 2019 10:20:22 -0500 Subject: [PATCH 2/3] Actions.GroupNavigation: another import issue --- XMonad/Actions/GroupNavigation.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XMonad/Actions/GroupNavigation.hs b/XMonad/Actions/GroupNavigation.hs index 2aa960c8..5f8c126a 100644 --- a/XMonad/Actions/GroupNavigation.hs +++ b/XMonad/Actions/GroupNavigation.hs @@ -233,7 +233,7 @@ findM cond xs = findM' cond (viewl xs) isOnAnyVisibleWS :: Query Bool isOnAnyVisibleWS = do w <- ask - ws <- liftX $ gets windowset + ws <- liftX $ XS.gets windowset let allVisible = concat $ maybe [] SS.integrate . SS.stack . SS.workspace <$> SS.current ws:SS.visible ws visibleWs = w `elem` allVisible unfocused = maybe True (w /=) $ SS.peek ws From ca69574cfe49991a2cf941de22ead3d4e0be56c9 Mon Sep 17 00:00:00 2001 From: Alex Hirzel Date: Sun, 3 Mar 2019 10:59:58 -0500 Subject: [PATCH 3/3] Actions.GroupNavigation: add CMS import --- XMonad/Actions/GroupNavigation.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/XMonad/Actions/GroupNavigation.hs b/XMonad/Actions/GroupNavigation.hs index 5f8c126a..63acc990 100644 --- a/XMonad/Actions/GroupNavigation.hs +++ b/XMonad/Actions/GroupNavigation.hs @@ -34,6 +34,7 @@ module XMonad.Actions.GroupNavigation ( -- * Usage ) where import Control.Monad.Reader +import Control.Monad.State import Data.Foldable as Fold import Data.Map as Map import Data.Sequence as Seq @@ -233,7 +234,7 @@ findM cond xs = findM' cond (viewl xs) isOnAnyVisibleWS :: Query Bool isOnAnyVisibleWS = do w <- ask - ws <- liftX $ XS.gets windowset + ws <- liftX $ gets windowset let allVisible = concat $ maybe [] SS.integrate . SS.stack . SS.workspace <$> SS.current ws:SS.visible ws visibleWs = w `elem` allVisible unfocused = maybe True (w /=) $ SS.peek ws