Merge pull request #5032 from yyyumeniku/master

hyprland/workspaces: add debounce timer to prevent workspace button f…

include/modules/hyprland/workspaces.hpp

@@ -220,6 +220,9 @@ class Workspaces : public AModule, public EventHandler {
   Gtk::Box m_box;
   sigc::connection m_scrollEventConnection_;
   IPC& m_ipc;
+
+  sigc::connection m_debounceTimer;
+  bool m_updatePending = false;
 };
 
 }  // namespace waybar::modules::hyprland

src/modules/hyprland/workspaces.cpp

@@ -343,46 +343,62 @@ void Workspaces::loadPersistentWorkspacesFromWorkspaceRules(const Json::Value& c
 }
 
 void Workspaces::onEvent(const std::string& ev) {
-  std::lock_guard<std::mutex> lock(m_mutex);
+  {
-  const auto separator = ev.find(">>");
+    std::lock_guard<std::mutex> lock(m_mutex);
-  if (separator == std::string::npos) {
+    const auto separator = ev.find(">>");
-    spdlog::warn("Malformed Hyprland workspace event: {}", ev);
+    if (separator == std::string::npos) {
-    return;
+      spdlog::warn("Malformed Hyprland workspace event: {}", ev);
-  }
+      return;
-  std::string eventName = ev.substr(0, separator);
+    }
-  std::string payload = ev.substr(separator + 2);
+    std::string eventName = ev.substr(0, separator);
+    std::string payload = ev.substr(separator + 2);
 
-  if (eventName == "workspacev2") {
+    if (eventName == "workspacev2") {
-    onWorkspaceActivated(payload);
+      onWorkspaceActivated(payload);
-  } else if (eventName == "activespecial") {
+    } else if (eventName == "activespecial") {
-    onSpecialWorkspaceActivated(payload);
+      onSpecialWorkspaceActivated(payload);
-  } else if (eventName == "destroyworkspacev2") {
+    } else if (eventName == "destroyworkspacev2") {
-    onWorkspaceDestroyed(payload);
+      onWorkspaceDestroyed(payload);
-  } else if (eventName == "createworkspacev2") {
+    } else if (eventName == "createworkspacev2") {
-    onWorkspaceCreated(payload);
+      onWorkspaceCreated(payload);
-  } else if (eventName == "focusedmonv2") {
+    } else if (eventName == "focusedmonv2") {
-    onMonitorFocused(payload);
+      onMonitorFocused(payload);
-  } else if (eventName == "moveworkspacev2") {
+    } else if (eventName == "moveworkspacev2") {
-    onWorkspaceMoved(payload);
+      onWorkspaceMoved(payload);
-  } else if (eventName == "openwindow") {
+    } else if (eventName == "openwindow") {
-    onWindowOpened(payload);
+      onWindowOpened(payload);
-  } else if (eventName == "closewindow") {
+    } else if (eventName == "closewindow") {
-    onWindowClosed(payload);
+      onWindowClosed(payload);
-  } else if (eventName == "movewindowv2") {
+    } else if (eventName == "movewindowv2") {
-    onWindowMoved(payload);
+      onWindowMoved(payload);
-  } else if (eventName == "urgent") {
+    } else if (eventName == "urgent") {
-    setUrgentWorkspace(payload);
+      setUrgentWorkspace(payload);
-  } else if (eventName == "renameworkspace") {
+    } else if (eventName == "renameworkspace") {
-    onWorkspaceRenamed(payload);
+      onWorkspaceRenamed(payload);
-  } else if (eventName == "windowtitlev2") {
+    } else if (eventName == "windowtitlev2") {
-    onWindowTitleEvent(payload);
+      onWindowTitleEvent(payload);
-  } else if (eventName == "activewindowv2") {
+    } else if (eventName == "activewindowv2") {
-    onActiveWindowChanged(payload);
+      onActiveWindowChanged(payload);
-  } else if (eventName == "configreloaded") {
+    } else if (eventName == "configreloaded") {
-    onConfigReloaded();
+      onConfigReloaded();
+    }
   }
 
-  dp.emit();
+  if (m_debounceTimer.connected()) {
+    m_debounceTimer.disconnect();
+    m_updatePending = false;
+  }
+
+  m_updatePending = true;
+  m_debounceTimer = Glib::signal_timeout().connect([this]() {
+    if (!m_updatePending) return false;
+    std::lock_guard<std::mutex> lock(m_mutex);
+    if (m_updatePending) {
+      dp.emit();
+      m_updatePending = false;
+    }
+    return false;
+  }, 7);
 }
 
 void Workspaces::onWorkspaceActivated(std::string const& payload) {