From 984d0de1fc7f92ddd498852be3d546f13cd704c0 Mon Sep 17 00:00:00 2001 From: Jens Peters Date: Fri, 20 Jun 2025 09:50:43 +0200 Subject: [PATCH] ext/workspaces: introduce ignore-hidden option Hide hidden workspaces by default, but add an option for overriding. While at it, move button visibility handling to Workspaces and only handle add/removal of buttons at WorkspaceManager. This makes it easier to keep track if sorting is needed. --- include/modules/ext/workspace_manager.hpp | 7 ++-- man/waybar-ext-workspaces.5.scd | 5 +++ src/modules/ext/workspace_manager.cpp | 50 +++++++++++------------ 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/include/modules/ext/workspace_manager.hpp b/include/modules/ext/workspace_manager.hpp index 74718848..0607b5ba 100644 --- a/include/modules/ext/workspace_manager.hpp +++ b/include/modules/ext/workspace_manager.hpp @@ -50,7 +50,6 @@ class WorkspaceManager final : public AModule { bool sort_by_id_ = false; bool sort_by_name_ = true; bool sort_by_coordinates_ = false; - bool active_only_ = false; bool all_outputs_ = false; const waybar::Bar &bar_; @@ -100,9 +99,6 @@ class Workspace { std::string &name() { return name_; } std::vector &coordinates() { return coordinates_; } Gtk::Button &button() { return button_; } - bool is_active() const; - bool is_urgent() const; - bool is_hidden() const; void update(); // wl events @@ -117,6 +113,7 @@ class Workspace { bool handle_clicked(const GdkEventButton *button) const; private: + bool has_state(uint32_t state) const { return (state_ & state) == state; } std::string icon(); WorkspaceManager &workspace_manager_; @@ -127,6 +124,8 @@ class Workspace { std::string name_; std::vector coordinates_; + bool active_only_ = false; + bool ignore_hidden_ = true; std::string format_; bool with_icon_ = false; static std::map icon_map_; diff --git a/man/waybar-ext-workspaces.5.scd b/man/waybar-ext-workspaces.5.scd index 9a697cef..54c67be2 100644 --- a/man/waybar-ext-workspaces.5.scd +++ b/man/waybar-ext-workspaces.5.scd @@ -47,6 +47,11 @@ Addressed by *ext/workspaces* default: false ++ If set to true only active or urgent workspaces will be shown. +*ignore-hidden*: ++ + typeof: bool ++ + default: true ++ + If set to false hidden workspaces will be shown. + # FORMAT REPLACEMENTS *{name}*: Name of workspace assigned by compositor. diff --git a/src/modules/ext/workspace_manager.cpp b/src/modules/ext/workspace_manager.cpp index 882aee71..54750bb2 100644 --- a/src/modules/ext/workspace_manager.cpp +++ b/src/modules/ext/workspace_manager.cpp @@ -53,11 +53,6 @@ WorkspaceManager::WorkspaceManager(const std::string &id, const waybar::Bar &bar all_outputs_ = config_all_outputs.asBool(); } - const auto config_active_only = config_["active-only"]; - if (config_active_only.isBool()) { - active_only_ = config_active_only.asBool(); - } - // setup UI box_.set_name("workspaces"); @@ -242,15 +237,11 @@ void WorkspaceManager::update_buttons() { const bool workspace_on_group = group->has_workspace(workspace->handle()); return group_on_output && workspace_on_group; }); - const bool active_or_urgent = workspace->is_active() || workspace->is_urgent(); - const bool valid_workspace_state = (active_or_urgent && active_only_) || !active_only_; - - const bool show_button = workspace_on_any_group_for_output && valid_workspace_state; const bool bar_contains_button = has_button(&workspace->button()); // add or remove buttons if needed, update button state - if (show_button) { + if (workspace_on_any_group_for_output) { if (!bar_contains_button) { // add button to bar box_.pack_start(workspace->button(), false, false); @@ -331,6 +322,16 @@ Workspace::Workspace(const Json::Value &config, WorkspaceManager &manager, // parse configuration + const auto &config_active_only = config["active-only"]; + if (config_active_only.isBool()) { + active_only_ = config_active_only.asBool(); + } + + const auto &config_ignore_hidden = config["ignore-hidden"]; + if (config_ignore_hidden.isBool()) { + ignore_hidden_ = config_ignore_hidden.asBool(); + } + const auto &config_format = config["format"]; format_ = config_format.isString() ? config_format.asString() : "{name}"; with_icon_ = format_.find("{icon}") != std::string::npos; @@ -375,38 +376,33 @@ Workspace::~Workspace() { spdlog::debug("[ext/workspaces]: Workspace {} destroyed", id_); } -bool Workspace::is_active() const { - return (state_ & EXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE) == EXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE; -} - -bool Workspace::is_urgent() const { - return (state_ & EXT_WORKSPACE_HANDLE_V1_STATE_URGENT) == EXT_WORKSPACE_HANDLE_V1_STATE_URGENT; -} - -bool Workspace::is_hidden() const { - return (state_ & EXT_WORKSPACE_HANDLE_V1_STATE_HIDDEN) == EXT_WORKSPACE_HANDLE_V1_STATE_HIDDEN; -} - void Workspace::update() { if (!needs_updating_) { return; } - // update style + // update style and visibility + const auto style_context = button_.get_style_context(); style_context->remove_class("active"); style_context->remove_class("urgent"); style_context->remove_class("hidden"); - if (is_active()) { + if (has_state(EXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE)) { + button_.set_visible(true); style_context->add_class("active"); } - if (is_urgent()) { + if (has_state(EXT_WORKSPACE_HANDLE_V1_STATE_URGENT)) { + button_.set_visible(true); style_context->add_class("urgent"); } - if (is_hidden()) { + if (has_state(EXT_WORKSPACE_HANDLE_V1_STATE_HIDDEN)) { + button_.set_visible(!active_only_ && !ignore_hidden_); style_context->add_class("hidden"); } + if (state_ == 0) { + button_.set_visible(!active_only_); + } // update label label_.set_markup(fmt::format(fmt::runtime(format_), fmt::arg("name", name_), @@ -487,7 +483,7 @@ bool Workspace::handle_clicked(const GdkEventButton *button) const { } std::string Workspace::icon() { - if (is_active()) { + if (has_state(EXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE)) { const auto active_icon_it = icon_map_.find("active"); if (active_icon_it != icon_map_.end()) { return active_icon_it->second;