diff options
| author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-08-06 11:47:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-06 11:47:00 -0400 |
| commit | 639f3368e101b697aaf3715b1213ea30766ff4ed (patch) | |
| tree | 67dfb7bc19eb3dd27252d8b0f493436250b4fdea /sway/server.c | |
| parent | f57a3919cf5ad7c3edbf9e2e19051971a5f2d42f (diff) | |
| parent | d8b65193c493e5826383a08593395a598ce4b503 (diff) | |
Merge branch 'master' into workspace-move-to-output
Diffstat (limited to 'sway/server.c')
| -rw-r--r-- | sway/server.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sway/server.c b/sway/server.c index e8755360..e8dc63be 100644 --- a/sway/server.c +++ b/sway/server.c @@ -19,7 +19,6 @@ #include <wlr/types/wlr_xcursor_manager.h> #include <wlr/types/wlr_xdg_output.h> #include <wlr/util/log.h> -// TODO WLR: make Xwayland optional #include "list.h" #include "sway/config.h" #include "sway/desktop/idle_inhibit_v1.h" @@ -85,7 +84,6 @@ bool server_init(struct sway_server *server) { &server->xdg_shell_surface); server->xdg_shell_surface.notify = handle_xdg_shell_surface; - // TODO make xwayland optional #ifdef HAVE_XWAYLAND server->xwayland.wlr_xwayland = wlr_xwayland_create(server->wl_display, server->compositor, true); @@ -109,11 +107,15 @@ bool server_init(struct sway_server *server) { } #endif - // TODO: Integration with sway borders - struct wlr_server_decoration_manager *deco_manager = + server->server_decoration_manager = wlr_server_decoration_manager_create(server->wl_display); wlr_server_decoration_manager_set_default_mode( - deco_manager, WLR_SERVER_DECORATION_MANAGER_MODE_SERVER); + server->server_decoration_manager, + WLR_SERVER_DECORATION_MANAGER_MODE_SERVER); + wl_signal_add(&server->server_decoration_manager->events.new_decoration, + &server->server_decoration); + server->server_decoration.notify = handle_server_decoration; + wl_list_init(&server->decorations); wlr_linux_dmabuf_v1_create(server->wl_display, renderer); wlr_export_dmabuf_manager_v1_create(server->wl_display); |