Merge branch 'wlroots' into feature/xwayland

1 files changed, 6 insertions, 0 deletions

diff --git a/sway/server.c b/sway/server.c
index 2694cea0..024d8429 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -7,6 +7,7 @@
 #include <wlr/render.h>
 #include <wlr/render/gles2.h>
 #include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_wl_shell.h>
 // TODO WLR: make Xwayland optional
 #include <wlr/xwayland.h>
 #include "sway/server.h"
@@ -47,6 +48,11 @@ bool server_init(struct sway_server *server) {
 		&server->xwayland_surface);
 	server->xwayland_surface.notify = handle_xwayland_surface;
 
+	server->wl_shell = wlr_wl_shell_create(server->wl_display);
+	wl_signal_add(&server->wl_shell->events.new_surface,
+		&server->wl_shell_surface);
+	server->wl_shell_surface.notify = handle_wl_shell_surface;
+
 	server->socket = wl_display_add_socket_auto(server->wl_display);
 	if (!sway_assert(server->socket,  "Unable to open wayland socket")) {
 		wlr_backend_destroy(server->backend);