Merge pull request #1730 from herlev/hyprland-window-rewrite

src/modules/hyprland/window.cpp

@@ -2,11 +2,13 @@
 
 #include <spdlog/spdlog.h>
 
+#include <regex>
 #include <util/sanitize_str.hpp>
 
 #include "modules/hyprland/backend.hpp"
 #include "util/command.hpp"
 #include "util/json.hpp"
+#include "util/rewrite_title.hpp"
 
 namespace waybar::modules::hyprland {
 
@@ -32,7 +34,8 @@ auto Window::update() -> void {
 
   if (!format_.empty()) {
     label_.show();
-    label_.set_markup(fmt::format(format_, lastView));
+    label_.set_markup(
+        fmt::format(format_, waybar::util::rewriteTitle(lastView, config_["rewrite"])));
   } else {
     label_.hide();
   }
@@ -60,7 +63,7 @@ std::string Window::getLastWindowTitle(uint workspaceID) {
     return workspace["id"].as<uint>() == workspaceID;
   });
 
-  if (workspace != std::end(json)) {
+  if (workspace == std::end(json)) {
     return "";
   }
   return (*workspace)["lastwindowtitle"].as<std::string>();
@@ -86,5 +89,4 @@ void Window::onEvent(const std::string& ev) {
 
   dp.emit();
 }
-
 }  // namespace waybar::modules::hyprland

src/modules/sway/window.cpp

@@ -12,6 +12,8 @@
 #include <regex>
 #include <string>
 
+#include "util/rewrite_title.hpp"
+
 namespace waybar::modules::sway {
 
 Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
@@ -175,8 +177,9 @@ auto Window::update() -> void {
     bar_.window.get_style_context()->remove_class("solo");
     bar_.window.get_style_context()->remove_class("empty");
   }
-  label_.set_markup(fmt::format(format_, fmt::arg("title", rewriteTitle(window_)),
-                                fmt::arg("app_id", app_id_), fmt::arg("shell", shell_)));
+  label_.set_markup(fmt::format(
+      format_, fmt::arg("title", waybar::util::rewriteTitle(window_, config_["rewrite"])),
+      fmt::arg("app_id", app_id_), fmt::arg("shell", shell_)));
   if (tooltipEnabled()) {
     label_.set_tooltip_text(window_);
   }
@@ -262,30 +265,4 @@ void Window::getTree() {
   }
 }
 
-std::string Window::rewriteTitle(const std::string& title) {
-  const auto& rules = config_["rewrite"];
-  if (!rules.isObject()) {
-    return title;
-  }
-
-  std::string res = title;
-
-  for (auto it = rules.begin(); it != rules.end(); ++it) {
-    if (it.key().isString() && it->isString()) {
-      try {
-        // malformated regexes will cause an exception.
-        // in this case, log error and try the next rule.
-        const std::regex rule{it.key().asString()};
-        if (std::regex_match(title, rule)) {
-          res = std::regex_replace(res, rule, it->asString());
-        }
-      } catch (const std::regex_error& e) {
-        spdlog::error("Invalid rule {}: {}", it.key().asString(), e.what());
-      }
-    }
-  }
-
-  return res;
-}
-
 }  // namespace waybar::modules::sway

src/util/rewrite_title.cpp

@@ -0,0 +1,32 @@
+#include "util/rewrite_title.hpp"
+
+#include <spdlog/spdlog.h>
+
+#include <regex>
+
+namespace waybar::util {
+std::string rewriteTitle(const std::string& title, const Json::Value& rules) {
+  if (!rules.isObject()) {
+    return title;
+  }
+
+  std::string res = title;
+
+  for (auto it = rules.begin(); it != rules.end(); ++it) {
+    if (it.key().isString() && it->isString()) {
+      try {
+        // malformated regexes will cause an exception.
+        // in this case, log error and try the next rule.
+        const std::regex rule{it.key().asString()};
+        if (std::regex_match(title, rule)) {
+          res = std::regex_replace(res, rule, it->asString());
+        }
+      } catch (const std::regex_error& e) {
+        spdlog::error("Invalid rule {}: {}", it.key().asString(), e.what());
+      }
+    }
+  }
+
+  return res;
+}
+}  // namespace waybar::util