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

xwayland.c: Fix xwayland views activating themself before mapping

Browse source
This commit is contained in:
Consolatis 2022-02-22 10:01:49 +01:00 • committed by Johan Malm
parent a2523081e2
commit 17d83402ee
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/xwayland-unmanaged.c
View file

@ -63,7 +63,7 @@ unmanaged_handle_map(struct wl_listener *listener, void *data)
int ly = unmanaged->ly; int ly = unmanaged->ly;
struct wlr_scene_node *parent, *node; struct wlr_scene_node *parent, *node;
struct view *view = parent_view(unmanaged->server, xsurface); struct view *view = parent_view(unmanaged->server, xsurface);
if (!view || !view->scene_tree) { if (!view || !view->scene_node) {
parent = &view->server->unmanaged_tree->node; parent = &view->server->unmanaged_tree->node;
} else { } else {
lx -= view->x; lx -= view->x;

2
src/xwayland.c
View file

@ -258,7 +258,6 @@ map(struct view *view)
} }
view->surface = view->xwayland_surface->surface; view->surface = view->xwayland_surface->surface;
view->scene_tree = wlr_scene_tree_create(&view->server->view_tree->node);
view->scene_node = wlr_scene_subsurface_tree_create( view->scene_node = wlr_scene_subsurface_tree_create(
&view->scene_tree->node, view->surface); &view->scene_tree->node, view->surface);
if (!view->scene_node) { if (!view->scene_node) {
@ -376,6 +375,7 @@ xwayland_surface_new(struct wl_listener *listener, void *data)
view->impl = &xwl_view_impl; view->impl = &xwl_view_impl;
view->xwayland_surface = xsurface; view->xwayland_surface = xsurface;
view->scene_tree = wlr_scene_tree_create(&view->server->view_tree->node);
xsurface->data = view; xsurface->data = view;
view->map.notify = handle_map; view->map.notify = handle_map;