improve switch window logic

Author: WeissP

src/WeissWindowOperations.hs

@@ -4,8 +4,6 @@ module WeissWindowOperations (weissSwap, weissSwitchFocus, weissSwitchRecent, we
 
 import Data.List qualified as L
 import Data.List.Unique
-import Data.Map qualified
-import Data.Map qualified as M
 import Data.Map qualified as Map
 import Data.Maybe
 import TreeActions (weissTreeActions)
@@ -71,14 +69,40 @@ weissSwap = onWindowsCount $ \c ->
 weissSwitchFocus :: X ()
 weissSwitchFocus = selectWindow rightHandMotionConf >>= (`whenJust` windows . W.focusWindow)
 
+_notScratchWs :: Query Bool
+_notScratchWs = do
+  w <- ask
+  ws <- liftX $ gets windowset
+  let tag = W.findTag w ws
+  return $ isJust tag && tag /= Just scratchpadWorkspaceTag
+
+-- | Get all unfocused floating windows on any visible workspace.
+getUnfocusedVisibleFloats :: X [Window]
+getUnfocusedVisibleFloats = do
+  ws <- gets windowset
+  let visibleWorkspaceTags = map (W.tag . W.workspace) (W.current ws : W.visible ws)
+      allFloatingWindows = W.floating ws
+      onVisible wsTag = wsTag `elem` visibleWorkspaceTags
+      visibleFloatingWindows = Map.filterWithKey (\w _ -> maybe False onVisible (W.findTag w ws)) allFloatingWindows
+      maybeFocused = W.peek ws
+      unfocusedFloats = case maybeFocused of
+        Just focused -> Map.delete focused visibleFloatingWindows
+        Nothing -> visibleFloatingWindows
+  return $ Map.keys unfocusedFloats
+
+{- | A query that matches switchable windows.
+If there are unfocused floating windows on a visible workspace, it matches only those.
+Otherwise, it matches all unfocused tiled windows on visible workspaces.
+-}
+mySwitchableWindows :: Query Bool
+mySwitchableWindows = do
+  unfocusedFloats <- liftX getUnfocusedVisibleFloats
+  if null unfocusedFloats
+    then isOnAnyVisibleWS
+    else fmap (\w -> w `elem` unfocusedFloats) ask
+
 weissSwitchRecent :: X ()
-weissSwitchRecent = nextMatch History isOnAnyVisibleWS
-  where
-    _notScratchWs = do
-      w <- ask
-      ws <- liftX $ gets windowset
-      let tag = W.findTag w ws
-      return $ isJust tag && tag /= Just scratchpadWorkspaceTag
+weissSwitchRecent = nextMatch History mySwitchableWindows
 
 -- | Focus the master window of the current workspace
 weissFocusMaster :: X ()

src/WeissXMonad.hs

@@ -99,14 +99,20 @@ myLayout =
         mouseResize $
           windowArrange $
             ifWider
-              1500
+              3000
               (threeCol ||| Full)
-              (Mirror threeCol ||| mouseResizableTile {isMirrored = True, masterFrac = 0.7} ||| Full)
+              ( ifWider
+                  1500
+                  (myTall ||| Full)
+                  (Mirror threeCol ||| verticalTall ||| Full)
+              )
   where
-    threeCol = ResizableThreeColMid 1 (1 / 100) (-1 / 3) []
+    threeCol = ResizableThreeColMid 1 (1 / 100) (-(1 / 3)) []
     myMulCol = multiCol [1, 1] 0 0.01 (-0.5)
     twoPane = TwoPane delta ratio
-    myTall = Tall nmaster delta ratio
+    -- myTall = Tall nmaster delta ratio
+    myTall = mouseResizableTile {isMirrored = False, masterFrac = 0.55}
+    verticalTall = mouseResizableTile {isMirrored = True, masterFrac = 0.6}
     myStackTile = StackTile 1 (3 / 100) (4 / 9)
     nmaster = 1
     ratio = 1 / 2
@@ -147,15 +153,15 @@ myKeys =
     <> [ ("<XF86Launch7> " <> key, fun)
        | (key, fun) <-
           [ ("t", sendMessage NextLayout)
-          , -- , ("e", pure ())
-            ("r", spawn "xmonad --restart")
-          , ("v", spawn "sh $HOME/.screenlayout/vertical.sh")
-          , ("b", spawn "sh $HOME/.screenlayout/horizontal.sh")
           , ("s", spawn "flameshot gui")
           , -- ("f", spawn "fcitx-remote -s fcitx-keyboard-de-nodeadkeys"),
             ("w", spawn "$SCRIPTS_DIR/notify_window_title.sh")
           , ("p", mkPassPrompt "select pass" sendToClj myXPConfig)
           , ("M-2", nextScreen)
+          -- , ("e", exp1 >>= \x -> flashText def 3 x)
+          -- , ("r", spawn "xmonad --restart")
+          -- , ("v", spawn "sh $HOME/.screenlayout/vertical.sh")
+          -- , ("b", spawn "sh $HOME/.screenlayout/horizontal.sh")
           -- , ("h"      , spawn "rofi-pass")
           -- ("<Left>", sendMessage $ Move L),
           -- ("<Right>", sendMessage $ Move R),
@@ -207,7 +213,7 @@ myConfig =
     , normalBorderColor = myNormColor
     , focusedBorderColor = myFocusColor
     , -- return () to avoid infinite mutual recursion
-      startupHook = return () >> checkKeymap myConfig myKeys >> scratchpadsExclusives >> spawn "systemctl --user start autostart.target"
+      startupHook = return () >> checkKeymap myConfig myKeys >> scratchpadsExclusives >> spawn "sleep 10s && systemctl --user start autostart.target"
     , handleEventHook = handleEventHook def <> handleTimerEvent
     , focusFollowsMouse = True
     }