2 files changed, 61 insertions, 6 deletions

diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c
index 1d935180..8dffd040 100644
--- a/xwayland/xwayland.c
+++ b/xwayland/xwayland.c
@@ -405,3 +405,24 @@ void wlr_xwayland_set_seat(struct wlr_xwayland *xwayland,
 	xwayland->seat_destroy.notify = wlr_xwayland_handle_seat_destroy;
 	wl_signal_add(&seat->events.destroy, &xwayland->seat_destroy);
 }
+
+
+bool wlr_xwayland_surface_is_unmanaged(const struct wlr_xwayland_surface *surface) {
+	static enum atom_name needles[] = {
+		NET_WM_WINDOW_TYPE_UTILITY,
+		NET_WM_WINDOW_TYPE_TOOLTIP,
+		NET_WM_WINDOW_TYPE_DND,
+		NET_WM_WINDOW_TYPE_DROPDOWN_MENU,
+		NET_WM_WINDOW_TYPE_POPUP_MENU,
+		NET_WM_WINDOW_TYPE_COMBO,
+	};
+
+	for (size_t i = 0; i < sizeof(needles) / sizeof(needles[0]); ++i) {
+		if (wlr_xwm_atoms_contains(surface->xwm, surface->window_type,
+				surface->window_type_len, needles[i])) {
+			return true;
+		}
+	}
+
+	return false;
+}
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index 94dfdaab..c41b8d47 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -54,6 +54,12 @@ const char *atom_map[ATOM_LAST] = {
 	"INCR",
 	"TEXT",
 	"TIMESTAMP",
+	"_NET_WM_WINDOW_TYPE_UTILITY",
+	"_NET_WM_WINDOW_TYPE_TOOLTIP",
+	"_NET_WM_WINDOW_TYPE_DND",
+	"_NET_WM_WINDOW_TYPE_DROPDOWN_MENU",
+	"_NET_WM_WINDOW_TYPE_POPUP_MENU",
+	"_NET_WM_WINDOW_TYPE_COMBO",
 };
 
 /* General helpers */
@@ -1019,11 +1025,11 @@ static int x11_event_handler(int fd, uint32_t mask, void *data) {
 	return count;
 }
 
-static void handle_compositor_surface_create(struct wl_listener *listener,
+static void handle_compositor_new_surface(struct wl_listener *listener,
 		void *data) {
-	struct wlr_surface *surface = data;
 	struct wlr_xwm *xwm =
-		wl_container_of(listener, xwm, compositor_surface_create);
+		wl_container_of(listener, xwm, compositor_new_surface);
+	struct wlr_surface *surface = data;
 	if (wl_resource_get_client(surface->resource) != xwm->xwayland->client) {
 		return;
 	}
@@ -1043,6 +1049,16 @@ static void handle_compositor_surface_create(struct wl_listener *listener,
 	}
 }
 
+static void handle_compositor_destroy(struct wl_listener *listener,
+		void *data) {
+	struct wlr_xwm *xwm =
+		wl_container_of(listener, xwm, compositor_destroy);
+	wl_list_remove(&xwm->compositor_new_surface.link);
+	wl_list_remove(&xwm->compositor_destroy.link);
+	wl_list_init(&xwm->compositor_new_surface.link);
+	wl_list_init(&xwm->compositor_destroy.link);
+}
+
 void wlr_xwayland_surface_activate(struct wlr_xwayland_surface *xsurface,
 		bool activated) {
 	struct wlr_xwayland_surface *focused = xsurface->xwm->focus_surface;
@@ -1124,7 +1140,8 @@ void xwm_destroy(struct wlr_xwm *xwm) {
 	wl_list_for_each_safe(xsurface, tmp, &xwm->unpaired_surfaces, link) {
 		wlr_xwayland_surface_destroy(xsurface);
 	}
-	wl_list_remove(&xwm->compositor_surface_create.link);
+	wl_list_remove(&xwm->compositor_new_surface.link);
+	wl_list_remove(&xwm->compositor_destroy.link);
 	xcb_disconnect(xwm->xcb_conn);
 
 	free(xwm);
@@ -1407,9 +1424,12 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland) {
 
 	xwm_selection_init(xwm);
 
-	xwm->compositor_surface_create.notify = handle_compositor_surface_create;
+	xwm->compositor_new_surface.notify = handle_compositor_new_surface;
 	wl_signal_add(&wlr_xwayland->compositor->events.new_surface,
-		&xwm->compositor_surface_create);
+		&xwm->compositor_new_surface);
+	xwm->compositor_destroy.notify = handle_compositor_destroy;
+	wl_signal_add(&wlr_xwayland->compositor->events.destroy,
+		&xwm->compositor_destroy);
 
 	xwm_create_wm_window(xwm);
 
@@ -1432,3 +1452,17 @@ void wlr_xwayland_surface_set_fullscreen(struct wlr_xwayland_surface *surface,
 	xsurface_set_net_wm_state(surface);
 	xcb_flush(surface->xwm->xcb_conn);
 }
+
+bool wlr_xwm_atoms_contains(struct wlr_xwm *xwm, xcb_atom_t *atoms,
+		size_t num_atoms, enum atom_name needle) {
+	xcb_atom_t atom = xwm->atoms[needle];
+
+	for (size_t i = 0; i < num_atoms; ++i) {
+		if (atom == atoms[i]) {
+			return true;
+		}
+	}
+
+	return false;
+}
+