mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-07 04:33:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

view: Refactor view destruction

Browse source 
Consolidates all of the view destruction code for xwl + xdg into one function.

Fixes several notable bugs along the way:
  - Fixes a crash when alt tabbing when a selected view gets destroyed.
  - Fixes the OSD not updating to reflect a view has been destroyed.
This commit is contained in:
Joshua Ashton 2022-04-21 23:33:44 +00:00 • committed by Consolatis
parent dee370f1b4
commit d0b9680d00
4 changed files with 64 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/labwc.h
View file

@ -404,6 +404,8 @@ 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 foreign_toplevel_handle_create(struct view *view); void foreign_toplevel_handle_create(struct view *view);
/* /*

60
src/view.c
View file

@ -651,3 +651,63 @@ view_update_app_id(struct view *view)
wlr_foreign_toplevel_handle_v1_set_app_id( wlr_foreign_toplevel_handle_v1_set_app_id(
view->toplevel_handle, app_id); view->toplevel_handle, app_id);
} }
void
view_handle_destroy(struct view *view)
{
if (view->toplevel_handle) {
wlr_foreign_toplevel_handle_v1_destroy(view->toplevel_handle);
}
interactive_end(view);
if (view->server->seat.active_view == view) {
view->server->seat.active_view = NULL;
}
if (view->server->cycle_view == view) {
/* If we are the current OSD selected view, cycle
* to the next because we are dying. */
view->server->cycle_view = desktop_cycle_view(view->server,
view->server->cycle_view, LAB_CYCLE_DIR_BACKWARD);
/* If we cycled back to ourselves, then we have no windows.
* just remove it and close the osd for good. */
if (view->server->cycle_view == view) {
view->server->cycle_view = NULL;
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. */
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) {
ssd_destroy(view);
wlr_scene_node_destroy(&view->scene_tree->node);
view->scene_tree = NULL;
}
free(view);
}

16
src/xdg.c
View file

@ -78,21 +78,7 @@ 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);
if (view->toplevel_handle) { view_handle_destroy(view);
wlr_foreign_toplevel_handle_v1_destroy(view->toplevel_handle);
}
interactive_end(view);
if (view->server->seat.active_view == view) {
view->server->seat.active_view = NULL;
}
wl_list_remove(&view->link);
wl_list_remove(&view->destroy.link);
if (view->scene_tree) {
ssd_destroy(view);
wlr_scene_node_destroy(&view->scene_tree->node);
view->scene_tree = NULL;
}
free(view);
} }
static void static void

22
src/xwayland.c
View file

@ -96,27 +96,7 @@ 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);
if (view->toplevel_handle) { view_handle_destroy(view);
wlr_foreign_toplevel_handle_v1_destroy(view->toplevel_handle);
}
interactive_end(view);
if (view->server->seat.active_view == view) {
view->server->seat.active_view = NULL;
}
view->xwayland_surface = NULL;
wl_list_remove(&view->link);
wl_list_remove(&view->map.link);
wl_list_remove(&view->unmap.link);
wl_list_remove(&view->destroy.link);
wl_list_remove(&view->request_configure.link);
wl_list_remove(&view->request_maximize.link);
wl_list_remove(&view->request_fullscreen.link);
if (view->scene_tree) {
ssd_destroy(view);
wlr_scene_node_destroy(&view->scene_tree->node);
view->scene_tree = NULL;
}
free(view);
} }
static void static void