alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1967 from emersion/remove-xdg-popup-unmap

Browse source 
Don't destroy view child on xdg-popup unmap
This commit is contained in:
Drew DeVault 2018-05-12 14:56:20 -04:00 committed by GitHub
parent b1c33ecc25 360e63b8a7
commit 9d607b7253
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/tree/view.h
View file

@ -153,7 +153,6 @@ struct sway_xdg_popup_v6 {
struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
struct wl_listener new_popup; struct wl_listener new_popup;
struct wl_listener unmap;
struct wl_listener destroy; struct wl_listener destroy;
}; };

8
sway/desktop/xdg_shell_v6.c
View file

@ -20,7 +20,6 @@ static void popup_destroy(struct sway_view_child *child) {
} }
struct sway_xdg_popup_v6 *popup = (struct sway_xdg_popup_v6 *)child; struct sway_xdg_popup_v6 *popup = (struct sway_xdg_popup_v6 *)child;
wl_list_remove(&popup->new_popup.link); wl_list_remove(&popup->new_popup.link);
wl_list_remove(&popup->unmap.link);
wl_list_remove(&popup->destroy.link); wl_list_remove(&popup->destroy.link);
free(popup); free(popup);
} }
@ -39,11 +38,6 @@ static void popup_handle_new_popup(struct wl_listener *listener, void *data) {
popup_create(wlr_popup, popup->child.view); popup_create(wlr_popup, popup->child.view);
} }
static void popup_handle_unmap(struct wl_listener *listener, void *data) {
struct sway_xdg_popup_v6 *popup = wl_container_of(listener, popup, unmap);
view_child_destroy(&popup->child);
}
static void popup_handle_destroy(struct wl_listener *listener, void *data) { static void popup_handle_destroy(struct wl_listener *listener, void *data) {
struct sway_xdg_popup_v6 *popup = wl_container_of(listener, popup, destroy); struct sway_xdg_popup_v6 *popup = wl_container_of(listener, popup, destroy);
view_child_destroy(&popup->child); view_child_destroy(&popup->child);
@ -62,8 +56,6 @@ static struct sway_xdg_popup_v6 *popup_create(
wl_signal_add(&xdg_surface->events.new_popup, &popup->new_popup); wl_signal_add(&xdg_surface->events.new_popup, &popup->new_popup);
popup->new_popup.notify = popup_handle_new_popup; popup->new_popup.notify = popup_handle_new_popup;
wl_signal_add(&xdg_surface->events.unmap, &popup->unmap);
popup->unmap.notify = popup_handle_unmap;
wl_signal_add(&xdg_surface->events.destroy, &popup->destroy); wl_signal_add(&xdg_surface->events.destroy, &popup->destroy);
popup->destroy.notify = popup_handle_destroy; popup->destroy.notify = popup_handle_destroy;

4
sway/desktop/xwayland.c
View file

@ -82,10 +82,6 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) { static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) {
struct sway_xwayland_unmanaged *surface = struct sway_xwayland_unmanaged *surface =
wl_container_of(listener, surface, destroy); wl_container_of(listener, surface, destroy);
struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
if (xsurface->mapped) {
unmanaged_handle_unmap(&surface->unmap, xsurface);
}
wl_list_remove(&surface->map.link); wl_list_remove(&surface->map.link);
wl_list_remove(&surface->unmap.link); wl_list_remove(&surface->unmap.link);
wl_list_remove(&surface->destroy.link); wl_list_remove(&surface->destroy.link);