xwayland.c: Fix xwayland views activating themself before mapping

diff --git a/src/xwayland-unmanaged.c b/src/xwayland-unmanaged.c
index 033873207b45fff2385210bc25a496312d9ae845..78516b01ea556d4981a34f8465dad688721330b1 100644 (file)
--- a/src/xwayland-unmanaged.c
+++ b/src/xwayland-unmanaged.c
@@ -63,7 +63,7 @@ unmanaged_handle_map(struct wl_listener *listener, void *data)
        int ly = unmanaged->ly;
        struct wlr_scene_node *parent, *node;
        struct view *view = parent_view(unmanaged->server, xsurface);
-       if (!view || !view->scene_tree) {
+       if (!view || !view->scene_node) {
                parent = &view->server->unmanaged_tree->node;
        } else {
                lx -= view->x;

diff --git a/src/xwayland.c b/src/xwayland.c
index 5560ba7efc9e279724f347d27ca8f56e8954cda6..59878d12b07230bdf53c5792d88b0e122ddf289b 100644 (file)
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -258,7 +258,6 @@ map(struct view *view)
        }
        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_tree->node, view->surface);
        if (!view->scene_node) {
@@ -376,6 +375,7 @@ xwayland_surface_new(struct wl_listener *listener, void *data)
        view->impl = &xwl_view_impl;
        view->xwayland_surface = xsurface;
 
+       view->scene_tree = wlr_scene_tree_create(&view->server->view_tree->node);
        xsurface->data = view;
 
        view->map.notify = handle_map;