mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-25 06:59:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland/xwm: unpair even if surface is NULL

Browse source 
This is a backport of a922428c41
which partially reverts 32daa43a45.

Fixes: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3561
This commit is contained in:
Kirill Primak 2023-01-09 15:21:22 +03:00
parent 0911a41f17
commit 27a0b8b74f
1 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

44
xwayland/xwm.c
View file

@ -384,11 +384,30 @@ static void xsurface_set_net_wm_state(struct wlr_xwayland_surface *xsurface) {
i, property); i, property);
} }
static void xsurface_unpair(struct wlr_xwayland_surface *surface,
bool destroy_role_object) {
if (surface->mapped) {
wl_signal_emit_mutable(&surface->events.unmap, surface);
surface->mapped = false;
xwm_set_net_client_list(surface->xwm);
}
// Make sure we're not on the unpaired surface list or we
// could be assigned a surface during surface creation that
// was mapped before this unmap request.
wl_list_remove(&surface->unpaired_link);
wl_list_init(&surface->unpaired_link);
surface->surface_id = 0;
if (destroy_role_object && surface->surface != NULL) {
wlr_surface_destroy_role_object(surface->surface);
}
surface->surface = NULL;
}
static void xwayland_surface_destroy( static void xwayland_surface_destroy(
struct wlr_xwayland_surface *xsurface) { struct wlr_xwayland_surface *xsurface) {
if (xsurface->surface != NULL) { xsurface_unpair(xsurface, true);
wlr_surface_destroy_role_object(xsurface->surface);
}
wl_signal_emit_mutable(&xsurface->events.destroy, xsurface); wl_signal_emit_mutable(&xsurface->events.destroy, xsurface);
@ -851,19 +870,7 @@ static void xwayland_surface_role_destroy(struct wlr_surface *wlr_surface) {
assert(wlr_surface->role == &xwayland_surface_role); assert(wlr_surface->role == &xwayland_surface_role);
struct wlr_xwayland_surface *surface = wlr_surface->role_data; struct wlr_xwayland_surface *surface = wlr_surface->role_data;
if (surface->mapped) { xsurface_unpair(surface, false);
wl_signal_emit_mutable(&surface->events.unmap, surface);
surface->mapped = false;
xwm_set_net_client_list(surface->xwm);
}
// Make sure we're not on the unpaired surface list or we
// could be assigned a surface during surface creation that
// was mapped before this unmap request.
wl_list_remove(&surface->unpaired_link);
wl_list_init(&surface->unpaired_link);
surface->surface_id = 0;
surface->surface = NULL;
} }
static const struct wlr_surface_role xwayland_surface_role = { static const struct wlr_surface_role xwayland_surface_role = {
@ -1077,10 +1084,7 @@ static void xwm_handle_unmap_notify(struct wlr_xwm *xwm,
return; return;
} }
if (xsurface->surface != NULL) { xsurface_unpair(xsurface, true);
wlr_surface_destroy_role_object(xsurface->surface);
}
xsurface_set_wm_state(xsurface, XCB_ICCCM_WM_STATE_WITHDRAWN); xsurface_set_wm_state(xsurface, XCB_ICCCM_WM_STATE_WITHDRAWN);
} }