From a148f6517e6dc4327f42d7ea80253fadb0516dc3 Mon Sep 17 00:00:00 2001
From: Matt White <mail@matt-w.net>
Date: Fri, 10 Jan 2025 11:27:40 -0700
Subject: [PATCH] feat(hyprland): support workspacev2

---
 include/modules/hyprland/workspaces.hpp |  2 +-
 src/modules/hyprland/workspaces.cpp     | 29 +++++++++++++++----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index a9d56b79f..e10cb8c41 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -138,7 +138,7 @@ class Workspaces : public AModule, public EventHandler {
 
   bool m_withIcon;
   uint64_t m_monitorId;
-  std::string m_activeWorkspaceName;
+  int m_activeWorkspaceId;
   std::string m_activeSpecialWorkspaceName;
   std::vector<std::unique_ptr<Workspace>> m_workspaces;
   std::vector<std::pair<Json::Value, Json::Value>> m_workspacesToCreate;
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 6975b6bbc..fd3e0005f 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -40,7 +40,7 @@ Workspaces::~Workspaces() {
 }
 
 void Workspaces::init() {
-  m_activeWorkspaceName = (gIPC->getSocket1JsonReply("activeworkspace"))["name"].asString();
+  m_activeWorkspaceId = (gIPC->getSocket1JsonReply("activeworkspace"))["id"].asInt();
 
   initializeWorkspaces();
   dp.emit();
@@ -316,7 +316,7 @@ void Workspaces::onEvent(const std::string &ev) {
   std::string eventName(begin(ev), begin(ev) + ev.find_first_of('>'));
   std::string payload = ev.substr(eventName.size() + 2);
 
-  if (eventName == "workspace") {
+  if (eventName == "workspacev2") {
     onWorkspaceActivated(payload);
   } else if (eventName == "activespecial") {
     onSpecialWorkspaceActivated(payload);
@@ -348,7 +348,8 @@ void Workspaces::onEvent(const std::string &ev) {
 }
 
 void Workspaces::onWorkspaceActivated(std::string const &payload) {
-  m_activeWorkspaceName = payload;
+  std::string workspaceIdStr = payload.substr(0, payload.find(','));
+  m_activeWorkspaceId = std::stoi(workspaceIdStr);
 }
 
 void Workspaces::onSpecialWorkspaceActivated(std::string const &payload) {
@@ -414,7 +415,7 @@ void Workspaces::onWorkspaceMoved(std::string const &payload) {
   spdlog::debug("Workspace moved: {}", payload);
 
   // Update active workspace
-  m_activeWorkspaceName = (gIPC->getSocket1JsonReply("activeworkspace"))["name"].asString();
+  m_activeWorkspaceId = (gIPC->getSocket1JsonReply("activeworkspace"))["id"].asInt();
 
   if (allOutputs()) return;
 
@@ -437,9 +438,6 @@ void Workspaces::onWorkspaceRenamed(std::string const &payload) {
   std::string newName = payload.substr(payload.find(',') + 1);
   for (auto &workspace : m_workspaces) {
     if (workspace->id() == workspaceId) {
-      if (workspace->name() == m_activeWorkspaceName) {
-        m_activeWorkspaceName = newName;
-      }
       workspace->setName(newName);
       break;
     }
@@ -449,7 +447,16 @@ void Workspaces::onWorkspaceRenamed(std::string const &payload) {
 
 void Workspaces::onMonitorFocused(std::string const &payload) {
   spdlog::trace("Monitor focused: {}", payload);
-  m_activeWorkspaceName = payload.substr(payload.find(',') + 1);
+
+  std::string workspaceName = payload.substr(payload.find(',') + 1);
+
+  // TODO this can be stripped out when we upgrade to focusedmonv2
+  for (auto &workspace : m_workspaces) {
+    if (workspace->name() == workspaceName) {
+      m_activeWorkspaceId = workspace->id();
+      break;
+    }
+  }
 
   for (Json::Value &monitor : gIPC->getSocket1JsonReply("monitors")) {
     if (monitor["name"].asString() == payload.substr(0, payload.find(','))) {
@@ -677,7 +684,7 @@ void Workspaces::registerOrphanWindow(WindowCreationPayload create_window_payloa
 }
 
 auto Workspaces::registerIpc() -> void {
-  gIPC->registerForIPC("workspace", this);
+  gIPC->registerForIPC("workspacev2", this);
   gIPC->registerForIPC("activespecial", this);
   gIPC->registerForIPC("createworkspacev2", this);
   gIPC->registerForIPC("destroyworkspacev2", this);
@@ -899,9 +906,9 @@ void Workspaces::updateWorkspaceStates() {
   const std::vector<std::string> visibleWorkspaces = getVisibleWorkspaces();
   auto updatedWorkspaces = gIPC->getSocket1JsonReply("workspaces");
   for (auto &workspace : m_workspaces) {
-    workspace->setActive(workspace->name() == m_activeWorkspaceName ||
+    workspace->setActive(workspace->id() == m_activeWorkspaceId ||
                          workspace->name() == m_activeSpecialWorkspaceName);
-    if (workspace->name() == m_activeWorkspaceName && workspace->isUrgent()) {
+    if (workspace->id() == m_activeWorkspaceId && workspace->isUrgent()) {
       workspace->setUrgent(false);
     }
     workspace->setVisible(std::find(visibleWorkspaces.begin(), visibleWorkspaces.end(),