aboutsummaryrefslogtreecommitdiffstats
path: root/sway/server.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <RedSoxFan@users.noreply.github.com>2018-08-02 22:18:14 -0400
committerLibravatar GitHub <noreply@github.com>2018-08-02 22:18:14 -0400
commitb16043aeebd92cca12b21fa36b99799f80bdfc31 (patch)
tree745c117217c20dc05a447c5e34db1d35fec5b62b /sway/server.c
parentconfig.in: nag user on exit (diff)
parentMerge pull request #2325 from emersion/wlr-gamma-control (diff)
downloadsway-b16043aeebd92cca12b21fa36b99799f80bdfc31.tar.gz
sway-b16043aeebd92cca12b21fa36b99799f80bdfc31.tar.zst
sway-b16043aeebd92cca12b21fa36b99799f80bdfc31.zip
Merge branch 'master' into exit-nag
Diffstat (limited to 'sway/server.c')
-rw-r--r--sway/server.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sway/server.c b/sway/server.c
index 10ca9614..e8755360 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -9,6 +9,7 @@
9#include <wlr/types/wlr_compositor.h> 9#include <wlr/types/wlr_compositor.h>
10#include <wlr/types/wlr_export_dmabuf_v1.h> 10#include <wlr/types/wlr_export_dmabuf_v1.h>
11#include <wlr/types/wlr_gamma_control.h> 11#include <wlr/types/wlr_gamma_control.h>
12#include <wlr/types/wlr_gamma_control_v1.h>
12#include <wlr/types/wlr_idle.h> 13#include <wlr/types/wlr_idle.h>
13#include <wlr/types/wlr_layer_shell.h> 14#include <wlr/types/wlr_layer_shell.h>
14#include <wlr/types/wlr_linux_dmabuf_v1.h> 15#include <wlr/types/wlr_linux_dmabuf_v1.h>
@@ -56,6 +57,7 @@ bool server_init(struct sway_server *server) {
56 wlr_data_device_manager_create(server->wl_display); 57 wlr_data_device_manager_create(server->wl_display);
57 58
58 wlr_gamma_control_manager_create(server->wl_display); 59 wlr_gamma_control_manager_create(server->wl_display);
60 wlr_gamma_control_manager_v1_create(server->wl_display);
59 wlr_primary_selection_device_manager_create(server->wl_display); 61 wlr_primary_selection_device_manager_create(server->wl_display);
60 62
61 server->new_output.notify = handle_new_output; 63 server->new_output.notify = handle_new_output;