summaryrefslogtreecommitdiffstats
path: root/sway/server.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-03-30 00:11:00 -0400
committerLibravatar GitHub <noreply@github.com>2018-03-30 00:11:00 -0400
commit9d7f47746cdcb0eed3cf41875d06a8ef238eef1c (patch)
tree997658454de40db3f8b76b68d658efaf2b686188 /sway/server.c
parentMerge pull request #1654 from acrisci/refactor-2-electric-boogaloo (diff)
parentMerge remote-tracking branch 'origin/wlroots' into swaybar-layers (diff)
downloadsway-9d7f47746cdcb0eed3cf41875d06a8ef238eef1c.tar.gz
sway-9d7f47746cdcb0eed3cf41875d06a8ef238eef1c.tar.zst
sway-9d7f47746cdcb0eed3cf41875d06a8ef238eef1c.zip
Merge pull request #1648 from swaywm/swaybar-layers
Port swaybar to layer shell
Diffstat (limited to 'sway/server.c')
-rw-r--r--sway/server.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sway/server.c b/sway/server.c
index 92f72f13..75202df2 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -8,6 +8,8 @@
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_layer_shell.h> 10#include <wlr/types/wlr_layer_shell.h>
11#include <wlr/types/wlr_screenshooter.h>
12#include <wlr/types/wlr_gamma_control.h>
11#include <wlr/types/wlr_wl_shell.h> 13#include <wlr/types/wlr_wl_shell.h>
12// TODO WLR: make Xwayland optional 14// TODO WLR: make Xwayland optional
13#include <wlr/xwayland.h> 15#include <wlr/xwayland.h>
@@ -45,10 +47,12 @@ bool server_init(struct sway_server *server) {
45 47
46 server->compositor = wlr_compositor_create( 48 server->compositor = wlr_compositor_create(
47 server->wl_display, server->renderer); 49 server->wl_display, server->renderer);
48
49 server->data_device_manager = 50 server->data_device_manager =
50 wlr_data_device_manager_create(server->wl_display); 51 wlr_data_device_manager_create(server->wl_display);
51 52
53 wlr_screenshooter_create(server->wl_display);
54 wlr_gamma_control_manager_create(server->wl_display);
55
52 server->new_output.notify = handle_new_output; 56 server->new_output.notify = handle_new_output;
53 wl_signal_add(&server->backend->events.new_output, &server->new_output); 57 wl_signal_add(&server->backend->events.new_output, &server->new_output);
54 58