mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

view: Refactor view destruction some more

Browse source
This commit is contained in:
Consolatis 2022-04-23 03:44:41 +02:00 • committed by Johan Malm
parent 0ec63a153b
commit 73930f7e0f
4 changed files with 35 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/labwc.h
View file

@ -404,7 +404,7 @@ void view_update_app_id(struct view *view);
void view_impl_map(struct view *view); void view_impl_map(struct view *view);
void view_adjust_size(struct view *view, int *w, int *h); void view_adjust_size(struct view *view, int *w, int *h);
void view_handle_destroy(struct view *view); void view_destroy(struct view *view);
void foreign_toplevel_handle_create(struct view *view); void foreign_toplevel_handle_create(struct view *view);

36
src/view.c
View file

@ -653,7 +653,7 @@ view_update_app_id(struct view *view)
} }
void void
view_handle_destroy(struct view *view) view_destroy(struct view *view)
{ {
if (view->toplevel_handle) { if (view->toplevel_handle) {
wlr_foreign_toplevel_handle_v1_destroy(view->toplevel_handle); wlr_foreign_toplevel_handle_v1_destroy(view->toplevel_handle);
@ -671,43 +671,25 @@ view_handle_destroy(struct view *view)
view->server->cycle_view, LAB_CYCLE_DIR_BACKWARD); view->server->cycle_view, LAB_CYCLE_DIR_BACKWARD);
/* If we cycled back to ourselves, then we have no windows. /* If we cycled back to ourselves, then we have no windows.
* just remove it and close the osd for good. */ * just remove it and close the OSD for good. */
if (view->server->cycle_view == view) { if (view->server->cycle_view == view || !view->server->cycle_view) {
view->server->cycle_view = NULL; view->server->cycle_view = NULL;
osd_finish(view->server); osd_finish(view->server);
} }
} else if (view->server->cycle_view != NULL) { }
/* If we have an OSD, but are not the cycled view, just
* update the OSD to reflect the view has now gone. */ if (view->server->cycle_view) {
/* Update the OSD to reflect the view has now gone. */
osd_update(view->server); osd_update(view->server);
} }
if (view->type == LAB_XDG_SHELL_VIEW) {
view->xdg_surface = NULL;
}
#ifdef HAVE_XWAYLAND
if (view->type == LAB_XWAYLAND_VIEW) {
view->xwayland_surface = NULL;
}
#endif
wl_list_remove(&view->link);
wl_list_remove(&view->destroy.link);
#ifdef HAVE_XWAYLAND
if (view->type == LAB_XWAYLAND_VIEW) {
wl_list_remove(&view->map.link);
wl_list_remove(&view->unmap.link);
wl_list_remove(&view->request_configure.link);
wl_list_remove(&view->request_maximize.link);
wl_list_remove(&view->request_fullscreen.link);
}
#endif
if (view->scene_tree) { if (view->scene_tree) {
ssd_destroy(view); ssd_destroy(view);
wlr_scene_node_destroy(&view->scene_tree->node); wlr_scene_node_destroy(&view->scene_tree->node);
view->scene_tree = NULL; view->scene_tree = NULL;
} }
/* Remove view from server->views */
wl_list_remove(&view->link);
free(view); free(view);
} }

11
src/xdg.c
View file

@ -78,7 +78,16 @@ static void
handle_destroy(struct wl_listener *listener, void *data) handle_destroy(struct wl_listener *listener, void *data)
{ {
struct view *view = wl_container_of(listener, view, destroy); struct view *view = wl_container_of(listener, view, destroy);
view_handle_destroy(view); assert(view->type == LAB_XDG_SHELL_VIEW);
/* Reset XDG specific surface for good measure */
view->xdg_surface = NULL;
/* Remove XDG specific handlers */
wl_list_remove(&view->destroy.link);
/* And finally destroy / free the view */
view_destroy(view);
} }
static void static void

16
src/xwayland.c
View file

@ -96,7 +96,21 @@ static void
handle_destroy(struct wl_listener *listener, void *data) handle_destroy(struct wl_listener *listener, void *data)
{ {
struct view *view = wl_container_of(listener, view, destroy); struct view *view = wl_container_of(listener, view, destroy);
view_handle_destroy(view); assert(view->type == LAB_XWAYLAND_VIEW);
/* Reset XWayland specific surface for good measure */
view->xwayland_surface = NULL;
/* Remove XWayland specific handlers */
wl_list_remove(&view->map.link);
wl_list_remove(&view->unmap.link);
wl_list_remove(&view->request_configure.link);
wl_list_remove(&view->request_maximize.link);
wl_list_remove(&view->request_fullscreen.link);
wl_list_remove(&view->destroy.link);
/* And finally destroy / free the view */
view_destroy(view);
} }
static void static void