Merge pull request #2787 from scgtrp/master

hyprland/workspaces: allow using the original window class/title
Alexays · Dec 31, 2023 · 3e55d0d · 3e55d0d
2 parents 99d26e4 + ff09ef6
commit 3e55d0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/man/waybar-hyprland-workspaces.5.scd b/man/waybar-hyprland-workspaces.5.scd
@@ -24,7 +24,7 @@ Addressed by *hyprland/workspaces*
 *window-rewrite*: ++
 	typeof: object ++
 	Regex rules to map window class to an icon or preferred method of representation for a workspace's window.
-	Keys are the rules, while the values are the methods of representation.
+	Keys are the rules, while the values are the methods of representation. Values may use the placeholders {class} and {title} to use the window's original class and/or title respectively.
 	Rules may specify `class<...>`, `title<...>`, or both in order to fine-tune the matching.
 
 *window-rewrite-default*:

diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
@@ -891,7 +891,9 @@ std::string Workspaces::getRewrite(std::string window_class, std::string window_
   } else {
     windowReprKey = fmt::format("class<{}>", window_class);
   }
-  return m_windowRewriteRules.get(windowReprKey);
+  auto const rewriteRule = m_windowRewriteRules.get(windowReprKey);
+  return fmt::format(fmt::runtime(rewriteRule), fmt::arg("class", window_class),
+                     fmt::arg("title", window_title));
 }
 
 WindowCreationPayload::WindowCreationPayload(std::string workspace_name,