From 44c7e233ff7581c9735b03c2105d9803f9a8535f Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Tue, 18 Oct 2022 12:43:45 +0200
Subject: [PATCH] xwayland: add wlr_xwayland_shell_v1_set_client()

---
 include/wlr/xwayland/shell.h |  9 +++++++++
 xwayland/shell.c             | 27 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/include/wlr/xwayland/shell.h b/include/wlr/xwayland/shell.h
index 50be0aae..893e5fda 100644
--- a/include/wlr/xwayland/shell.h
+++ b/include/wlr/xwayland/shell.h
@@ -26,7 +26,10 @@ struct wlr_xwayland_shell_v1 {
 
 	// private state
 
+	struct wl_client *client;
+
 	struct wl_listener display_destroy;
+	struct wl_listener client_destroy;
 };
 
 /**
@@ -54,4 +57,10 @@ struct wlr_xwayland_surface_v1 {
 struct wlr_xwayland_shell_v1 *wlr_xwayland_shell_v1_create(
 	struct wl_display *display, uint32_t version);
 
+/**
+ * Allow a client to bind to the xwayland_shell_v1 global.
+ */
+void wlr_xwayland_shell_v1_set_client(struct wlr_xwayland_shell_v1 *shell,
+	struct wl_client *client);
+
 #endif
diff --git a/xwayland/shell.c b/xwayland/shell.c
index d3e2fd0a..75049f64 100644
--- a/xwayland/shell.c
+++ b/xwayland/shell.c
@@ -143,6 +143,12 @@ static void shell_bind(struct wl_client *client, void *data, uint32_t version,
 		uint32_t id) {
 	struct wlr_xwayland_shell_v1 *shell = data;
 
+	if (client != shell->client) {
+		wl_client_post_implementation_error(client,
+			"Permission denied to bind to %s", xwayland_shell_v1_interface.name);
+		return;
+	}
+
 	struct wl_resource *resource = wl_resource_create(client,
 		&xwayland_shell_v1_interface, version, id);
 	if (resource == NULL) {
@@ -156,6 +162,7 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
 	struct wlr_xwayland_shell_v1 *shell =
 		wl_container_of(listener, shell, display_destroy);
 	wl_list_remove(&shell->display_destroy.link);
+	wl_list_remove(&shell->client_destroy.link);
 	wl_global_destroy(shell->global);
 	free(shell);
 }
@@ -181,5 +188,25 @@ struct wlr_xwayland_shell_v1 *wlr_xwayland_shell_v1_create(
 	shell->display_destroy.notify = handle_display_destroy;
 	wl_display_add_destroy_listener(display, &shell->display_destroy);
 
+	wl_list_init(&shell->client_destroy.link);
+
 	return shell;
 }
+
+static void shell_handle_client_destroy(struct wl_listener *listener, void *data) {
+	struct wlr_xwayland_shell_v1 *shell =
+		wl_container_of(listener, shell, client_destroy);
+	wlr_xwayland_shell_v1_set_client(shell, NULL);
+}
+
+void wlr_xwayland_shell_v1_set_client(struct wlr_xwayland_shell_v1 *shell,
+		struct wl_client *client) {
+	wl_list_remove(&shell->client_destroy.link);
+	shell->client = client;
+	if (client != NULL) {
+		shell->client_destroy.notify = shell_handle_client_destroy;
+		wl_client_add_destroy_listener(client, &shell->client_destroy);
+	} else {
+		wl_list_init(&shell->client_destroy.link);
+	}
+}