From 17d83402eef8cbeb9f6793d66b7ec2804a5913e3 Mon Sep 17 00:00:00 2001
From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Tue, 22 Feb 2022 10:01:49 +0100
Subject: [PATCH] xwayland.c: Fix xwayland views activating themself before
 mapping

---
 src/xwayland-unmanaged.c | 2 +-
 src/xwayland.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/xwayland-unmanaged.c b/src/xwayland-unmanaged.c
index 03387320..78516b01 100644
--- 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 5560ba7e..59878d12 100644
--- 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;