sway

commit 700f4805bc3ca86b3c2a46aa96bcee9d8e20f599
parent a168b2029932d2a76341d91b3c6d8463de568213
Author: Simon Ser <contact@emersion.fr>
Date:   Fri, 24 May 2024 23:49:32 +0200

server: hide xdg_output from unprivileged clients

Regular Wayland clients shouldn't care about the position or size
of outputs. Hide xdg_output from unprivileged clients to make sure
they're not doing shenanigans with this information.

Diffstat:
M
include/sway/server.h
 | 
2
++
M
sway/server.c
 | 
6
++++--

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/sway/server.h b/include/sway/server.h
@@ -81,6 +81,8 @@ struct sway_server {
 	struct wlr_pointer_constraints_v1 *pointer_constraints;
 	struct wl_listener pointer_constraint;
 
+	struct wlr_xdg_output_manager_v1 *xdg_output_manager_v1;
+
 	struct wlr_output_manager_v1 *output_manager_v1;
 	struct wl_listener output_manager_apply;
 	struct wl_listener output_manager_test;
diff --git a/sway/server.c b/sway/server.c
@@ -113,7 +113,8 @@ static bool is_privileged(const struct wl_global *global) {
 		global == server.input->keyboard_shortcuts_inhibit->global ||
 		global == server.input->virtual_keyboard->global ||
 		global == server.input->virtual_pointer->global ||
-		global == server.input->transient_seat_manager->global;
+		global == server.input->transient_seat_manager->global ||
+		global == server.xdg_output_manager_v1->global;
 }
 
 static bool filter_global(const struct wl_client *client,
@@ -275,7 +276,8 @@ bool server_init(struct sway_server *server) {
 	wl_signal_add(&root->output_layout->events.change,
 		&server->output_layout_change);
 
-	wlr_xdg_output_manager_v1_create(server->wl_display, root->output_layout);
+	server->xdg_output_manager_v1 =
+		wlr_xdg_output_manager_v1_create(server->wl_display, root->output_layout);
 
 	server->idle_notifier_v1 = wlr_idle_notifier_v1_create(server->wl_display);
 	sway_idle_inhibit_manager_v1_init();