blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xwayland, data-device: fix surface state on unmap 

This commit makes sure surface->mapped is true when the unmapped event is
emitted. This is necessary because listeners can only damage surfaces that are
mapped. This is similar to the fact that the destroy event is emitted before
any destruction is actually made.

Fixes https://github.com/swaywm/sway/issues/3568
This commit is contained in:
emersion 2019-02-18 13:14:35 +01:00
parent fd0b625ab9
commit 81ed1efe4f
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
types/data_device/wlr_drag.c
View File

@ -96,8 +96,8 @@ static void drag_icon_set_mapped(struct wlr_drag_icon *icon, bool mapped) {
icon->mapped = true; icon->mapped = true;
wlr_signal_emit_safe(&icon->events.map, icon); wlr_signal_emit_safe(&icon->events.map, icon);
} else if (!mapped && icon->mapped) { } else if (!mapped && icon->mapped) {
icon->mapped = false;
wlr_signal_emit_safe(&icon->events.unmap, icon); wlr_signal_emit_safe(&icon->events.unmap, icon);
icon->mapped = false;
} }
} }

2
xwayland/xwm.c
View File

@ -793,8 +793,8 @@ static void xwm_map_shell_surface(struct wlr_xwm *xwm,
static void xsurface_unmap(struct wlr_xwayland_surface *surface) { static void xsurface_unmap(struct wlr_xwayland_surface *surface) {
if (surface->mapped) { if (surface->mapped) {
surface->mapped = false;
wlr_signal_emit_safe(&surface->events.unmap, surface); wlr_signal_emit_safe(&surface->events.unmap, surface);
surface->mapped = false;
xwm_set_net_client_list(surface->xwm); xwm_set_net_client_list(surface->xwm);
} }