aboutsummaryrefslogtreecommitdiffstats
path: root/sway/server.c
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-11-23 12:07:46 +0100
committerLibravatar emersion <contact@emersion.fr>2018-11-23 12:07:46 +0100
commitcc28f9712efecf948cf1b565ccafe191e3ac6d7a (patch)
tree9ec60010003d42422807994136f431ecde30291c /sway/server.c
parentMerge pull request #3160 from camoz/master (diff)
downloadsway-cc28f9712efecf948cf1b565ccafe191e3ac6d7a.tar.gz
sway-cc28f9712efecf948cf1b565ccafe191e3ac6d7a.tar.zst
sway-cc28f9712efecf948cf1b565ccafe191e3ac6d7a.zip
Update for swaywm/wlroots#1387
Diffstat (limited to 'sway/server.c')
-rw-r--r--sway/server.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/server.c b/sway/server.c
index cd3fcdf6..b1d7d3fc 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -8,24 +8,24 @@
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_export_dmabuf_v1.h> 10#include <wlr/types/wlr_export_dmabuf_v1.h>
11#include <wlr/types/wlr_gamma_control.h>
12#include <wlr/types/wlr_gamma_control_v1.h> 11#include <wlr/types/wlr_gamma_control_v1.h>
12#include <wlr/types/wlr_gamma_control.h>
13#include <wlr/types/wlr_gtk_primary_selection.h>
13#include <wlr/types/wlr_idle.h> 14#include <wlr/types/wlr_idle.h>
14#include <wlr/types/wlr_layer_shell_v1.h> 15#include <wlr/types/wlr_layer_shell_v1.h>
15#include <wlr/types/wlr_primary_selection.h>
16#include <wlr/types/wlr_screencopy_v1.h> 16#include <wlr/types/wlr_screencopy_v1.h>
17#include <wlr/types/wlr_server_decoration.h> 17#include <wlr/types/wlr_server_decoration.h>
18#include <wlr/types/wlr_xcursor_manager.h> 18#include <wlr/types/wlr_xcursor_manager.h>
19#include <wlr/types/wlr_xdg_decoration_v1.h> 19#include <wlr/types/wlr_xdg_decoration_v1.h>
20#include <wlr/types/wlr_xdg_output_v1.h> 20#include <wlr/types/wlr_xdg_output_v1.h>
21#include <wlr/util/log.h> 21#include <wlr/util/log.h>
22#include "config.h"
22#include "list.h" 23#include "list.h"
23#include "sway/config.h" 24#include "sway/config.h"
24#include "sway/desktop/idle_inhibit_v1.h" 25#include "sway/desktop/idle_inhibit_v1.h"
25#include "sway/input/input-manager.h" 26#include "sway/input/input-manager.h"
26#include "sway/server.h" 27#include "sway/server.h"
27#include "sway/tree/root.h" 28#include "sway/tree/root.h"
28#include "config.h"
29#if HAVE_XWAYLAND 29#if HAVE_XWAYLAND
30#include "sway/xwayland.h" 30#include "sway/xwayland.h"
31#endif 31#endif
@@ -57,7 +57,7 @@ bool server_init(struct sway_server *server) {
57 57
58 wlr_gamma_control_manager_create(server->wl_display); 58 wlr_gamma_control_manager_create(server->wl_display);
59 wlr_gamma_control_manager_v1_create(server->wl_display); 59 wlr_gamma_control_manager_v1_create(server->wl_display);
60 wlr_primary_selection_device_manager_create(server->wl_display); 60 wlr_gtk_primary_selection_device_manager_create(server->wl_display);
61 61
62 server->new_output.notify = handle_new_output; 62 server->new_output.notify = handle_new_output;
63 wl_signal_add(&server->backend->events.new_output, &server->new_output); 63 wl_signal_add(&server->backend->events.new_output, &server->new_output);