diff options
Diffstat (limited to 'sway/server.c')
-rw-r--r-- | sway/server.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/server.c b/sway/server.c index 89dfbf8c..90f25dbc 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -25,7 +25,9 @@ | |||
25 | #include "sway/input/input-manager.h" | 25 | #include "sway/input/input-manager.h" |
26 | #include "sway/server.h" | 26 | #include "sway/server.h" |
27 | #include "sway/tree/layout.h" | 27 | #include "sway/tree/layout.h" |
28 | #ifdef HAVE_XWAYLAND | ||
28 | #include "sway/xwayland.h" | 29 | #include "sway/xwayland.h" |
30 | #endif | ||
29 | 31 | ||
30 | bool server_privileged_prepare(struct sway_server *server) { | 32 | bool server_privileged_prepare(struct sway_server *server) { |
31 | wlr_log(WLR_DEBUG, "Preparing Wayland server initialization"); | 33 | wlr_log(WLR_DEBUG, "Preparing Wayland server initialization"); |
@@ -81,6 +83,7 @@ bool server_init(struct sway_server *server) { | |||
81 | server->xdg_shell_surface.notify = handle_xdg_shell_surface; | 83 | server->xdg_shell_surface.notify = handle_xdg_shell_surface; |
82 | 84 | ||
83 | // TODO make xwayland optional | 85 | // TODO make xwayland optional |
86 | #ifdef HAVE_XWAYLAND | ||
84 | server->xwayland.wlr_xwayland = | 87 | server->xwayland.wlr_xwayland = |
85 | wlr_xwayland_create(server->wl_display, server->compositor, true); | 88 | wlr_xwayland_create(server->wl_display, server->compositor, true); |
86 | wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface, | 89 | wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface, |
@@ -101,6 +104,7 @@ bool server_init(struct sway_server *server) { | |||
101 | image->width * 4, image->width, image->height, image->hotspot_x, | 104 | image->width * 4, image->width, image->height, image->hotspot_x, |
102 | image->hotspot_y); | 105 | image->hotspot_y); |
103 | } | 106 | } |
107 | #endif | ||
104 | 108 | ||
105 | // TODO: Integration with sway borders | 109 | // TODO: Integration with sway borders |
106 | struct wlr_server_decoration_manager *deco_manager = | 110 | struct wlr_server_decoration_manager *deco_manager = |