aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Rouven Czerwinski <rouven@czerwinskis.de>2022-05-16 13:53:36 +0200
committerLibravatar Simon Zeni <simon@bl4ckb0ne.ca>2022-05-16 11:20:39 -0400
commit3f600565e4dd4fb7a45a7b721d518c79f8d41b59 (patch)
treedb1832742cab3c6964f83edc74a90aa83fabc257
parentman: Fix trailing spaces (diff)
downloadsway-3f600565e4dd4fb7a45a7b721d518c79f8d41b59.tar.gz
sway-3f600565e4dd4fb7a45a7b721d518c79f8d41b59.tar.zst
sway-3f600565e4dd4fb7a45a7b721d518c79f8d41b59.zip
server: request xdg-shell v2
Wlroots does not yet support the newer xdg-shell versions and now requires the compositor to set the supported xdg-shell version during creation. Set this to v2 for sway as well. Fixes https://github.com/swaywm/sway/issues/7001
-rw-r--r--sway/server.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sway/server.c b/sway/server.c
index 0f0c76a8..627d80d6 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -72,6 +72,8 @@ static void handle_drm_lease_request(struct wl_listener *listener, void *data) {
72 } 72 }
73} 73}
74 74
75#define SWAY_XDG_SHELL_VERSION 2
76
75bool server_init(struct sway_server *server) { 77bool server_init(struct sway_server *server) {
76 sway_log(SWAY_DEBUG, "Initializing Wayland server"); 78 sway_log(SWAY_DEBUG, "Initializing Wayland server");
77 79
@@ -126,7 +128,8 @@ bool server_init(struct sway_server *server) {
126 &server->layer_shell_surface); 128 &server->layer_shell_surface);
127 server->layer_shell_surface.notify = handle_layer_shell_surface; 129 server->layer_shell_surface.notify = handle_layer_shell_surface;
128 130
129 server->xdg_shell = wlr_xdg_shell_create(server->wl_display); 131 server->xdg_shell = wlr_xdg_shell_create(server->wl_display,
132 SWAY_XDG_SHELL_VERSION);
130 wl_signal_add(&server->xdg_shell->events.new_surface, 133 wl_signal_add(&server->xdg_shell->events.new_surface,
131 &server->xdg_shell_surface); 134 &server->xdg_shell_surface);
132 server->xdg_shell_surface.notify = handle_xdg_shell_surface; 135 server->xdg_shell_surface.notify = handle_xdg_shell_surface;