diff options
author | Pascal Pascher <aur@clouddrop.de> | 2018-07-24 22:16:06 +0200 |
---|---|---|
committer | Pascal Pascher <aur@clouddrop.de> | 2018-07-24 22:16:06 +0200 |
commit | 24ad1c3983192b47345566fd876e26b45160d68e (patch) | |
tree | b617f8d15cb20897b1c016fb67fab80d7245c66a /include/sway/server.h | |
parent | Merge pull request #2165 from swaywm/pid-workspaces (diff) | |
download | sway-24ad1c3983192b47345566fd876e26b45160d68e.tar.gz sway-24ad1c3983192b47345566fd876e26b45160d68e.tar.zst sway-24ad1c3983192b47345566fd876e26b45160d68e.zip |
Added meson option "enable_xwayland" (default: true) to enable/disable xwayland support
Diffstat (limited to 'include/sway/server.h')
-rw-r--r-- | include/sway/server.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 70bde6d4..fb22125f 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -12,7 +12,9 @@ | |||
12 | #include <wlr/render/wlr_renderer.h> | 12 | #include <wlr/render/wlr_renderer.h> |
13 | // TODO WLR: make Xwayland optional | 13 | // TODO WLR: make Xwayland optional |
14 | #include "list.h" | 14 | #include "list.h" |
15 | #ifdef HAVE_XWAYLAND | ||
15 | #include "sway/xwayland.h" | 16 | #include "sway/xwayland.h" |
17 | #endif | ||
16 | 18 | ||
17 | struct sway_server { | 19 | struct sway_server { |
18 | struct wl_display *wl_display; | 20 | struct wl_display *wl_display; |
@@ -39,11 +41,11 @@ struct sway_server { | |||
39 | 41 | ||
40 | struct wlr_xdg_shell *xdg_shell; | 42 | struct wlr_xdg_shell *xdg_shell; |
41 | struct wl_listener xdg_shell_surface; | 43 | struct wl_listener xdg_shell_surface; |
42 | 44 | #ifdef HAVE_XWAYLAND | |
43 | struct sway_xwayland xwayland; | 45 | struct sway_xwayland xwayland; |
44 | struct wl_listener xwayland_surface; | 46 | struct wl_listener xwayland_surface; |
45 | struct wl_listener xwayland_ready; | 47 | struct wl_listener xwayland_ready; |
46 | 48 | #endif | |
47 | bool debug_txn_timings; | 49 | bool debug_txn_timings; |
48 | 50 | ||
49 | list_t *transactions; | 51 | list_t *transactions; |
@@ -65,6 +67,7 @@ void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data); | |||
65 | void handle_layer_shell_surface(struct wl_listener *listener, void *data); | 67 | void handle_layer_shell_surface(struct wl_listener *listener, void *data); |
66 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); | 68 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); |
67 | void handle_xdg_shell_surface(struct wl_listener *listener, void *data); | 69 | void handle_xdg_shell_surface(struct wl_listener *listener, void *data); |
70 | #ifdef HAVE_XWAYLAND | ||
68 | void handle_xwayland_surface(struct wl_listener *listener, void *data); | 71 | void handle_xwayland_surface(struct wl_listener *listener, void *data); |
69 | 72 | #endif | |
70 | #endif | 73 | #endif |