From c55cd82b3912a5ba0eeafabdeaf757ed4a49f62a Mon Sep 17 00:00:00 2001
From: David Schulte <mail@david-schulte.de>
Date: Sun, 2 Jul 2023 12:23:36 +0200
Subject: [PATCH 1/2] wlr/taskbar: add support for rewrite rules

---
 man/waybar-wlr-taskbar.5.scd | 22 +++++++++++++++++++++-
 src/modules/wlr/taskbar.cpp  |  8 ++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/man/waybar-wlr-taskbar.5.scd b/man/waybar-wlr-taskbar.5.scd
index 8737196d..9019dfa0 100644
--- a/man/waybar-wlr-taskbar.5.scd
+++ b/man/waybar-wlr-taskbar.5.scd
@@ -81,6 +81,10 @@ Addressed by *wlr/taskbar*
 	typeof: object ++
 	Dictionary of app_id to be replaced with
 
+*rewrite*: ++
+	typeof: object ++
+	Rules to rewrite the module format output. See *rewrite rules*.
+
 # FORMAT REPLACEMENTS
 
 *{icon}*: The icon of the application.
@@ -109,6 +113,18 @@ Addressed by *wlr/taskbar*
 
 *close*: Close the application.
 
+# REWRITE RULES
+
+*rewrite* is an object where keys are regular expressions and values are
+rewrite rules if the expression matches. Rules may contain references to
+captures of the expression.
+
+Regular expression and replacement follow ECMA-script rules.
+
+If no expression matches, the format output is left unchanged.
+
+Invalid expressions (e.g., mismatched parentheses) are skipped.
+
 # EXAMPLES
 
 ```
@@ -124,7 +140,11 @@ Addressed by *wlr/taskbar*
 	],
 	"app_ids-mapping": {
 		"firefoxdeveloperedition": "firefox-developer-edition"
-	}
+	},
+	"rewrite": {
+      "Firefox Web Browser": "Firefox",
+      "Foot Server": "Terminal"
+    }
 }
 ```
 
diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp
index 0fd44435..3a071b96 100644
--- a/src/modules/wlr/taskbar.cpp
+++ b/src/modules/wlr/taskbar.cpp
@@ -22,6 +22,8 @@
 #include "util/format.hpp"
 #include "util/string.hpp"
 
+#include "util/rewrite_string.hpp"
+
 namespace waybar::modules::wlr {
 
 /* Icon loading functions */
@@ -622,6 +624,9 @@ void Task::update() {
         fmt::format(fmt::runtime(format_before_), fmt::arg("title", title), fmt::arg("name", name),
                     fmt::arg("app_id", app_id), fmt::arg("state", state_string()),
                     fmt::arg("short_state", state_string(true)));
+
+    txt = waybar::util::rewriteString(txt, config_["rewrite"]);
+
     if (markup)
       text_before_.set_markup(txt);
     else
@@ -633,6 +638,9 @@ void Task::update() {
         fmt::format(fmt::runtime(format_after_), fmt::arg("title", title), fmt::arg("name", name),
                     fmt::arg("app_id", app_id), fmt::arg("state", state_string()),
                     fmt::arg("short_state", state_string(true)));
+
+    txt = waybar::util::rewriteString(txt, config_["rewrite"]);
+
     if (markup)
       text_after_.set_markup(txt);
     else

From 58bdc6a41c1f4967e429c45f6788d7385ba057b9 Mon Sep 17 00:00:00 2001
From: David Schulte <mail@david-schulte.de>
Date: Sun, 2 Jul 2023 12:50:18 +0200
Subject: [PATCH 2/2] fix spaces in waybar-wlr-taskbar.5.scd

---
 man/waybar-wlr-taskbar.5.scd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/waybar-wlr-taskbar.5.scd b/man/waybar-wlr-taskbar.5.scd
index 9019dfa0..5626eaec 100644
--- a/man/waybar-wlr-taskbar.5.scd
+++ b/man/waybar-wlr-taskbar.5.scd
@@ -142,9 +142,9 @@ Invalid expressions (e.g., mismatched parentheses) are skipped.
 		"firefoxdeveloperedition": "firefox-developer-edition"
 	},
 	"rewrite": {
-      "Firefox Web Browser": "Firefox",
-      "Foot Server": "Terminal"
-    }
+		"Firefox Web Browser": "Firefox",
+		"Foot Server": "Terminal"
+	}
 }
 ```