mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 16:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

output: Destroy when output layout is destroyed

Browse source 
Since output layout is destroyed when the wayland display is destroyed
we run into a destroy listener order problem: Either the display starts
destroying the outputs first, in which case we're good: The existing
handling will clean up. However, things go wrong if the display decides
to destroy the output layout first. In this case, sway will hold
invalid references to the output layout as part of each output so that
when it finally goes to destroy them, sway will dereference destroyed
output layout bits.

Ref: https://github.com/swaywm/sway/pull/6844#issuecomment-1843599513
(cherry picked from commit bbabb9aae8)
This commit is contained in:
Alexander Orzechowski 2023-12-06 15:47:24 -05:00 committed by Simon Ser
parent 2bba8a8618
commit 80ea52910a
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/output.h
View file

@ -39,6 +39,7 @@ struct sway_output {
struct sway_output_state current; struct sway_output_state current;
struct wl_listener layout_destroy;
struct wl_listener destroy; struct wl_listener destroy;
struct wl_listener commit; struct wl_listener commit;
struct wl_listener present; struct wl_listener present;

16
sway/desktop/output.c
View file

@ -891,8 +891,7 @@ static void update_output_manager_config(struct sway_server *server) {
ipc_event_output(); ipc_event_output();
} }
static void handle_destroy(struct wl_listener *listener, void *data) { static void begin_destroy(struct sway_output *output) {
struct sway_output *output = wl_container_of(listener, output, destroy);
struct sway_server *server = output->server; struct sway_server *server = output->server;
if (output->enabled) { if (output->enabled) {
@ -903,6 +902,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&output->link); wl_list_remove(&output->link);
wl_list_remove(&output->layout_destroy.link);
wl_list_remove(&output->destroy.link); wl_list_remove(&output->destroy.link);
wl_list_remove(&output->commit.link); wl_list_remove(&output->commit.link);
wl_list_remove(&output->present.link); wl_list_remove(&output->present.link);
@ -921,6 +921,16 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
update_output_manager_config(server); update_output_manager_config(server);
} }
static void handle_destroy(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, destroy);
begin_destroy(output);
}
static void handle_layout_destroy(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, layout_destroy);
begin_destroy(output);
}
static void update_textures(struct sway_container *con, void *data) { static void update_textures(struct sway_container *con, void *data) {
container_update_title_textures(con); container_update_title_textures(con);
container_update_marks_textures(con); container_update_marks_textures(con);
@ -1035,6 +1045,8 @@ void handle_new_output(struct wl_listener *listener, void *data) {
output->server = server; output->server = server;
wlr_damage_ring_init(&output->damage_ring); wlr_damage_ring_init(&output->damage_ring);
wl_signal_add(&root->output_layout->events.destroy, &output->layout_destroy);
output->layout_destroy.notify = handle_layout_destroy;
wl_signal_add(&wlr_output->events.destroy, &output->destroy); wl_signal_add(&wlr_output->events.destroy, &output->destroy);
output->destroy.notify = handle_destroy; output->destroy.notify = handle_destroy;
wl_signal_add(&wlr_output->events.commit, &output->commit); wl_signal_add(&wlr_output->events.commit, &output->commit);