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

fixed bug after merge with master duplicating code in handle_show()

Browse Source
This commit is contained in:
lilly-lizard
2025-10-11 10:25:50 +13:00
parent 9a873705d3
commit a96f1caa19
1 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/river/tags.cpp
+27 -30
View File
@@ -27,15 +27,11 @@ static void listen_urgent_tags(void *data, struct zriver_output_status_v1 *zrive
static_cast<Tags *>(data)->handle_urgent_tags(tags); static_cast<Tags *>(data)->handle_urgent_tags(tags);
} }
static void listen_focused_view(void *data, struct zriver_seat_status_v1 *zriver_seat_status_v1, static const zriver_output_status_v1_listener output_status_listener_impl{
const char *title) { .focused_tags = listen_focused_tags,
// This module doesn't care .view_tags = listen_view_tags,
} .urgent_tags = listen_urgent_tags,
};
static void listen_mode(void *data, struct zriver_seat_status_v1 *zriver_seat_status_v1,
const char *mode) {
// This module doesn't care
}
static void listen_focused_output(void *data, struct zriver_seat_status_v1 *zriver_seat_status_v1, static void listen_focused_output(void *data, struct zriver_seat_status_v1 *zriver_seat_status_v1,
struct wl_output *output) { struct wl_output *output) {
@@ -47,11 +43,15 @@ static void listen_unfocused_output(void *data, struct zriver_seat_status_v1 *zr
static_cast<Tags *>(data)->handle_unfocused_output(output); static_cast<Tags *>(data)->handle_unfocused_output(output);
} }
static const zriver_output_status_v1_listener output_status_listener_impl{ static void listen_focused_view(void *data, struct zriver_seat_status_v1 *zriver_seat_status_v1,
.focused_tags = listen_focused_tags, const char *title) {
.view_tags = listen_view_tags, // This module doesn't care
.urgent_tags = listen_urgent_tags, }
};
static void listen_mode(void *data, struct zriver_seat_status_v1 *zriver_seat_status_v1,
const char *mode) {
// This module doesn't care
}
static const zriver_seat_status_v1_listener seat_status_listener_impl{ static const zriver_seat_status_v1_listener seat_status_listener_impl{
.focused_output = listen_focused_output, .focused_output = listen_focused_output,
@@ -115,6 +115,7 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con
seat_{nullptr}, seat_{nullptr},
bar_(bar), bar_(bar),
box_{bar.orientation, 0}, box_{bar.orientation, 0},
output_{nullptr},
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;
@@ -122,8 +123,6 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con
wl_registry_add_listener(registry, &registry_listener_impl, this); wl_registry_add_listener(registry, &registry_listener_impl, this);
wl_display_roundtrip(display); wl_display_roundtrip(display);
output_ = gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj());
if (!status_manager_) { if (!status_manager_) {
spdlog::error("river_status_manager_v1 not advertised"); spdlog::error("river_status_manager_v1 not advertised");
return; return;
@@ -137,6 +136,10 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con
spdlog::error("wl_seat not advertised"); spdlog::error("wl_seat not advertised");
} }
output_ = gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj());
output_status_ = zriver_status_manager_v1_get_river_output_status(status_manager_, output_);
seat_status_ = zriver_status_manager_v1_get_river_seat_status(status_manager_, seat_);
box_.set_name("tags"); box_.set_name("tags");
if (!id.empty()) { if (!id.empty()) {
box_.get_style_context()->add_class(id); box_.get_style_context()->add_class(id);
@@ -180,14 +183,6 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con
button.show(); button.show();
} }
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);
seat_status_ = zriver_status_manager_v1_get_river_seat_status(status_manager_, seat_);
zriver_seat_status_v1_add_listener(seat_status_, &seat_status_listener_impl, this);
zriver_status_manager_v1_destroy(status_manager_);
box_.signal_show().connect(sigc::mem_fun(*this, &Tags::handle_show)); box_.signal_show().connect(sigc::mem_fun(*this, &Tags::handle_show));
} }
@@ -196,10 +191,6 @@ Tags::~Tags() {
zriver_output_status_v1_destroy(output_status_); zriver_output_status_v1_destroy(output_status_);
} }
if (seat_status_) {
zriver_seat_status_v1_destroy(seat_status_);
}
if (control_) { if (control_) {
zriver_control_v1_destroy(control_); zriver_control_v1_destroy(control_);
} }
@@ -210,12 +201,18 @@ Tags::~Tags() {
} }
void Tags::handle_show() { void Tags::handle_show() {
struct wl_output *output = gdk_wayland_monitor_get_wl_output(bar_.output->monitor->gobj()); spdlog::info("bruh1");
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_);
zriver_seat_status_v1_add_listener(seat_status_, &seat_status_listener_impl, this);
zriver_status_manager_v1_destroy(status_manager_); zriver_status_manager_v1_destroy(status_manager_);
status_manager_ = nullptr; status_manager_ = nullptr;
spdlog::info("bruh2");
} }
void Tags::handle_primary_clicked(uint32_t tag) { void Tags::handle_primary_clicked(uint32_t tag) {