Merge branch 'Alexays:master' into hyprland/windowcount

src/modules/dwl/window.cpp

@@ -9,6 +9,7 @@
 
 #include "client.hpp"
 #include "dwl-ipc-unstable-v2-client-protocol.h"
+#include "glibmm/markup.h"
 #include "util/rewrite_string.hpp"
 
 namespace waybar::modules::dwl {
@@ -97,11 +98,17 @@ Window::~Window() {
   }
 }
 
-void Window::handle_title(const char *title) { title_ = title; }
+void Window::handle_title(const char *title) {
+  title_ = Glib::Markup::escape_text(title);
+}
 
-void Window::handle_appid(const char *appid) { appid_ = appid; }
+void Window::handle_appid(const char *appid) {
+  appid_ = Glib::Markup::escape_text(appid);
+}
 
-void Window::handle_layout_symbol(const char *layout_symbol) { layout_symbol_ = layout_symbol; }
+void Window::handle_layout_symbol(const char *layout_symbol) {
+  layout_symbol_ = Glib::Markup::escape_text(layout_symbol);
+}
 
 void Window::handle_layout(const uint32_t layout) { layout_ = layout; }
 

src/modules/hyprland/window.cpp

@@ -12,10 +12,18 @@
 #include "util/rewrite_string.hpp"
 #include "util/sanitize_str.hpp"
 
+#include <shared_mutex>
+#include <thread>
+
 namespace waybar::modules::hyprland {
 
+std::shared_mutex windowIpcSmtx;
+
 Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
     : AAppIconLabel(config, "window", id, "{title}", 0, true), bar_(bar) {
+
+  std::unique_lock<std::shared_mutex> windowIpcUniqueLock(windowIpcSmtx);
+
   modulesReady = true;
   separateOutputs_ = config["separate-outputs"].asBool();
 
@@ -23,27 +31,28 @@ Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
     gIPC = std::make_unique<IPC>();
   }
 
-  queryActiveWorkspace();
-  update();
-  dp.emit();
-
   // register for hyprland ipc
   gIPC->registerForIPC("activewindow", this);
   gIPC->registerForIPC("closewindow", this);
   gIPC->registerForIPC("movewindow", this);
   gIPC->registerForIPC("changefloatingmode", this);
   gIPC->registerForIPC("fullscreen", this);
+
+  windowIpcUniqueLock.unlock();
+
+  queryActiveWorkspace();
+  update();
+  dp.emit();
 }
 
 Window::~Window() {
+  std::unique_lock<std::shared_mutex> windowIpcUniqueLock(windowIpcSmtx);
   gIPC->unregisterForIPC(this);
-  // wait for possible event handler to finish
-  std::lock_guard<std::mutex> lg(mutex_);
 }
 
 auto Window::update() -> void {
-  // fix ampersands
-  std::lock_guard<std::mutex> lg(mutex_);
+
+  std::shared_lock<std::shared_mutex> windowIpcShareLock(windowIpcSmtx);
 
   std::string windowName = waybar::util::sanitize_string(workspace_.last_window_title);
   std::string windowAddress = workspace_.last_window;
@@ -144,7 +153,8 @@ auto Window::WindowData::parse(const Json::Value& value) -> Window::WindowData {
 }
 
 void Window::queryActiveWorkspace() {
-  std::lock_guard<std::mutex> lg(mutex_);
+
+  std::shared_lock<std::shared_mutex> windowIpcShareLock(windowIpcSmtx);
 
   if (separateOutputs_) {
     workspace_ = getActiveWorkspace(this->bar_.output->name);

src/modules/sway/workspaces.cpp

@@ -62,14 +62,13 @@ Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value
     m_formatWindowSeperator = " ";
   }
   const Json::Value &windowRewrite = config["window-rewrite"];
-
-  const Json::Value &windowRewriteDefaultConfig = config["window-rewrite-default"];
-  m_windowRewriteDefault =
-      windowRewriteDefaultConfig.isString() ? windowRewriteDefaultConfig.asString() : "?";
-
-  m_windowRewriteRules = waybar::util::RegexCollection(
-      windowRewrite, m_windowRewriteDefault,
-      [](std::string &window_rule) { return windowRewritePriorityFunction(window_rule); });
+  if (windowRewrite.isObject()) {
+    const Json::Value &windowRewriteDefaultConfig = config["window-rewrite-default"];
+    std::string windowRewriteDefault =
+        windowRewriteDefaultConfig.isString() ? windowRewriteDefaultConfig.asString() : "?";
+    m_windowRewriteRules = waybar::util::RegexCollection(
+        windowRewrite, std::move(windowRewriteDefault), windowRewritePriorityFunction);
+  }
   ipc_.subscribe(R"(["workspace"])");
   ipc_.subscribe(R"(["window"])");
   ipc_.signal_event.connect(sigc::mem_fun(*this, &Workspaces::onEvent));