aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/rootston/desktop.h7
-rw-r--r--include/rootston/server.h2
-rw-r--r--include/rootston/view.h4
3 files changed, 11 insertions, 2 deletions
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 0d641848..aa74ad3e 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -34,14 +34,17 @@ struct roots_desktop {
struct wlr_compositor *compositor;
struct wlr_wl_shell *wl_shell;
struct wlr_xdg_shell_v6 *xdg_shell_v6;
- struct wlr_xwayland *xwayland;
struct wlr_gamma_control_manager *gamma_control_manager;
struct wl_listener output_add;
struct wl_listener output_remove;
struct wl_listener xdg_shell_v6_surface;
- struct wl_listener xwayland_surface;
struct wl_listener wl_shell_surface;
+
+#ifdef HAS_XWAYLAND
+ struct wlr_xwayland *xwayland;
+ struct wl_listener xwayland_surface;
+#endif
};
struct roots_server;
diff --git a/include/rootston/server.h b/include/rootston/server.h
index 15e3a4ee..a4eacb7f 100644
--- a/include/rootston/server.h
+++ b/include/rootston/server.h
@@ -5,7 +5,9 @@
#include <wlr/backend/session.h>
#include <wlr/types/wlr_data_device_manager.h>
#include <wlr/render.h>
+#ifdef HAS_XWAYLAND
#include <wlr/xwayland.h>
+#endif
#include "rootston/config.h"
#include "rootston/desktop.h"
#include "rootston/input.h"
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 39ff80db..2a90670e 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -49,12 +49,16 @@ struct roots_view {
union {
struct wlr_wl_shell_surface *wl_shell_surface;
struct wlr_xdg_surface_v6 *xdg_surface_v6;
+#ifdef HAS_XWAYLAND
struct wlr_xwayland_surface *xwayland_surface;
+#endif
};
union {
struct roots_wl_shell_surface *roots_wl_shell_surface;
struct roots_xdg_surface_v6 *roots_xdg_surface_v6;
+#ifdef HAS_XWAYLAND
struct roots_xwayland_surface *roots_xwayland_surface;
+#endif
};
struct wlr_surface *wlr_surface;
// TODO: This would probably be better as a field that's updated on a