aboutsummaryrefslogtreecommitdiffstats
path: root/sway/server.c
diff options
context:
space:
mode:
authorLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-04 07:32:25 -0500
committerLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-04 07:32:25 -0500
commit0896b6867536e7c12e5345ca5df94b9467c8bf24 (patch)
tree2240f512d2e55102b2ad16b4ff13a6c8124947d9 /sway/server.c
parentxwayland shell (diff)
parentMerge pull request #1493 from acrisci/feature/wl-shell (diff)
downloadsway-0896b6867536e7c12e5345ca5df94b9467c8bf24.tar.gz
sway-0896b6867536e7c12e5345ca5df94b9467c8bf24.tar.zst
sway-0896b6867536e7c12e5345ca5df94b9467c8bf24.zip
Merge branch 'wlroots' into feature/xwayland
Diffstat (limited to 'sway/server.c')
-rw-r--r--sway/server.c6
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 @@
7#include <wlr/render.h> 7#include <wlr/render.h>
8#include <wlr/render/gles2.h> 8#include <wlr/render/gles2.h>
9#include <wlr/types/wlr_compositor.h> 9#include <wlr/types/wlr_compositor.h>
10#include <wlr/types/wlr_wl_shell.h>
10// TODO WLR: make Xwayland optional 11// TODO WLR: make Xwayland optional
11#include <wlr/xwayland.h> 12#include <wlr/xwayland.h>
12#include "sway/server.h" 13#include "sway/server.h"
@@ -47,6 +48,11 @@ bool server_init(struct sway_server *server) {
47 &server->xwayland_surface); 48 &server->xwayland_surface);
48 server->xwayland_surface.notify = handle_xwayland_surface; 49 server->xwayland_surface.notify = handle_xwayland_surface;
49 50
51 server->wl_shell = wlr_wl_shell_create(server->wl_display);
52 wl_signal_add(&server->wl_shell->events.new_surface,
53 &server->wl_shell_surface);
54 server->wl_shell_surface.notify = handle_wl_shell_surface;
55
50 server->socket = wl_display_add_socket_auto(server->wl_display); 56 server->socket = wl_display_add_socket_auto(server->wl_display);
51 if (!sway_assert(server->socket, "Unable to open wayland socket")) { 57 if (!sway_assert(server->socket, "Unable to open wayland socket")) {
52 wlr_backend_destroy(server->backend); 58 wlr_backend_destroy(server->backend);