added output class to dwl/mangowm allowing tags to display differently when the output is focused (for multi-monitor setups)

This commit is contained in:
lilly-lizard
2026-04-14 13:47:53 +12:00
parent e9741829d8
commit 0ee4fd4aa2
4 changed files with 20 additions and 6 deletions
+2
View File
@@ -21,6 +21,8 @@ class Tags : public waybar::AModule {
void handle_primary_clicked(uint32_t tag); void handle_primary_clicked(uint32_t tag);
bool handle_button_press(GdkEventButton* event_button, uint32_t tag); bool handle_button_press(GdkEventButton* event_button, uint32_t tag);
void handle_active_output(zdwl_ipc_output_v2* zdwl_output_v2, uint32_t active);
struct zdwl_ipc_manager_v2* status_manager_; struct zdwl_ipc_manager_v2* status_manager_;
struct wl_seat* seat_; struct wl_seat* seat_;
+2 -1
View File
@@ -46,8 +46,9 @@ Addressed by *dwl/tags*
- *#tags button.empty* - *#tags button.empty*
- *#tags button.focused* - *#tags button.focused*
- *#tags button.urgent* - *#tags button.urgent*
- *#tags button.output*
Note that occupied/focused/urgent status may overlap. That is, a tag may be Note that occupied/focused/urgent/output status may overlap. That is, a tag may be
both occupied and focused at the same time. both occupied and focused at the same time.
# SEE ALSO # SEE ALSO
+14 -2
View File
@@ -26,7 +26,7 @@ static void toggle_visibility(void* data, zdwl_ipc_output_v2* zdwl_output_v2) {
} }
static void active(void* data, zdwl_ipc_output_v2* zdwl_output_v2, uint32_t active) { static void active(void* data, zdwl_ipc_output_v2* zdwl_output_v2, uint32_t active) {
// Intentionally empty static_cast<Tags*>(data)->handle_active_output(zdwl_output_v2, active);
} }
static void set_tag(void* data, zdwl_ipc_output_v2* zdwl_output_v2, uint32_t tag, uint32_t state, static void set_tag(void* data, zdwl_ipc_output_v2* zdwl_output_v2, uint32_t tag, uint32_t state,
@@ -163,7 +163,7 @@ Tags::Tags(const std::string& id, const waybar::Bar& bar, const Json::Value& con
i <<= 1; i <<= 1;
} }
struct wl_output* output = gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj()); struct wl_output *output = gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj());
output_status_ = zdwl_ipc_manager_v2_get_output(status_manager_, output); output_status_ = zdwl_ipc_manager_v2_get_output(status_manager_, output);
zdwl_ipc_output_v2_add_listener(output_status_, &output_status_listener_impl, this); zdwl_ipc_output_v2_add_listener(output_status_, &output_status_listener_impl, this);
@@ -223,4 +223,16 @@ void Tags::handle_view_tags(uint32_t tag, uint32_t state, uint32_t clients, uint
} }
} }
void Tags::handle_active_output(zdwl_ipc_output_v2* zdwl_output_v2, uint32_t active) {
if (output_status_ == zdwl_output_v2) {
for (size_t i = 0; i < buttons_.size(); ++i) {
if (active == 0) {
buttons_[i].get_style_context()->remove_class("output");
} else {
buttons_[i].get_style_context()->add_class("output");
}
}
}
}
} /* namespace waybar::modules::dwl */ } /* namespace waybar::modules::dwl */
+2 -3
View File
@@ -114,8 +114,8 @@ Tags::Tags(const std::string& id, const waybar::Bar& bar, const Json::Value& con
control_{nullptr}, control_{nullptr},
seat_{nullptr}, seat_{nullptr},
bar_(bar), bar_(bar),
box_{bar.orientation, 0},
output_{nullptr}, output_{nullptr},
box_{bar.orientation, 0},
output_status_{nullptr}, output_status_{nullptr},
seat_status_{nullptr} { seat_status_{nullptr} {
struct wl_display* display = Client::inst()->wl_display; struct wl_display* display = Client::inst()->wl_display;
@@ -204,8 +204,7 @@ Tags::~Tags() {
void Tags::handle_show() { void Tags::handle_show() {
if (!status_manager_) return; if (!status_manager_) return;
struct wl_output* output = gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj()); output_status_ = zriver_status_manager_v1_get_river_output_status(status_manager_, output_);
output_status_ = zriver_status_manager_v1_get_river_output_status(status_manager_, output);
zriver_output_status_v1_add_listener(output_status_, &output_status_listener_impl, this); zriver_output_status_v1_add_listener(output_status_, &output_status_listener_impl, this);
seat_status_ = zriver_status_manager_v1_get_river_seat_status(status_manager_, seat_); seat_status_ = zriver_status_manager_v1_get_river_seat_status(status_manager_, seat_);