feat: generalize workspace indicator for Hyprland + Sway and clean

src/provider/Sway.qml

@@ -0,0 +1,34 @@
+pragma Singleton
+
+import Quickshell
+import QtQuick
+import Quickshell.Io
+
+Singleton {
+    id: root
+
+    property int activeWorkspace: 1
+    property var dispatch: m => {
+        sender.command = ["swaymsg", ...m];
+        sender.running = true;
+    }
+
+    Process {
+        id: sender
+        command: []
+    }
+
+    Process {
+        command: ["swaymsg", "-mtsubscribe", "[\"workspace\"]"]
+        running: true
+
+        stdout: SplitParser {
+            onRead: data => {
+                const parsed = JSON.parse(data);
+                if (parsed.change == "focus") {
+                    root.activeWorkspace = parsed.current.num;
+                }
+            }
+        }
+    }
+}

src/widgets/workspaces/WorkspaceElem.qml

@@ -6,11 +6,10 @@ import QtQuick.Layouts
 Rectangle {
     id: root
 
-    required property bool focused
     required property int wnum
 
     property bool hovered: false
-    property bool active: focused || hovered
+    property bool active: workspaces.active === wnum || hovered
     property int activeMargin: 3
     property int inactiveMargin: 5
 
@@ -29,20 +28,14 @@ Rectangle {
         onEntered: () => {
             root.hovered = true;
         }
-
         onExited: () => {
             root.hovered = false;
         }
         onClicked: () => {
-            switcher.running = true;
+            workspaces.switchWorkspace(wnum);
         }
     }
 
-    Process {
-        id: switcher
-        command: ["swaymsg", "workspace", `${root.wnum}`]
-    }
-
     states: State {
         name: "focused"
         when: root.active

src/widgets/workspaces/WorkspaceIPC.qml

@@ -1,12 +1,28 @@
 import QtQuick
 import Quickshell.Io
+import Quickshell.Hyprland
+import "root:provider"
 
 Item {
     id: root
 
     property int active: 1 // currently active workspace
     property int amount: 10 // amount of workspaces
-    property string name: "" // name of the current desktop
+    property string name: "unknown" // name of the current desktop
+
+    property var switchWorkspace: w => {
+        console.log(`We are switching from workspace ${active} to ${w}`);
+        switch (root.name) {
+        case "sway":
+            Sway.dispatch(["workspace", w]);
+            break;
+        case "Hyprland":
+            Hyprland.dispatch(`workspace ${w}`);
+            break;
+        default:
+            console.log("unhandled");
+        }
+    }
 
     Process {
         command: ["env"]
@@ -14,21 +30,18 @@ Item {
 
         stdout: SplitParser {
             onRead: data => {
-                if (data.startsWith("XDG_CURRENT_DESKTOP="))
+                if (data.startsWith("XDG_CURRENT_DESKTOP=")) {
                     root.name = data.slice(20);
-            }
+                    switch (root.name) {
-        }
+                    case "sway":
-    }
+                        root.active = Qt.binding(() => Sway.activeWorkspace ?? root.active);
-
+                        break;
-    Process {
+                    case "Hyprland":
-        command: ["swaymsg", "-mtsubscribe", "[\"workspace\"]"]
+                        root.active = Qt.binding(() => Hyprland.focusedMonitor?.activeWorkspace?.id ?? root.active);
-        running: root.name === "sway"
+                        break;
-
+                    default:
-        stdout: SplitParser {
+                        console.log("This desktop is unhandled:", root.name);
-            onRead: data => {
+                    }
-                const parsed = JSON.parse(data);
-                if (parsed.change == "focus") {
-                    root.active = parsed.current.num;
                 }
             }
         }

src/widgets/workspaces/Workspaces.qml

@@ -6,10 +6,10 @@ import "../../base"
 
 BRectangle {
     id: root
-    height: 100 + layout.spacing * (workspace.amount - 1)
+    height: 100 + layout.spacing * (workspaces.amount - 1)
 
     WorkspaceIPC {
-        id: workspace
+        id: workspaces
     }
 
     ColumnLayout {
@@ -21,12 +21,11 @@ BRectangle {
         spacing: 1
 
         Repeater {
-            model: workspace.amount
+            model: workspaces.amount
 
             WorkspaceElem {
                 required property int modelData
                 wnum: modelData + 1
-                focused: workspace.active === (modelData + 1)
             }
         }
     }