RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: ignore windows with empty classes or titles (if any rule uses title)

pull/2563/head
Brenno Lemos 2023-10-11 11:40:49 -03:00
parent f8340d88be
commit ee652677a6
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/modules/hyprland/workspaces.hpp
View File

@ -97,6 +97,8 @@ class Workspaces : public AModule, public EventHandler {
std::string get_rewrite(std::string window_class, std::string window_title); std::string get_rewrite(std::string window_class, std::string window_title);
std::string& get_window_separator() { return format_window_separator_; } std::string& get_window_separator() { return format_window_separator_; }
bool window_rewrite_config_uses_title() const { return any_window_rewrite_rule_uses_title_; }
private: private:
void onEvent(const std::string&) override; void onEvent(const std::string&) override;
void update_window_count(); void update_window_count();

10
src/modules/hyprland/workspaces.cpp
View File

@ -124,7 +124,7 @@ auto Workspaces::register_ipc() -> void {
gIPC->registerForIPC("movewindow", this); gIPC->registerForIPC("movewindow", this);
gIPC->registerForIPC("urgent", this); gIPC->registerForIPC("urgent", this);
if (any_window_rewrite_rule_uses_title_) { if (window_rewrite_config_uses_title()) {
spdlog::info( spdlog::info(
"Registering for Hyprland's 'windowtitle' events because a user-defined window " "Registering for Hyprland's 'windowtitle' events because a user-defined window "
"rewrite rule uses the 'title' field."); "rewrite rule uses the 'title' field.");
@ -378,7 +378,13 @@ void Workspace::initialize_window_map(const Json::Value &clients_data) {
void Workspace::insert_window(WindowAddress addr, std::string window_class, void Workspace::insert_window(WindowAddress addr, std::string window_class,
std::string window_title) { std::string window_title) {
if (window_class.empty() &&
(!workspace_manager_.window_rewrite_config_uses_title() || window_title.empty())) {
return;
}
auto window_repr = workspace_manager_.get_rewrite(window_class, window_title); auto window_repr = workspace_manager_.get_rewrite(window_class, window_title);
if (!window_repr.empty()) { if (!window_repr.empty()) {
window_map_[addr] = window_repr; window_map_[addr] = window_repr;
} }
@ -817,7 +823,7 @@ void Workspaces::set_urgent_workspace(std::string windowaddress) {
std::string Workspaces::get_rewrite(std::string window_class, std::string window_title) { std::string Workspaces::get_rewrite(std::string window_class, std::string window_title) {
std::string window_repr_key; std::string window_repr_key;
if (any_window_rewrite_rule_uses_title_) { if (window_rewrite_config_uses_title()) {
window_repr_key = fmt::format("class<{}> title<{}>", window_class, window_title); window_repr_key = fmt::format("class<{}> title<{}>", window_class, window_title);
} else { } else {
window_repr_key = fmt::format("class<{}>", window_class); window_repr_key = fmt::format("class<{}>", window_class);