diff options
author | emersion <contact@emersion.fr> | 2018-08-02 23:49:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-02 23:49:25 +0100 |
commit | 3a54e2291c017397ceff60511c29fe70d229bc8b (patch) | |
tree | d340b7776f945462f5ecffc830ada4d5fbe82f51 /sway/server.c | |
parent | Enable wlr-gamma-control-unstable-v1 (diff) | |
parent | Merge pull request #2411 from emersion/fullscreen-pointer-input (diff) | |
download | sway-3a54e2291c017397ceff60511c29fe70d229bc8b.tar.gz sway-3a54e2291c017397ceff60511c29fe70d229bc8b.tar.zst sway-3a54e2291c017397ceff60511c29fe70d229bc8b.zip |
Merge branch 'master' into wlr-gamma-control
Diffstat (limited to 'sway/server.c')
-rw-r--r-- | sway/server.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/server.c b/sway/server.c index 91ae7c97..e8755360 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -26,7 +26,10 @@ | |||
26 | #include "sway/input/input-manager.h" | 26 | #include "sway/input/input-manager.h" |
27 | #include "sway/server.h" | 27 | #include "sway/server.h" |
28 | #include "sway/tree/layout.h" | 28 | #include "sway/tree/layout.h" |
29 | #include "config.h" | ||
30 | #ifdef HAVE_XWAYLAND | ||
29 | #include "sway/xwayland.h" | 31 | #include "sway/xwayland.h" |
32 | #endif | ||
30 | 33 | ||
31 | bool server_privileged_prepare(struct sway_server *server) { | 34 | bool server_privileged_prepare(struct sway_server *server) { |
32 | wlr_log(WLR_DEBUG, "Preparing Wayland server initialization"); | 35 | wlr_log(WLR_DEBUG, "Preparing Wayland server initialization"); |
@@ -83,6 +86,7 @@ bool server_init(struct sway_server *server) { | |||
83 | server->xdg_shell_surface.notify = handle_xdg_shell_surface; | 86 | server->xdg_shell_surface.notify = handle_xdg_shell_surface; |
84 | 87 | ||
85 | // TODO make xwayland optional | 88 | // TODO make xwayland optional |
89 | #ifdef HAVE_XWAYLAND | ||
86 | server->xwayland.wlr_xwayland = | 90 | server->xwayland.wlr_xwayland = |
87 | wlr_xwayland_create(server->wl_display, server->compositor, true); | 91 | wlr_xwayland_create(server->wl_display, server->compositor, true); |
88 | wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface, | 92 | wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface, |
@@ -103,6 +107,7 @@ bool server_init(struct sway_server *server) { | |||
103 | image->width * 4, image->width, image->height, image->hotspot_x, | 107 | image->width * 4, image->width, image->height, image->hotspot_x, |
104 | image->hotspot_y); | 108 | image->hotspot_y); |
105 | } | 109 | } |
110 | #endif | ||
106 | 111 | ||
107 | // TODO: Integration with sway borders | 112 | // TODO: Integration with sway borders |
108 | struct wlr_server_decoration_manager *deco_manager = | 113 | struct wlr_server_decoration_manager *deco_manager = |