From 4fd7572c12c9cdc2e034fd9cbaf1423d40153081 Mon Sep 17 00:00:00 2001
From: Josh Rahm <rahm@google.com>
Date: Wed, 3 Aug 2022 14:00:30 -0600
Subject: Add new conditional description for workspaces.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This adds the "<" condition, it used as "in"

i.e. "<l₀l₁w₀w₁" reads as "if l₀ is a subset of l₁, then w₀ else w₁"

Useful for macro programming like, if Spotify is on the current
workspace, then go back to where I came from, otherwise jump to Spotify.
This can be achieved with the following (assuming Spotify is marked with
"s"):

"<H-g><s@.'@s"

"if spotify (s) is in the set of the windows on the current screen (@.), jump
back to where I came from (workspace '), otherwise goto the workspace
spotify is on (@s)."
---
 src/Rahm/Desktop/Keys/Wml.hs | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

(limited to 'src/Rahm/Desktop/Keys')

diff --git a/src/Rahm/Desktop/Keys/Wml.hs b/src/Rahm/Desktop/Keys/Wml.hs
index adb1d9f..647234c 100644
--- a/src/Rahm/Desktop/Keys/Wml.hs
+++ b/src/Rahm/Desktop/Keys/Wml.hs
@@ -267,18 +267,15 @@ readNextWorkspace =
 
       (_, _, "@") -> do
         loc <- readNextLocationSet
-        MaybeT (return $ justWorkspace . locationWorkspace <$> head loc)
+        MaybeT $ fromX $ withWindowSet $ \ws -> return $ do
+          win <- locationWindow =<< head loc
+          winLocation <- W.findWindow ws win
+          (justWorkspace . W.tag) <$> W.getLocationWorkspace winLocation
 
       (_, _, "~") ->
         justWorkspace . accompaningWorkspace <$> readNextWorkspaceName
       (_, _, " ") -> mt $
         justWorkspace . accompaningWorkspace <$> getCurrentWorkspace
-      (_, _, "~") -> do
-          ws <- readNextWorkspace
-          case workspaceName ws of
-            Just [a] | isAlphaNum a ->
-              return (justWorkspace $ accompaningWorkspace [a])
-            _ -> MaybeT (return Nothing)
 
       (_, _, "_") -> return blackHoleWorkspace
       (_, _, "-") -> return alternateWorkspace
@@ -294,6 +291,28 @@ readNextWorkspace =
             then ws3
             else ws4
 
+      (_, _, "<") -> do
+        lift . fromX $
+          logs Trace "Doing thing"
+
+        l1 <- map locationWindow <$> readNextLocationSet
+
+        lift . fromX $
+          logs Trace "%s" (show l1)
+
+        l2 <- map locationWindow <$> readNextLocationSet
+
+        ws1 <- readNextWorkspace
+        ws2 <- readNextWorkspace
+
+        (lift . fromX) $ (logs Trace "%s < %s? %s" (show l1) (show l2) (show $ all (`elem`l2) l1) :: X ())
+        (lift . fromX) $ (logs Trace "%s %s" (show $ workspaceName ws1) (show $ workspaceName ws2))
+
+        return $
+          if all (`elem`l2) l1
+            then ws1
+            else ws2
+
       (mask, keysym, _) -> do
         macro <- (MaybeT . fromX) (Map.lookup (mask, keysym) . workspaceMacros <$> XS.get)
         fromMaybeTX $ workspaceForKeysT macro
-- 
cgit