aboutsummaryrefslogtreecommitdiffstats
path: root/sway/server.c
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-04-29 09:40:58 +0100
committerLibravatar emersion <contact@emersion.fr>2018-05-14 13:26:10 +0100
commit95a10dd4f35c6ffc14d23fa3a19a784e85a31724 (patch)
tree9793561e72a8d1b1f948080b5e36f98dbfa89619 /sway/server.c
parentMerge pull request #1968 from RyanDwyer/fix-criteria (diff)
downloadsway-95a10dd4f35c6ffc14d23fa3a19a784e85a31724.tar.gz
sway-95a10dd4f35c6ffc14d23fa3a19a784e85a31724.tar.zst
sway-95a10dd4f35c6ffc14d23fa3a19a784e85a31724.zip
Kill wl_shell
Diffstat (limited to 'sway/server.c')
-rw-r--r--sway/server.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sway/server.c b/sway/server.c
index 6147a39d..050ddf56 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -8,15 +8,14 @@
8#include <wlr/render/wlr_renderer.h> 8#include <wlr/render/wlr_renderer.h>
9#include <wlr/types/wlr_compositor.h> 9#include <wlr/types/wlr_compositor.h>
10#include <wlr/types/wlr_gamma_control.h> 10#include <wlr/types/wlr_gamma_control.h>
11#include <wlr/types/wlr_linux_dmabuf.h> 11#include <wlr/types/wlr_idle.h>
12#include <wlr/types/wlr_layer_shell.h> 12#include <wlr/types/wlr_layer_shell.h>
13#include <wlr/types/wlr_linux_dmabuf.h>
13#include <wlr/types/wlr_primary_selection.h> 14#include <wlr/types/wlr_primary_selection.h>
14#include <wlr/types/wlr_screenshooter.h> 15#include <wlr/types/wlr_screenshooter.h>
15#include <wlr/types/wlr_server_decoration.h> 16#include <wlr/types/wlr_server_decoration.h>
16#include <wlr/types/wlr_xcursor_manager.h> 17#include <wlr/types/wlr_xcursor_manager.h>
17#include <wlr/types/wlr_xdg_output.h> 18#include <wlr/types/wlr_xdg_output.h>
18#include <wlr/types/wlr_wl_shell.h>
19#include <wlr/types/wlr_idle.h>
20#include <wlr/util/log.h> 19#include <wlr/util/log.h>
21// TODO WLR: make Xwayland optional 20// TODO WLR: make Xwayland optional
22#include <wlr/xwayland.h> 21#include <wlr/xwayland.h>
@@ -88,11 +87,6 @@ bool server_init(struct sway_server *server) {
88 &server->xdg_shell_surface); 87 &server->xdg_shell_surface);
89 server->xdg_shell_surface.notify = handle_xdg_shell_surface; 88 server->xdg_shell_surface.notify = handle_xdg_shell_surface;
90 89
91 server->wl_shell = wlr_wl_shell_create(server->wl_display);
92 wl_signal_add(&server->wl_shell->events.new_surface,
93 &server->wl_shell_surface);
94 server->wl_shell_surface.notify = handle_wl_shell_surface;
95
96 // TODO make xwayland optional 90 // TODO make xwayland optional
97 server->xwayland = 91 server->xwayland =
98 wlr_xwayland_create(server->wl_display, server->compositor, true); 92 wlr_xwayland_create(server->wl_display, server->compositor, true);