mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-29 11:08:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into xwm-selection

Browse source
This commit is contained in:
emersion 2017-12-14 23:59:04 +01:00
commit 6b42bfad18
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
45 changed files with 560 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

9
xwayland/xwm.c
View file

@ -1093,6 +1093,12 @@ void xwm_destroy(struct wlr_xwm *xwm) {
if (xwm->cursor) {
xcb_free_cursor(xwm->xcb_conn, xwm->cursor);
}
if (xwm->colormap) {
xcb_free_colormap(xwm->xcb_conn, xwm->colormap);
}
if (xwm->window) {
xcb_destroy_window(xwm->xcb_conn, xwm->window);
}
if (xwm->event_source) {
wl_event_source_remove(xwm->event_source);
}
@ -1100,6 +1106,9 @@ void xwm_destroy(struct wlr_xwm *xwm) {
wl_list_for_each_safe(xsurface, tmp, &xwm->surfaces, link) {
wlr_xwayland_surface_destroy(xsurface);
}
wl_list_for_each_safe(xsurface, tmp, &xwm->unpaired_surfaces, link) {
wlr_xwayland_surface_destroy(xsurface);
}
wl_list_remove(&xwm->compositor_surface_create.link);
xcb_disconnect(xwm->xcb_conn);