diff options
| -rw-r--r-- | rootston/desktop.c | 3 | ||||
| -rw-r--r-- | rootston/wl_shell.c | 2 | ||||
| -rw-r--r-- | rootston/xdg_shell_v6.c | 2 | ||||
| -rw-r--r-- | rootston/xwayland.c | 6 |
4 files changed, 10 insertions, 3 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index b48da44b..7a780cb9 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -246,15 +246,12 @@ void view_destroy(struct roots_view *view) { view->fullscreen_output->fullscreen_view = NULL; } - wl_list_remove(&view->link); free(view); } void view_init(struct roots_view *view, struct roots_desktop *desktop) { view->desktop = desktop; wl_signal_init(&view->events.destroy); - - wl_list_insert(&desktop->views, &view->link); } void view_setup(struct roots_view *view) { diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c index f285d7f6..e69f2dd9 100644 --- a/rootston/wl_shell.c +++ b/rootston/wl_shell.c @@ -99,6 +99,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&roots_surface->request_set_fullscreen.link); wl_list_remove(&roots_surface->set_state.link); wl_list_remove(&roots_surface->surface_commit.link); + wl_list_remove(&roots_surface->view->link); view_destroy(roots_surface->view); free(roots_surface); } @@ -151,6 +152,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { view->close = close; roots_surface->view = view; view_init(view, desktop); + wl_list_insert(&desktop->views, &view->link); view_setup(view); diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c index 9017f7bd..f301a2e1 100644 --- a/rootston/xdg_shell_v6.c +++ b/rootston/xdg_shell_v6.c @@ -190,6 +190,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&roots_xdg_surface->destroy.link); wl_list_remove(&roots_xdg_surface->request_move.link); wl_list_remove(&roots_xdg_surface->request_resize.link); + wl_list_remove(&roots_xdg_surface->view->link); view_destroy(roots_xdg_surface->view); free(roots_xdg_surface); } @@ -249,6 +250,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { view->close = close; roots_surface->view = view; view_init(view, desktop); + wl_list_insert(&desktop->views, &view->link); view_setup(view); } diff --git a/rootston/xwayland.c b/rootston/xwayland.c index 5e27afed..cdf2a2d9 100644 --- a/rootston/xwayland.c +++ b/rootston/xwayland.c @@ -102,6 +102,8 @@ static void set_fullscreen(struct roots_view *view, bool fullscreen) { static void handle_destroy(struct wl_listener *listener, void *data) { struct roots_xwayland_surface *roots_surface = wl_container_of(listener, roots_surface, destroy); + struct wlr_xwayland_surface *xwayland_surface = + roots_surface->view->xwayland_surface; wl_list_remove(&roots_surface->destroy.link); wl_list_remove(&roots_surface->request_configure.link); wl_list_remove(&roots_surface->request_move.link); @@ -109,6 +111,9 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&roots_surface->request_maximize.link); wl_list_remove(&roots_surface->map_notify.link); wl_list_remove(&roots_surface->unmap_notify.link); + if (xwayland_surface->mapped) { + wl_list_remove(&roots_surface->view->link); + } view_destroy(roots_surface->view); free(roots_surface); } @@ -264,6 +269,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { view->close = close; roots_surface->view = view; view_init(view, desktop); + wl_list_insert(&desktop->views, &view->link); if (!surface->override_redirect) { view_setup(view); |