jachym/dwl
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl.git synced 2026-11-12 16:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

quit when the backend is destroyed

Browse Source 
When the session goes away, e.g. seatd being stopped at shutdown, wlroots
destroys the backend by itself (wlr_auto_backend_monitor), and
wlr_backend_finish() aborts since dwl's new_output and new_input listeners
are still attached:

  Assertion failed: wl_list_empty(&backend->events.new_input.listener_list)

Detach them and quit instead.
This commit is contained in:
dvh
2026-11-11 10:54:13 +01:00
parent 387bc1b53f
commit 13086cb898
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dwl.c
+21 -1
View File
@@ -298,6 +298,7 @@ static void createpopup(struct wl_listener *listener, void *data);
static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint); static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
static void cursorframe(struct wl_listener *listener, void *data); static void cursorframe(struct wl_listener *listener, void *data);
static void cursorwarptohint(void); static void cursorwarptohint(void);
static void destroybackend(struct wl_listener *listener, void *data);
static void destroydecoration(struct wl_listener *listener, void *data); static void destroydecoration(struct wl_listener *listener, void *data);
static void destroydragicon(struct wl_listener *listener, void *data); static void destroydragicon(struct wl_listener *listener, void *data);
static void destroyidleinhibitor(struct wl_listener *listener, void *data); static void destroyidleinhibitor(struct wl_listener *listener, void *data);
@@ -455,6 +456,7 @@ static struct wl_array ghosts; /* struct wlr_scene_node *, unmapped clients */
static struct wl_array offmons; /* char *, names of outputs turned off by clients */ static struct wl_array offmons; /* char *, names of outputs turned off by clients */
/* global event handlers */ /* global event handlers */
static struct wl_listener backend_destroy = {.notify = destroybackend};
static struct wl_listener cursor_axis = {.notify = axisnotify}; static struct wl_listener cursor_axis = {.notify = axisnotify};
static struct wl_listener cursor_button = {.notify = buttonpress}; static struct wl_listener cursor_button = {.notify = buttonpress};
static struct wl_listener cursor_frame = {.notify = cursorframe}; static struct wl_listener cursor_frame = {.notify = cursorframe};
@@ -849,7 +851,8 @@ cleanup(void)
/* If it's not destroyed manually, it will cause a use-after-free of wlr_seat. /* If it's not destroyed manually, it will cause a use-after-free of wlr_seat.
* Destroy it until it's fixed on the wlroots side */ * Destroy it until it's fixed on the wlroots side */
wlr_backend_destroy(backend); if (backend)
wlr_backend_destroy(backend);
if (transaction_idle) if (transaction_idle)
wl_event_source_remove(transaction_idle); wl_event_source_remove(transaction_idle);
@@ -905,6 +908,7 @@ cleanuplisteners(void)
wl_list_remove(&new_idle_inhibitor.link); wl_list_remove(&new_idle_inhibitor.link);
wl_list_remove(&layout_change.link); wl_list_remove(&layout_change.link);
wl_list_remove(&new_input_device.link); wl_list_remove(&new_input_device.link);
wl_list_remove(&backend_destroy.link);
wl_list_remove(&new_virtual_keyboard.link); wl_list_remove(&new_virtual_keyboard.link);
wl_list_remove(&new_virtual_pointer.link); wl_list_remove(&new_virtual_pointer.link);
wl_list_remove(&new_pointer_constraint.link); wl_list_remove(&new_pointer_constraint.link);
@@ -1407,6 +1411,21 @@ cursorwarptohint(void)
} }
} }
void
destroybackend(struct wl_listener *listener, void *data)
{
/* wlroots destroys the backend itself when the session goes away (e.g.
* seatd stopped at shutdown), and asserts that its listeners are gone */
wl_list_remove(&new_output.link);
wl_list_init(&new_output.link);
wl_list_remove(&new_input_device.link);
wl_list_init(&new_input_device.link);
wl_list_remove(&backend_destroy.link);
wl_list_init(&backend_destroy.link);
backend = NULL;
quit(NULL);
}
void void
destroydecoration(struct wl_listener *listener, void *data) destroydecoration(struct wl_listener *listener, void *data)
{ {
@@ -2742,6 +2761,7 @@ setup(void)
* if an X11 server is running. */ * if an X11 server is running. */
if (!(backend = wlr_backend_autocreate(event_loop, &session))) if (!(backend = wlr_backend_autocreate(event_loop, &session)))
die("couldn't create backend"); die("couldn't create backend");
wl_signal_add(&backend->events.destroy, &backend_destroy);
/* Initialize the scene graph used to lay out windows */ /* Initialize the scene graph used to lay out windows */
scene = wlr_scene_create(); scene = wlr_scene_create();