From 52309615c1fe12dc48e384a4728caa9ac1f7b219 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 28 Aug 2023 23:34:28 -0500
Subject: [PATCH] hyprland new persistent_workspace configuration style

---
 man/waybar-hyprland-workspaces.5.scd | 19 +++++++++++++++
 src/modules/hyprland/workspaces.cpp  | 35 ++++++++++++++++++----------
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/man/waybar-hyprland-workspaces.5.scd b/man/waybar-hyprland-workspaces.5.scd
index 6f138488..87be8186 100644
--- a/man/waybar-hyprland-workspaces.5.scd
+++ b/man/waybar-hyprland-workspaces.5.scd
@@ -69,6 +69,25 @@ Additional to workspace name matching, the following *format-icons* can be set.
 }
 ```
 
+```
+"hyprland/workspaces": {
+	"format": "{name}: {icon}",
+	"format-icons": {
+		"1": "",
+		"2": "",
+		"3": "",
+		"4": "",
+		"5": "",
+		"active": "",
+		"default": ""
+	},
+	"persistent_workspaces": {
+		"*": [ 2,3,4,5 ], // 2-5 on every monitor
+		"HDMI-A-1": [ 1 ] // but only workspace 1 on HDMI-A-1
+	}
+}
+```
+
 # Style
 
 - *#workspaces*
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 9f46b823..872f5a07 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -201,14 +201,17 @@ void Workspaces::fill_persistent_workspaces() {
     const std::vector<std::string> keys = persistent_workspaces.getMemberNames();
 
     for (const std::string &key : keys) {
+      // only add if either:
+      // 1. key is "*" and this monitor is not already defined in the config
+      // 2. key is the current monitor name
+      bool can_create =
+          (key == "*" && std::find(keys.begin(), keys.end(), bar_.output->name) == keys.end()) ||
+          key == bar_.output->name;
       const Json::Value &value = persistent_workspaces[key];
+
       if (value.isInt()) {
         // value is a number => create that many workspaces for this monitor
-        // only add if either:
-        // 1. key is "*" and this monitor is not already defined in the config
-        // 2. key is the current monitor name
-        if ((key == "*" && std::find(keys.begin(), keys.end(), bar_.output->name) == keys.end()) ||
-            key == bar_.output->name) {
+        if (can_create) {
           int amount = value.asInt();
           spdlog::debug("Creating {} persistent workspaces for monitor {}", amount,
                         bar_.output->name);
@@ -217,14 +220,22 @@ void Workspaces::fill_persistent_workspaces() {
                 std::to_string(monitor_id_ * amount + i + 1));
           }
         }
-
       } else if (value.isArray() && !value.empty()) {
-        // value is an array => key is a workspace name
-        // values are monitor names this workspace should be shown on
-        for (const Json::Value &monitor : value) {
-          if (monitor.isString() && monitor.asString() == bar_.output->name) {
-            persistent_workspaces_to_create_.emplace_back(key);
-            break;
+        // value is an array => create defined workspaces for this monitor
+        if (can_create) {
+          for (const Json::Value &workspace : value) {
+            if (workspace.isInt()) {
+              spdlog::debug("Creating workspace {} on monitor {}", workspace, bar_.output->name);
+              persistent_workspaces_to_create_.emplace_back(std::to_string(workspace.asInt()));
+            }
+          }
+        } else {
+          // key is the workspace and value is array of monitors to create on
+          for (const Json::Value &monitor : value) {
+            if (monitor.isString() && monitor.asString() == bar_.output->name) {
+              persistent_workspaces_to_create_.emplace_back(key);
+              break;
+            }
           }
         }
       }