mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg/xwayland: Do not destroy scene node on unmap

Browse source 
This prevents segfaulting when unminimizing
This commit is contained in:
Consolatis 2022-02-23 01:32:07 +01:00 • committed by Johan Malm
parent c2f7e0be3d
commit 29021dad6a
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ssd/ssd.c
View file

@ -149,12 +149,10 @@ ssd_create(struct view *view)
{ {
if (view->ssd.tree) { if (view->ssd.tree) {
/* SSD was hidden. Just enable it */ /* SSD was hidden. Just enable it */
wlr_log(WLR_ERROR, "Unhiding SSD");
wlr_scene_node_set_enabled(&view->ssd.tree->node, true); wlr_scene_node_set_enabled(&view->ssd.tree->node, true);
return; return;
} }
wlr_log(WLR_ERROR, "Creating SSD");
view->ssd.tree = wlr_scene_tree_create(&view->scene_tree->node); view->ssd.tree = wlr_scene_tree_create(&view->scene_tree->node);
wlr_scene_node_lower_to_bottom(&view->ssd.tree->node); wlr_scene_node_lower_to_bottom(&view->ssd.tree->node);
ssd_extents_create(view); ssd_extents_create(view);
@ -224,8 +222,6 @@ ssd_destroy(struct view *view)
return; return;
} }
wlr_log(WLR_ERROR, "Destroying SSD");
/* Maybe reset focused view */ /* Maybe reset focused view */
if (view->server->ssd_focused_view == view) { if (view->server->ssd_focused_view == view) {
view->server->ssd_focused_view = NULL; view->server->ssd_focused_view = NULL;

13
src/xdg.c
View file

@ -299,8 +299,12 @@ xdg_toplevel_view_get_string_prop(struct view *view, const char *prop)
static void static void
xdg_toplevel_view_map(struct view *view) xdg_toplevel_view_map(struct view *view)
{ {
if (view->mapped) {
return;
}
view->mapped = true; view->mapped = true;
view->surface = view->xdg_surface->surface; view->surface = view->xdg_surface->surface;
wlr_scene_node_set_enabled(&view->scene_tree->node, true);
if (!view->been_mapped) { if (!view->been_mapped) {
struct wlr_xdg_toplevel_requested *requested = struct wlr_xdg_toplevel_requested *requested =
&view->xdg_surface->toplevel->requested; &view->xdg_surface->toplevel->requested;
@ -340,9 +344,7 @@ xdg_toplevel_view_unmap(struct view *view)
{ {
if (view->mapped) { if (view->mapped) {
view->mapped = false; view->mapped = false;
damage_all_outputs(view->server); wlr_scene_node_set_enabled(&view->scene_tree->node, false);
wlr_scene_node_destroy(view->scene_node);
ssd_hide(view);
wl_list_remove(&view->commit.link); wl_list_remove(&view->commit.link);
desktop_focus_topmost_mapped_view(view->server); desktop_focus_topmost_mapped_view(view->server);
} }
@ -391,14 +393,13 @@ xdg_surface_new(struct wl_listener *listener, void *data)
view->xdg_surface = xdg_surface; view->xdg_surface = xdg_surface;
view->scene_tree = wlr_scene_tree_create(&view->server->view_tree->node); view->scene_tree = wlr_scene_tree_create(&view->server->view_tree->node);
wlr_scene_node_set_enabled(&view->scene_tree->node, false);
view->scene_node = wlr_scene_xdg_surface_create( view->scene_node = wlr_scene_xdg_surface_create(
&view->scene_tree->node, view->xdg_surface); &view->scene_tree->node, view->xdg_surface);
if (!view->scene_node) { if (!view->scene_node) {
wlr_scene_node_destroy(&view->scene_tree->node); /* TODO: might need further clean up */
view->scene_tree = NULL;
wl_resource_post_no_memory(view->surface->resource); wl_resource_post_no_memory(view->surface->resource);
/* TODO: should we free(view) here? */
return; return;
} }
view->scene_tree->node.data = view; view->scene_tree->node.data = view;

27
src/xwayland.c
View file

@ -246,7 +246,11 @@ top_left_edge_boundary_check(struct view *view)
static void static void
map(struct view *view) map(struct view *view)
{ {
if (view->mapped) {
return;
}
view->mapped = true; view->mapped = true;
wlr_scene_node_set_enabled(&view->scene_tree->node, true);
if (!view->fullscreen && view->xwayland_surface->fullscreen) { if (!view->fullscreen && view->xwayland_surface->fullscreen) {
view_set_fullscreen(view, true, NULL); view_set_fullscreen(view, true, NULL);
} }
@ -256,18 +260,17 @@ map(struct view *view)
view->w = view->xwayland_surface->width; view->w = view->xwayland_surface->width;
view->h = view->xwayland_surface->height; view->h = view->xwayland_surface->height;
} }
view->surface = view->xwayland_surface->surface;
view->scene_node = wlr_scene_subsurface_tree_create( if (view->surface != view->xwayland_surface->surface) {
&view->scene_tree->node, view->surface); view->surface = view->xwayland_surface->surface;
if (!view->scene_node) { view->scene_node = wlr_scene_subsurface_tree_create(
wlr_scene_node_destroy(&view->scene_tree->node); &view->scene_tree->node, view->surface);
view->scene_tree = NULL; if (!view->scene_node) {
wl_resource_post_no_memory(view->surface->resource); /* TODO: might need further clean up */
/* TODO: should we free(view) here? */ wl_resource_post_no_memory(view->surface->resource);
return; return;
}
} }
view->scene_tree->node.data = view;
view->ssd.enabled = want_deco(view); view->ssd.enabled = want_deco(view);
@ -308,9 +311,8 @@ unmap(struct view *view)
{ {
if (view->mapped) { if (view->mapped) {
view->mapped = false; view->mapped = false;
damage_all_outputs(view->server); wlr_scene_node_set_enabled(&view->scene_tree->node, false);
wl_list_remove(&view->commit.link); wl_list_remove(&view->commit.link);
ssd_hide(view);
desktop_focus_topmost_mapped_view(view->server); desktop_focus_topmost_mapped_view(view->server);
} }
} }
@ -376,6 +378,7 @@ xwayland_surface_new(struct wl_listener *listener, void *data)
view->xwayland_surface = xsurface; view->xwayland_surface = xsurface;
view->scene_tree = wlr_scene_tree_create(&view->server->view_tree->node); view->scene_tree = wlr_scene_tree_create(&view->server->view_tree->node);
view->scene_tree->node.data = view;
xsurface->data = view; xsurface->data = view;
view->map.notify = handle_map; view->map.notify = handle_map;