From d414c76da897c17f5bbf43fd2580a373421c8a7e Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 16 Jul 2016 13:22:12 -0400 Subject: [PATCH 1/4] warnings: rename shadowing variables --- XMonad/Actions/DynamicProjects.hs | 10 +++++----- XMonad/Hooks/ManageDocks.hs | 6 +++--- XMonad/Prompt/Window.hs | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/XMonad/Actions/DynamicProjects.hs b/XMonad/Actions/DynamicProjects.hs index 90bbe288..10a8b852 100644 --- a/XMonad/Actions/DynamicProjects.hs +++ b/XMonad/Actions/DynamicProjects.hs @@ -154,13 +154,13 @@ dynamicProjects ps c = -- | Log hook for tracking workspace changes. dynamicProjectsLogHook :: X () dynamicProjectsLogHook = do - name <- gets (W.tag . W.workspace . W.current . windowset) - state <- XS.get + name <- gets (W.tag . W.workspace . W.current . windowset) + xstate <- XS.get - unless (Just name == previousProject state) $ do - XS.put (state {previousProject = Just name}) + unless (Just name == previousProject xstate) $ do + XS.put (xstate {previousProject = Just name}) activateProject . fromMaybe (defProject name) $ - Map.lookup name (projects state) + Map.lookup name (projects xstate) -------------------------------------------------------------------------------- -- | Start-up hook for recording configured projects. diff --git a/XMonad/Hooks/ManageDocks.hs b/XMonad/Hooks/ManageDocks.hs index 93d131b9..2c92c04b 100644 --- a/XMonad/Hooks/ManageDocks.hs +++ b/XMonad/Hooks/ManageDocks.hs @@ -278,9 +278,9 @@ instance LayoutModifier AvoidStruts a where nsmap <- getRawStruts dockWins if nsmap /= smap then do - nr <- fmap ($ r) (calcGap dockWins ss) - setWorkarea nr - return (nr, nsmap) + wnr <- fmap ($ r) (calcGap dockWins ss) + setWorkarea wnr + return (wnr, nsmap) else do return (nr, smap) _ -> do diff --git a/XMonad/Prompt/Window.hs b/XMonad/Prompt/Window.hs index a85838a7..66f1ce2d 100644 --- a/XMonad/Prompt/Window.hs +++ b/XMonad/Prompt/Window.hs @@ -91,9 +91,9 @@ allWindows = windowMap -- | A helper to get the map of windows of the current workspace. wsWindows :: XWindowMap -wsWindows = withWindowSet (return . W.index) >>= windowMap +wsWindows = withWindowSet (return . W.index) >>= winmap where - windowMap = fmap M.fromList . mapM pair + winmap = fmap M.fromList . mapM pair pair w = do name <- fmap show $ getName w return (name, w) @@ -102,16 +102,16 @@ wsWindows = withWindowSet (return . W.index) >>= windowMap type XWindowMap = X (M.Map String Window) -- | Pops open a prompt with window titles belonging to --- windowMap. Choose one, and an action is applied on the +-- winmap. Choose one, and an action is applied on the -- selected window, according to WindowPrompt. windowPrompt :: XPConfig -> WindowPrompt -> XWindowMap -> X () -windowPrompt c t windowMap = do +windowPrompt c t winmap = do a <- case t of - Goto -> fmap gotoAction windowMap - Bring -> fmap bringAction windowMap - BringCopy -> fmap bringCopyAction windowMap - BringToMaster -> fmap bringToMaster windowMap - wm <- windowMap + Goto -> fmap gotoAction winmap + Bring -> fmap bringAction winmap + BringCopy -> fmap bringCopyAction winmap + BringToMaster -> fmap bringToMaster winmap + wm <- winmap mkXPrompt t c (compList wm) a where From 8fd8c5d02d14cbc836c1def8b907b7e4110d864a Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 16 Jul 2016 13:22:34 -0400 Subject: [PATCH 2/4] warnings: remove unused variables --- XMonad/Hooks/ManageDocks.hs | 3 +-- XMonad/Hooks/PositionStoreHooks.hs | 2 -- XMonad/Util/Loggers/NamedScratchpad.hs | 2 +- XMonad/Util/NoTaskbar.hs | 4 +--- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/XMonad/Hooks/ManageDocks.hs b/XMonad/Hooks/ManageDocks.hs index 2c92c04b..a1ee158a 100644 --- a/XMonad/Hooks/ManageDocks.hs +++ b/XMonad/Hooks/ManageDocks.hs @@ -44,7 +44,7 @@ import Data.Functor((<$>)) import qualified Data.Set as S import qualified Data.Map as M -import Data.Maybe (fromMaybe, catMaybes) +import Data.Maybe (fromMaybe) import Control.Monad (when, forM_, filterM) -- $usage @@ -272,7 +272,6 @@ instance Message SetStruts instance LayoutModifier AvoidStruts a where modifyLayoutWithUpdate as@(AvoidStruts ss cache smap) w r = do let dockWins = M.keys smap - nsmap <- getRawStruts dockWins (nr, nsmap) <- case cache of Just (ss', r', nr) | ss' == ss, r' == r -> do nsmap <- getRawStruts dockWins diff --git a/XMonad/Hooks/PositionStoreHooks.hs b/XMonad/Hooks/PositionStoreHooks.hs index 4e21cafa..2a41cf67 100644 --- a/XMonad/Hooks/PositionStoreHooks.hs +++ b/XMonad/Hooks/PositionStoreHooks.hs @@ -88,8 +88,6 @@ positionStoreInit mDecoTheme w = withDisplay $ \d -> do else do sc <- fromMaybe (W.current ws) <$> pointScreen (fi $ wa_x wa) (fi $ wa_y wa) let sr = screenRect . W.screenDetail $ sc - rootw <- asks theRoot - (_,_,wins) <- io $ queryTree d rootw sr' <- fmap ($ sr) (calcGapForAll $ S.fromList [minBound .. maxBound]) -- take docks into account, accepting -- a somewhat unfortunate inter-dependency -- with 'XMonad.Hooks.ManageDocks' diff --git a/XMonad/Util/Loggers/NamedScratchpad.hs b/XMonad/Util/Loggers/NamedScratchpad.hs index 6d8acc62..e7ca2284 100644 --- a/XMonad/Util/Loggers/NamedScratchpad.hs +++ b/XMonad/Util/Loggers/NamedScratchpad.hs @@ -93,7 +93,7 @@ nspTrackHook _ (DestroyWindowEvent {ev_window = w}) = do return (All True) nspTrackHook ns (ConfigureRequestEvent {ev_window = w}) = do NSPTrack ws <- XS.get - ws' <- forM (zip3 [0..] ws ns) $ \(n,w',NS _ _ q _) -> do + ws' <- forM (zip3 [0..] ws ns) $ \(_,w',NS _ _ q _) -> do p <- runQuery q w return $ if p then Just w else w' XS.put $ NSPTrack ws' diff --git a/XMonad/Util/NoTaskbar.hs b/XMonad/Util/NoTaskbar.hs index 19b805b2..ce5795d1 100644 --- a/XMonad/Util/NoTaskbar.hs +++ b/XMonad/Util/NoTaskbar.hs @@ -7,8 +7,7 @@ import XMonad.Core import XMonad.ManageHook import Graphics.X11.Xlib (Window) import Graphics.X11.Xlib.Atom (aTOM) -import Graphics.X11.Xlib.Extras (getWindowProperty32 - ,changeProperty32 +import Graphics.X11.Xlib.Extras (changeProperty32 ,propModePrepend) import Control.Monad.Reader (ask) @@ -27,7 +26,6 @@ markNoTaskbar w = withDisplay $ \d -> do ws <- getAtom "_NET_WM_STATE" ntb <- getAtom "_NET_WM_STATE_SKIP_TASKBAR" npg <- getAtom "_NET_WM_STATE_SKIP_PAGER" - wst' <- io $ getWindowProperty32 d ws w io $ changeProperty32 d w ws aTOM propModePrepend [fi ntb,fi npg] -- sigh From 637c5c67b102baee9998a536a8455e7755da6086 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 16 Jul 2016 13:22:45 -0400 Subject: [PATCH 3/4] BinarySpacePartition: add type signature for noRef --- XMonad/Layout/BinarySpacePartition.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/XMonad/Layout/BinarySpacePartition.hs b/XMonad/Layout/BinarySpacePartition.hs index d6b4457c..206e13a7 100644 --- a/XMonad/Layout/BinarySpacePartition.hs +++ b/XMonad/Layout/BinarySpacePartition.hs @@ -425,6 +425,7 @@ optimizeOrientation rct (t, cs) = Just (opt t rct, cs) -- initially focused leaf, path from root to selected node, window ids of borders highlighting the selection data NodeRef = NodeRef { refLeaf :: Int, refPath :: [Direction2D], refWins :: [Window] } deriving (Show,Read,Eq) +noRef :: NodeRef noRef = NodeRef (-1) [] [] goToNode :: NodeRef -> Zipper a -> Maybe (Zipper a) From 4e880b37a2de8463e797f35ff8b8aefc75809927 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 16 Jul 2016 13:22:58 -0400 Subject: [PATCH 4/4] IfMax: add the PatternGuards extension --- XMonad/Layout/IfMax.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XMonad/Layout/IfMax.hs b/XMonad/Layout/IfMax.hs index 9d3d4a68..4d20282e 100644 --- a/XMonad/Layout/IfMax.hs +++ b/XMonad/Layout/IfMax.hs @@ -14,7 +14,7 @@ -- ----------------------------------------------------------------------------- -{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, FlexibleContexts #-} +{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, FlexibleContexts, PatternGuards #-} module XMonad.Layout.IfMax ( -- * Usage