Added meson option "enable_xwayland" (default: true) to enable/disable xwayland support

2 files changed, 4 insertions, 1 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 27597640..c873a20e 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -54,6 +54,7 @@ static struct sway_container *container_at_coords(
                 struct sway_seat *seat, double lx, double ly,
                 struct wlr_surface **surface, double *sx, double *sy) {
         // check for unmanaged views first
+  #ifdef HAVE_XWAYLAND
         struct wl_list *unmanaged = &root_container.sway_root->xwayland_unmanaged;
         struct sway_xwayland_unmanaged *unmanaged_surface;
         wl_list_for_each_reverse(unmanaged_surface, unmanaged, link) {
@@ -69,7 +70,7 @@ static struct sway_container *container_at_coords(
                         return NULL;
                 }
         }
-
+  #endif
         // find the output the cursor is on
         struct wlr_output_layout *output_layout =
                 root_container.sway_root->output_layout;
diff --git a/sway/input/seat.c b/sway/input/seat.c
index fc9e54b6..66d11eea 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -103,11 +103,13 @@ static void seat_send_focus(struct sway_container *con,
 
         if (con->type == C_VIEW
                         && seat_is_input_allowed(seat, con->sway_view->surface)) {
+    #ifdef HAVE_XWAYLAND
                 if (con->sway_view->type == SWAY_VIEW_XWAYLAND) {
                         struct wlr_xwayland *xwayland =
                                 seat->input->server->xwayland.wlr_xwayland;
                         wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
                 }
+    #endif
                 struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->wlr_seat);
                 if (keyboard) {
                         wlr_seat_keyboard_notify_enter(seat->wlr_seat,