mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-17 21:49:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make xwayland surface destroy more foolproof

Browse source
This commit is contained in:
emersion 2018-04-05 17:11:46 -04:00
parent 7ce1038478
commit a528aea2ee
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sway/desktop/xwayland.c
View file

@ -176,12 +176,6 @@ static void handle_commit(struct wl_listener *listener, void *data) {
view_damage_from(view); view_damage_from(view);
} }
static void handle_destroy(struct wl_listener *listener, void *data) {
struct sway_xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, destroy);
view_destroy(&xwayland_view->view);
}
static void handle_unmap(struct wl_listener *listener, void *data) { static void handle_unmap(struct wl_listener *listener, void *data) {
struct sway_xwayland_view *xwayland_view = struct sway_xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, unmap); wl_container_of(listener, xwayland_view, unmap);
@ -205,6 +199,17 @@ static void handle_map(struct wl_listener *listener, void *data) {
view_map(view, xsurface->surface); view_map(view, xsurface->surface);
} }
static void handle_destroy(struct wl_listener *listener, void *data) {
struct sway_xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, destroy);
struct sway_view *view = &xwayland_view->view;
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
if (xsurface->mapped) {
handle_unmap(&xwayland_view->unmap, xsurface);
}
view_destroy(&xwayland_view->view);
}
static void handle_request_configure(struct wl_listener *listener, void *data) { static void handle_request_configure(struct wl_listener *listener, void *data) {
struct sway_xwayland_view *xwayland_view = struct sway_xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, request_configure); wl_container_of(listener, xwayland_view, request_configure);