external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-19 19:25:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

module/river: new workaround for river issue 69

Browse source 
River seat status events are not fired if the river interface is bound
before the output globals are (despite
zriver_status_manager_v1_get_river_seat_status() not taking an output
as argument). See https://github.com/riverwm/river/issues/69 for
details.

Up until now, we had a workaround for this, where we deferred binding
the seat status interface until after all globals have been processed.

This did not help with runtime changes. For example, if a monitor is
turned off/on (with e.g. wlr-randr), all future river seat status
output events were lost, since the new output global was being
bound *after* the river seat status object.

This patch implements a new workaround, where we re-bind the river
seat status interface every time an output global is added.
This commit is contained in:
Daniel Eklöf 2022-10-27 15:59:32 +02:00
parent 794b1ed633
commit 8deac539ef
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 32 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
modules/river.c
View file

@ -54,7 +54,6 @@ struct private {
struct particle *title;
bool all_monitors;
bool is_starting_up;
tll(struct output) outputs;
tll(struct seat) seats;
};
@ -112,8 +111,7 @@ content(struct module *mod)
}
}
const size_t seat_count = m->title != NULL && !m->is_starting_up
? tll_length(m->seats) : 0;
const size_t seat_count = m->title != NULL ? tll_length(m->seats) : 0;
struct exposable *tag_parts[32 + seat_count];
for (unsigned i = 0; i < 32; i++) {
@ -152,7 +150,7 @@ content(struct module *mod)
tag_set_destroy(&tags);
}
if (m->title != NULL && !m->is_starting_up) {
if (m->title != NULL) {
size_t i = 32;
tll_foreach(m->seats, it) {
const struct seat *seat = &it->item;
@ -189,6 +187,11 @@ verify_iface_version(const char *iface, uint32_t version, uint32_t wanted)
static void
output_destroy(struct output *output)
{
tll_foreach(output->m->seats, it) {
struct seat *seat = &it->item;
if (seat->output == output)
seat->output = NULL;
}
free(output->name);
if (output->status != NULL)
zriver_output_status_v1_destroy(output->status);
@ -323,14 +326,20 @@ static struct zxdg_output_v1_listener xdg_output_listener = {
};
static void
instantiate_output(struct output *output)
update_output(struct output *output)
{
if (output->m->is_starting_up)
return;
assert(output->wl_output != NULL);
if (output->m->status_manager != NULL && output->status == NULL) {
if (output->m->status_manager != NULL) {
/*
* Bind river output status, if we have already bound the status manager
*/
if (output->status != NULL) {
zriver_output_status_v1_destroy(output->status);
output->status = NULL;
}
output->status = zriver_status_manager_v1_get_river_output_status(
output->m->status_manager, output->wl_output);
@ -382,7 +391,7 @@ focused_output(void *data, struct zriver_seat_status_v1 *zriver_seat_status_v1,
static void
unfocused_output(void *data, struct zriver_seat_status_v1 *zriver_seat_status_v1,
struct wl_output *wl_output)
struct wl_output *wl_output)
{
struct seat *seat = data;
struct private *m = seat->m;
@ -497,16 +506,18 @@ static const struct wl_seat_listener seat_listener = {
};
static void
instantiate_seat(struct seat *seat)
update_seat(struct seat *seat)
{
assert(seat->wl_seat != NULL);
if (seat->m->is_starting_up)
return;
if (seat->m->status_manager == NULL)
return;
if (seat->status != NULL) {
zriver_seat_status_v1_destroy(seat->status);
seat->status = NULL;
}
seat->status = zriver_status_manager_v1_get_river_seat_status(
seat->m->status_manager, seat->wl_seat);
@ -542,7 +553,9 @@ handle_global(void *data, struct wl_registry *registry,
mtx_lock(&m->mod->lock);
tll_push_back(m->outputs, output);
instantiate_output(&tll_back(m->outputs));
update_output(&tll_back(m->outputs));
tll_foreach(m->seats, it)
update_seat(&it->item);
mtx_unlock(&m->mod->lock);
}
@ -556,7 +569,7 @@ handle_global(void *data, struct wl_registry *registry,
mtx_lock(&m->mod->lock);
tll_foreach(m->outputs, it)
instantiate_output(&it->item);
update_output(&it->item);
mtx_unlock(&m->mod->lock);
}
@ -576,7 +589,7 @@ handle_global(void *data, struct wl_registry *registry,
struct seat *seat = &tll_back(m->seats);
wl_seat_add_listener(wl_seat, &seat_listener, seat);
instantiate_seat(seat);
update_seat(seat);
mtx_unlock(&m->mod->lock);
}
@ -590,9 +603,9 @@ handle_global(void *data, struct wl_registry *registry,
mtx_lock(&m->mod->lock);
tll_foreach(m->outputs, it)
instantiate_output(&it->item);
update_output(&it->item);
tll_foreach(m->seats, it)
instantiate_seat(&it->item);
update_seat(&it->item);
mtx_unlock(&m->mod->lock);
}
}
@ -637,7 +650,6 @@ run(struct module *mod)
int ret = 1;
struct wl_display *display = NULL;
struct wl_registry *registry = NULL;
bool unlock_at_exit = false;
if ((display = wl_display_connect(NULL)) == NULL) {
LOG_ERR("no Wayland compositor running?");
@ -660,19 +672,6 @@ run(struct module *mod)
wl_display_roundtrip(display);
mtx_lock(&mod->lock);
unlock_at_exit = true;
m->is_starting_up = false;
tll_foreach(m->outputs, it)
instantiate_output(&it->item);
tll_foreach(m->seats, it)
instantiate_seat(&it->item);
unlock_at_exit = false;
mtx_unlock(&mod->lock);
while (true) {
wl_display_flush(display);
@ -719,9 +718,6 @@ out:
wl_registry_destroy(registry);
if (display != NULL)
wl_display_disconnect(display);
if (unlock_at_exit)
mtx_unlock(&mod->lock);
return ret;
}
@ -732,7 +728,6 @@ river_new(struct particle *template, struct particle *title, bool all_monitors)
m->template = template;
m->title = title;
m->all_monitors = all_monitors;
m->is_starting_up = true;
struct module *mod = module_common_new();
mod->private = m;