diff options
| author | emersion <[email protected]> | 2018-08-02 23:49:25 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-08-02 23:49:25 +0100 |
| commit | 3a54e2291c017397ceff60511c29fe70d229bc8b (patch) | |
| tree | d340b7776f945462f5ecffc830ada4d5fbe82f51 /sway/server.c | |
| parent | c35a34262f8da368f65d37f811a2264647e0dae6 (diff) | |
| parent | e07da5fc5c6ac5c186662b56b08ca71531119de0 (diff) | |
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 @@ #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"); @@ -83,6 +86,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, @@ -103,6 +107,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 = |