Merge pull request #3331 from Eisfunke/eisfunke/regex-collection-replace

Enable using capture groups in window-rewrite

include/util/regex_collection.hpp

@@ -36,7 +36,7 @@ class RegexCollection {
   std::map<std::string, std::string> regex_cache;
   std::string default_repr;
 
-  std::string& find_match(std::string& value, bool& matched_any);
+  std::string find_match(std::string& value, bool& matched_any);
 
  public:
   RegexCollection() = default;
@@ -48,4 +48,4 @@ class RegexCollection {
   std::string& get(std::string& value);
 };
 
-}  // namespace waybar::util
+}  // namespace waybar::util

man/waybar-hyprland-workspaces.5.scd

@@ -147,6 +147,7 @@ Additional to workspace name matching, the following *format-icons* can be set.
 		"class<firefox> title<.*github.*>": "", // Windows whose class is "firefox" and title contains "github". Note that "class" always comes first.
 		"foot": "", // Windows that contain "foot" in either class or title. For optimization reasons, it will only match against a title if at least one other window explicitly matches against a title.
 		"code": "󰨞",
+		"title<.* - (.*) - VSCodium>": "codium $1"  // captures part of the window title and formats it into output
 	}
 }
 ```

man/waybar-sway-workspaces.5.scd

@@ -171,6 +171,7 @@ n.b.: the list of outputs can be obtained from command line using *swaymsg -t ge
   "window-rewrite": {
     "class<firefox>": "",
     "class<kitty>": "k",
+	"title<.* - (.*) - VSCodium>": "codium $1"  // captures part of the window title and formats it into output
   }
 }
 ```

src/util/regex_collection.cpp

@@ -31,11 +31,12 @@ RegexCollection::RegexCollection(const Json::Value& map, std::string default_rep
   std::sort(rules.begin(), rules.end(), [](Rule& a, Rule& b) { return a.priority > b.priority; });
 }
 
-std::string& RegexCollection::find_match(std::string& value, bool& matched_any) {
+std::string RegexCollection::find_match(std::string& value, bool& matched_any) {
   for (auto& rule : rules) {
-    if (std::regex_search(value, rule.rule)) {
+    std::smatch match;
+    if (std::regex_search(value, match, rule.rule)) {
       matched_any = true;
-      return rule.repr;
+      return match.format(rule.repr.data());
     }
   }