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 /include/sway/server.h | |
| 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 'include/sway/server.h')
| -rw-r--r-- | include/sway/server.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 70bde6d4..a3782f91 100644 --- a/include/sway/server.h +++ b/include/sway/server.h @@ -12,7 +12,10 @@ #include <wlr/render/wlr_renderer.h> // TODO WLR: make Xwayland optional #include "list.h" +#include "config.h" +#ifdef HAVE_XWAYLAND #include "sway/xwayland.h" +#endif struct sway_server { struct wl_display *wl_display; @@ -39,11 +42,11 @@ struct sway_server { struct wlr_xdg_shell *xdg_shell; struct wl_listener xdg_shell_surface; - +#ifdef HAVE_XWAYLAND struct sway_xwayland xwayland; struct wl_listener xwayland_surface; struct wl_listener xwayland_ready; - +#endif bool debug_txn_timings; list_t *transactions; @@ -65,6 +68,7 @@ void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data); void handle_layer_shell_surface(struct wl_listener *listener, void *data); void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); void handle_xdg_shell_surface(struct wl_listener *listener, void *data); +#ifdef HAVE_XWAYLAND void handle_xwayland_surface(struct wl_listener *listener, void *data); - +#endif #endif |