diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-07-25 08:27:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 08:27:40 -0400 |
| commit | fc718f629af231f8a0ae795b2f7529e213cab183 (patch) | |
| tree | 7917aadbfb09d02d3d60045f0ba8d5028f0c4bb4 /sway/server.c | |
| parent | fd1e2c172c12b5c5a3adac8e6de4009697bd7567 (diff) | |
| parent | 384c55c0b465d6b9a9c4cb88d8752435ac5cf708 (diff) | |
Merge pull request #2350 from ppascher/xwayland-optional
Added meson option to allow building sway without xwayland support
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 89dfbf8c..10ca9614 100644 --- a/sway/server.c +++ b/sway/server.c @@ -25,7 +25,10 @@ #include "sway/input/input-manager.h" #include "sway/server.h" #include "sway/tree/layout.h" +#include "config.h" +#ifdef HAVE_XWAYLAND #include "sway/xwayland.h" +#endif bool server_privileged_prepare(struct sway_server *server) { wlr_log(WLR_DEBUG, "Preparing Wayland server initialization"); @@ -81,6 +84,7 @@ bool server_init(struct sway_server *server) { server->xdg_shell_surface.notify = handle_xdg_shell_surface; // TODO make xwayland optional +#ifdef HAVE_XWAYLAND server->xwayland.wlr_xwayland = wlr_xwayland_create(server->wl_display, server->compositor, true); wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface, @@ -101,6 +105,7 @@ bool server_init(struct sway_server *server) { image->width * 4, image->width, image->height, image->hotspot_x, image->hotspot_y); } +#endif // TODO: Integration with sway borders struct wlr_server_decoration_manager *deco_manager = |