Listen to display destroy in xwayland, rename wlr_egl_free

backend/drm/renderer.c

@@ -39,7 +39,7 @@ bool wlr_drm_renderer_init(struct wlr_drm_backend *drm,
 	return true;
 
 error_egl:
-	wlr_egl_free(&renderer->egl);
+	wlr_egl_finish(&renderer->egl);
 error_gbm:
 	gbm_device_destroy(renderer->gbm);
 	return false;
@@ -51,7 +51,7 @@ void wlr_drm_renderer_finish(struct wlr_drm_renderer *renderer) {
 	}
 
 	wlr_renderer_destroy(renderer->wlr_rend);
-	wlr_egl_free(&renderer->egl);
+	wlr_egl_finish(&renderer->egl);
 	gbm_device_destroy(renderer->gbm);
 }
 

backend/wayland/backend.c

@@ -83,7 +83,7 @@ static void wlr_wl_backend_destroy(struct wlr_backend *_backend) {
 	free(backend->seat_name);
 
 	wl_event_source_remove(backend->remote_display_src);
-	wlr_egl_free(&backend->egl);
+	wlr_egl_finish(&backend->egl);
 	if (backend->seat) wl_seat_destroy(backend->seat);
 	if (backend->shm) wl_shm_destroy(backend->shm);
 	if (backend->shell) zxdg_shell_v6_destroy(backend->shell);

backend/x11/backend.c

@@ -247,7 +247,7 @@ static void wlr_x11_backend_destroy(struct wlr_backend *backend) {
 	wl_list_remove(&x11->display_destroy.link);
 
 	wl_event_source_remove(x11->frame_timer);
-	wlr_egl_free(&x11->egl);
+	wlr_egl_finish(&x11->egl);
 
 	xcb_disconnect(x11->xcb_conn);
 	free(x11);

include/wlr/render/egl.h

@@ -4,6 +4,7 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <stdbool.h>
+#include <wayland-server.h>
 
 struct wlr_egl {
 	EGLDisplay display;
@@ -27,7 +28,7 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, EGLint visual_id, void
  * Frees all related egl resources, makes the context not-current and
  * unbinds a bound wayland display.
  */
-void wlr_egl_free(struct wlr_egl *egl);
+void wlr_egl_finish(struct wlr_egl *egl);
 
 /**
  * Binds the given display to the egl instance.

include/wlr/xwayland.h

@@ -24,6 +24,7 @@ struct wlr_xwayland {
 
 	struct wl_event_source *sigusr1_source;
 	struct wl_listener destroy_listener;
+	struct wl_listener display_destroy;
 	struct wlr_xwm *xwm;
 	struct wlr_xwayland_cursor *cursor;
 

render/egl.c

@@ -141,7 +141,7 @@ error:
 	return false;
 }
 
-void wlr_egl_free(struct wlr_egl *egl) {
+void wlr_egl_finish(struct wlr_egl *egl) {
 	eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
 	if (egl->wl_display && eglUnbindWaylandDisplayWL) {
 		eglUnbindWaylandDisplayWL(egl->display, egl->wl_display);

types/wlr_wl_shell.c

@@ -601,8 +601,8 @@ void wlr_wl_shell_destroy(struct wlr_wl_shell *wlr_wl_shell) {
 	wl_list_remove(&wlr_wl_shell->display_destroy.link);
 	struct wl_resource *resource = NULL, *temp = NULL;
 	wl_resource_for_each_safe(resource, temp, &wlr_wl_shell->wl_resources) {
-		struct wl_list *link = wl_resource_get_link(resource);
+		// shell_destroy will remove the resource from the list
-		wl_list_remove(link);
+		wl_resource_destroy(resource);
 	}
 	// TODO: destroy surfaces
 	wl_global_destroy(wlr_wl_shell->wl_global);

xwayland/xwayland.c

@@ -147,6 +147,7 @@ static void wlr_xwayland_finish(struct wlr_xwayland *wlr_xwayland) {
 	if (!wlr_xwayland || wlr_xwayland->display == -1) {
 		return;
 	}
+
 	if (wlr_xwayland->client) {
 		wl_list_remove(&wlr_xwayland->destroy_listener.link);
 		wl_client_destroy(wlr_xwayland->client);
@@ -164,6 +165,8 @@ static void wlr_xwayland_finish(struct wlr_xwayland *wlr_xwayland) {
 	safe_close(wlr_xwayland->wm_fd[0]);
 	safe_close(wlr_xwayland->wm_fd[1]);
 
+	wl_list_remove(&wlr_xwayland->display_destroy.link);
+
 	unlink_display_sockets(wlr_xwayland->display);
 	wlr_xwayland->display = -1;
 	unsetenv("DISPLAY");
@@ -173,6 +176,12 @@ static void wlr_xwayland_finish(struct wlr_xwayland *wlr_xwayland) {
 	 */
 }
 
+static void handle_display_destroy(struct wl_listener *listener, void *data) {
+	struct wlr_xwayland *wlr_xwayland =
+		wl_container_of(listener, wlr_xwayland, display_destroy);
+	wlr_xwayland_destroy(wlr_xwayland);
+}
+
 static int xserver_handle_ready(int signal_number, void *data) {
 	struct wlr_xwayland *wlr_xwayland = data;
 
@@ -227,6 +236,9 @@ static bool wlr_xwayland_init(struct wlr_xwayland *wlr_xwayland,
 	wl_signal_init(&wlr_xwayland->events.new_surface);
 	wl_signal_init(&wlr_xwayland->events.ready);
 
+	wlr_xwayland->display_destroy.notify = handle_display_destroy;
+	wl_display_add_destroy_listener(wl_display, &wlr_xwayland->display_destroy);
+
 	wlr_xwayland->display = open_display_sockets(wlr_xwayland->x_fd);
 	if (wlr_xwayland->display < 0) {
 		wlr_xwayland_finish(wlr_xwayland);
@@ -253,10 +265,12 @@ static bool wlr_xwayland_init(struct wlr_xwayland *wlr_xwayland,
 	wlr_xwayland->wl_fd[0] = -1; /* not ours anymore */
 
 	wlr_xwayland->destroy_listener.notify = xwayland_destroy_event;
-	wl_client_add_destroy_listener(wlr_xwayland->client, &wlr_xwayland->destroy_listener);
+	wl_client_add_destroy_listener(wlr_xwayland->client,
+		&wlr_xwayland->destroy_listener);
 
 	struct wl_event_loop *loop = wl_display_get_event_loop(wl_display);
-	wlr_xwayland->sigusr1_source = wl_event_loop_add_signal(loop, SIGUSR1, xserver_handle_ready, wlr_xwayland);
+	wlr_xwayland->sigusr1_source = wl_event_loop_add_signal(loop, SIGUSR1,
+		xserver_handle_ready, wlr_xwayland);
 
 	if ((wlr_xwayland->pid = fork()) == 0) {
 		/* Double-fork, but we need to forward SIGUSR1 once Xserver(1)