mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xwayland: Add compositor destroy listener to free allocation

Browse Source 
Otherwise we just leak this into the void. Not good.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone
2022-06-24 16:10:48 +01:00
parent 5b11f4066a
commit 18897253d4
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/xwayland.c
+20
View File
@@ -45,6 +45,7 @@
struct wet_xwayland { struct wet_xwayland {
struct weston_compositor *compositor; struct weston_compositor *compositor;
struct wl_listener compositor_destroy_listener;
const struct weston_xwayland_api *api; const struct weston_xwayland_api *api;
struct weston_xwayland *xwayland; struct weston_xwayland *xwayland;
struct wl_event_source *display_fd_source; struct wl_event_source *display_fd_source;
@@ -216,6 +217,21 @@ xserver_cleanup(struct weston_process *process, int status)
wxw->client = NULL; wxw->client = NULL;
} }
static void
wxw_compositor_destroy(struct wl_listener *listener, void *data)
{
struct wet_xwayland *wxw =
wl_container_of(listener, wxw, compositor_destroy_listener);
/* Don't call xserver_exited because Xwayland's own destroy handler
* already does this for us ... */
if (wxw->client)
kill(wxw->process.pid, SIGTERM);
wl_list_remove(&wxw->process.link);
free(wxw);
}
int int
wet_load_xwayland(struct weston_compositor *comp) wet_load_xwayland(struct weston_compositor *comp)
{ {
@@ -245,9 +261,13 @@ wet_load_xwayland(struct weston_compositor *comp)
wxw->compositor = comp; wxw->compositor = comp;
wxw->api = api; wxw->api = api;
wxw->xwayland = xwayland; wxw->xwayland = xwayland;
wl_list_init(&wxw->process.link);
wxw->process.cleanup = xserver_cleanup; wxw->process.cleanup = xserver_cleanup;
wxw->compositor_destroy_listener.notify = wxw_compositor_destroy;
if (api->listen(xwayland, wxw, spawn_xserver) < 0) if (api->listen(xwayland, wxw, spawn_xserver) < 0)
return -1; return -1;
wl_signal_add(&comp->destroy_signal, &wxw->compositor_destroy_listener);
return 0; return 0;
} }