hyprland/window: Rework, add .empty, .solo and .<app_id> CSS classes

include/modules/hyprland/window.hpp

@@ -1,7 +1,5 @@
 #include <fmt/format.h>
 
-#include <tuple>
-
 #include "ALabel.hpp"
 #include "bar.hpp"
 #include "modules/hyprland/backend.hpp"
@@ -17,15 +15,29 @@ class Window : public waybar::ALabel, public EventHandler {
   auto update() -> void override;
 
  private:
-  int getActiveWorkspaceID(std::string);
+  struct Workspace {
-  std::string getLastWindowTitle(int);
+    int windows;
+    std::string last_window;
+    std::string last_window_title;
+
+    static auto parse(const Json::Value&) -> Workspace;
+  };
+
+  auto getActiveWorkspace(const std::string&) -> Workspace;
+  auto getActiveWorkspace() -> Workspace;
+  auto getWindowClass(const std::string&) -> std::string;
   void onEvent(const std::string&) override;
+  void queryActiveWorkspace();
+  void setClass(const std::string&, bool enable);
 
   bool separate_outputs;
   std::mutex mutex_;
   const Bar& bar_;
   util::JsonParser parser_;
-  std::string lastView;
+  std::string last_title_;
+  Workspace workspace_;
+  std::string solo_class_;
+  std::string last_solo_class_;
 };
 
 }  // namespace waybar::modules::hyprland

src/modules/hyprland/window.cpp

@@ -6,7 +6,6 @@
 #include <util/sanitize_str.hpp>
 
 #include "modules/hyprland/backend.hpp"
-#include "util/command.hpp"
 #include "util/json.hpp"
 #include "util/rewrite_string.hpp"
 
@@ -21,11 +20,13 @@ Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
     gIPC = std::make_unique<IPC>();
   }
 
-  label_.hide();
+  queryActiveWorkspace();
-  ALabel::update();
+  update();
 
   // register for hyprland ipc
   gIPC->registerForIPC("activewindow", this);
+  gIPC->registerForIPC("closewindow", this);
+  gIPC->registerForIPC("movewindow", this);
 }
 
 Window::~Window() {
@@ -38,69 +39,128 @@ auto Window::update() -> void {
   // fix ampersands
   std::lock_guard<std::mutex> lg(mutex_);
 
+  std::string window_name = waybar::util::sanitize_string(workspace_.last_window_title);
+
+  if (window_name != last_title_) {
+    if (window_name.empty()) {
+      label_.get_style_context()->add_class("empty");
+    } else {
+      label_.get_style_context()->remove_class("empty");
+    }
+    last_title_ = window_name;
+  }
+
+
   if (!format_.empty()) {
     label_.show();
     label_.set_markup(fmt::format(fmt::runtime(format_),
-                                  waybar::util::rewriteString(lastView, config_["rewrite"])));
+                                  waybar::util::rewriteString(window_name, config_["rewrite"])));
   } else {
     label_.hide();
   }
 
+
+  setClass("empty", workspace_.windows == 0);
+  setClass("solo", workspace_.windows == 1);
+
+  if (!last_solo_class_.empty() && solo_class_ != last_solo_class_) {
+    if (bar_.window.get_style_context()->has_class(last_solo_class_)) {
+      bar_.window.get_style_context()->remove_class(last_solo_class_);
+      spdlog::trace("Removing solo class: {}", last_solo_class_);
+    }
+  }
+
+  if (!solo_class_.empty() && solo_class_ != last_solo_class_) {
+    last_solo_class_ = solo_class_;
+    bar_.window.get_style_context()->add_class(solo_class_);
+    spdlog::trace("Adding solo class: {}", solo_class_);
+  }
+
   ALabel::update();
 }
 
-int Window::getActiveWorkspaceID(std::string monitorName) {
+auto Window::getActiveWorkspace() -> Workspace {
-  auto cmd = waybar::util::command::exec("hyprctl monitors -j");
+  const auto workspace = gIPC->getSocket1Reply("j/activeworkspace");
-  assert(cmd.exit_code == 0);
+  Json::Value json = parser_.parse(workspace);
-  Json::Value json = parser_.parse(cmd.out);
+  assert(json.isObject());
+  return Workspace::parse(json);
+}
+
+auto Window::getActiveWorkspace(const std::string& monitorName) -> Workspace {
+  const auto monitors = gIPC->getSocket1Reply("j/monitors");
+  Json::Value json = parser_.parse(monitors);
   assert(json.isArray());
   auto monitor = std::find_if(json.begin(), json.end(),
                               [&](Json::Value monitor) { return monitor["name"] == monitorName; });
   if (monitor == std::end(json)) {
-    return 0;
+    spdlog::warn("Monitor not found: {}", monitorName);
-  }
+    return Workspace{0, "", ""};
-  return (*monitor)["activeWorkspace"]["id"].as<int>();
   }
+  const int id = (*monitor)["activeWorkspace"]["id"].as<int>();
 
-std::string Window::getLastWindowTitle(int workspaceID) {
+  const auto workspaces = gIPC->getSocket1Reply("j/workspaces");
-  auto cmd = waybar::util::command::exec("hyprctl workspaces -j");
+  json = parser_.parse(workspaces);
-  assert(cmd.exit_code == 0);
-  Json::Value json = parser_.parse(cmd.out);
   assert(json.isArray());
-  auto workspace = std::find_if(json.begin(), json.end(), [&](Json::Value workspace) {
+  auto workspace = std::find_if(json.begin(), json.end(),
-    return workspace["id"].as<int>() == workspaceID;
+                              [&](Json::Value workspace) { return workspace["id"] == id; });
-  });
-
   if (workspace == std::end(json)) {
+    spdlog::warn("No workspace with id {}", id);
+    return Workspace{0, "", ""};
+  }
+  return Workspace::parse(*workspace);
+}
+
+auto Window::Workspace::parse(const Json::Value& value) -> Window::Workspace {
+  return Workspace{
+    value["windows"].as<int>(),
+    value["lastwindow"].as<std::string>(),
+    value["lastwindowtitle"].as<std::string>()
+  };
+}
+
+auto Window::getWindowClass(const std::string& address) -> std::string {
+  const auto clients = gIPC->getSocket1Reply("j/clients");
+  Json::Value json = parser_.parse(clients);
+  assert(json.isArray());
+  auto client = std::find_if(json.begin(), json.end(),
+                              [&](Json::Value window) { return window["address"] == address; });
+  if (client == std::end(json)) {
     return "";
   }
-  return (*workspace)["lastwindowtitle"].as<std::string>();
+  return (*client)["class"].as<std::string>();
+}
+
+void Window::queryActiveWorkspace() {
+  std::lock_guard<std::mutex> lg(mutex_);
+
+  if (separate_outputs) {
+    workspace_ = getActiveWorkspace(this->bar_.output->name);
+  } else {
+    workspace_ = getActiveWorkspace();
+  }
+
+  if (workspace_.windows == 1) {
+    solo_class_ = getWindowClass(workspace_.last_window);
+  } else {
+    solo_class_ = "";
+  }
 }
 
 void Window::onEvent(const std::string& ev) {
-  std::lock_guard<std::mutex> lg(mutex_);
+  queryActiveWorkspace();
-
-  std::string windowName;
-  if (separate_outputs) {
-    windowName = getLastWindowTitle(getActiveWorkspaceID(this->bar_.output->name));
-  } else {
-    windowName = ev.substr(ev.find_first_of(',') + 1).substr(0, 256);
-  }
-
-  windowName = waybar::util::sanitize_string(windowName);
-
-  if (windowName == lastView) return;
-
-  lastView = windowName;
-
-  if (windowName.empty()) {
-    label_.get_style_context()->add_class("empty");
-  } else {
-    label_.get_style_context()->remove_class("empty");
-  }
-
-  spdlog::debug("hyprland window onevent with {}", windowName);
 
   dp.emit();
 }
+
+
+void Window::setClass(const std::string& classname, bool enable) {
+  if (enable) {
+    if (!bar_.window.get_style_context()->has_class(classname)) {
+      bar_.window.get_style_context()->add_class(classname);
+    }
+  } else {
+    bar_.window.get_style_context()->remove_class(classname);
+  }
+}
+
 }  // namespace waybar::modules::hyprland