1 files changed, 143 insertions, 93 deletions

diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c
index 875426bf..0c6f7c5e 100644
--- a/sway/input/seatop_default.c
+++ b/sway/input/seatop_default.c
@@ -1,7 +1,7 @@
-#define _POSIX_C_SOURCE 200809L
 #include <float.h>
 #include <libevdev/libevdev.h>
 #include <wlr/types/wlr_cursor.h>
+#include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include "gesture.h"
@@ -9,7 +9,9 @@
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/input/tablet.h"
+#include "sway/layers.h"
 #include "sway/output.h"
+#include "sway/scene_descriptor.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
 #include "log.h"
@@ -53,6 +55,9 @@ static bool edge_is_external(struct sway_container *cont, enum wlr_edges edge) {
         while (cont) {
                 if (container_parent_layout(cont) == layout) {
                         list_t *siblings = container_get_siblings(cont);
+                        if (!siblings) {
+                                return false;
+                        }
                         int index = list_find(siblings, cont);
                         if (index > 0 && (edge == WLR_EDGE_LEFT || edge == WLR_EDGE_TOP)) {
                                 return false;
@@ -228,14 +233,15 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
         struct sway_container *cont = node && node->type == N_CONTAINER ?
                 node->sway_container : NULL;
 
-        if (wlr_surface_is_layer_surface(surface)) {
+        struct wlr_layer_surface_v1 *layer;
+#if HAVE_XWAYLAND
+        struct wlr_xwayland_surface *xsurface;
+#endif
+        if ((layer = wlr_layer_surface_v1_try_from_wlr_surface(surface)) &&
+                        layer->current.keyboard_interactive) {
                 // Handle tapping a layer surface
-                struct wlr_layer_surface_v1 *layer =
-                                wlr_layer_surface_v1_from_wlr_surface(surface);
-                if (layer->current.keyboard_interactive) {
-                        seat_set_focus_layer(seat, layer);
-                        transaction_commit_dirty();
-                }
+                seat_set_focus_layer(seat, layer);
+                transaction_commit_dirty();
         } else if (cont) {
                 bool is_floating_or_child = container_is_floating_or_child(cont);
                 bool is_fullscreen_or_child = container_is_fullscreen_or_child(cont);
@@ -260,20 +266,17 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
 
                 // Handle tapping on a container surface
                 seat_set_focus_container(seat, cont);
-                seatop_begin_down(seat, node->sway_container, time_msec, sx, sy);
+                seatop_begin_down(seat, node->sway_container, sx, sy);
         }
 #if HAVE_XWAYLAND
         // Handle tapping on an xwayland unmanaged view
-        else if (wlr_surface_is_xwayland_surface(surface)) {
-                struct wlr_xwayland_surface *xsurface =
-                                wlr_xwayland_surface_from_wlr_surface(surface);
-                if (xsurface->override_redirect &&
-                                wlr_xwayland_or_surface_wants_focus(xsurface)) {
-                        struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
-                        wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
-                        seat_set_focus_surface(seat, xsurface->surface, false);
-                        transaction_commit_dirty();
-                }
+        else if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(surface)) &&
+                        xsurface->override_redirect &&
+                        wlr_xwayland_or_surface_wants_focus(xsurface)) {
+                struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
+                wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
+                seat_set_focus_surface(seat, xsurface->surface, false);
+                transaction_commit_dirty();
         }
 #endif
 
@@ -287,7 +290,7 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
 
 static bool trigger_pointer_button_binding(struct sway_seat *seat,
                 struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state, uint32_t modifiers,
+                enum wl_pointer_button_state state, uint32_t modifiers,
                 bool on_titlebar, bool on_border, bool on_contents, bool on_workspace) {
         // We can reach this for non-pointer devices if we're currently emulating
         // pointer input for one. Emulated input should not trigger bindings. The
@@ -301,7 +304,7 @@ static bool trigger_pointer_button_binding(struct sway_seat *seat,
         char *device_identifier = device ? input_device_get_identifier(device)
                 : strdup("*");
         struct sway_binding *binding = NULL;
-        if (state == WLR_BUTTON_PRESSED) {
+        if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
                 state_add_button(e, button);
                 binding = get_active_mouse_binding(e,
                         config->current_mode->mouse_bindings, modifiers, false,
@@ -326,7 +329,7 @@ static bool trigger_pointer_button_binding(struct sway_seat *seat,
 
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
         struct sway_cursor *cursor = seat->cursor;
 
         // Determine what's under the cursor
@@ -359,7 +362,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 
         // Handle clicking an empty workspace
         if (node && node->type == N_WORKSPACE) {
-                if (state == WLR_BUTTON_PRESSED) {
+                if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
                         seat_set_focus(seat, node);
                         transaction_commit_dirty();
                 }
@@ -367,16 +370,15 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 return;
         }
 
-        // Handle clicking a layer surface
-        if (surface && wlr_surface_is_layer_surface(surface)) {
-                struct wlr_layer_surface_v1 *layer =
-                        wlr_layer_surface_v1_from_wlr_surface(surface);
+        // Handle clicking a layer surface and its popups/subsurfaces
+        struct wlr_layer_surface_v1 *layer = NULL;
+        if ((layer = toplevel_layer_surface_from_surface(surface))) {
                 if (layer->current.keyboard_interactive) {
                         seat_set_focus_layer(seat, layer);
                         transaction_commit_dirty();
                 }
-                if (state == WLR_BUTTON_PRESSED) {
-                        seatop_begin_down_on_surface(seat, surface, time_msec, sx, sy);
+                if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
+                        seatop_begin_down_on_surface(seat, surface, sx, sy);
                 }
                 seat_pointer_notify_button(seat, time_msec, button, state);
                 return;
@@ -384,7 +386,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 
         // Handle tiling resize via border
         if (cont && resize_edge && button == BTN_LEFT &&
-                        state == WLR_BUTTON_PRESSED && !is_floating) {
+                        state == WL_POINTER_BUTTON_STATE_PRESSED && !is_floating) {
                 // If a resize is triggered on a tabbed or stacked container, change
                 // focus to the tab which already had inactive focus -- otherwise, we'd
                 // change the active tab when the user probably just wanted to resize.
@@ -402,7 +404,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
         // Handle tiling resize via mod
         bool mod_pressed = modifiers & config->floating_mod;
         if (cont && !is_floating_or_child && mod_pressed &&
-                        state == WLR_BUTTON_PRESSED) {
+                        state == WL_POINTER_BUTTON_STATE_PRESSED) {
                 uint32_t btn_resize = config->floating_mod_inverse ?
                         BTN_LEFT : BTN_RIGHT;
                 if (button == btn_resize) {
@@ -429,13 +431,31 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 }
         }
 
+        // Handle changing focus when clicking on a container
+        if (cont && state == WL_POINTER_BUTTON_STATE_PRESSED) {
+                // Default case: focus the container that was just clicked.
+                node = &cont->node;
+
+                // If the container is a tab/stacked container and the click happened
+                // on a tab, switch to the tab. If the tab contents were already
+                // focused, focus the tab container itself. If the tab container was
+                // already focused, cycle back to focusing the tab contents.
+                if (on_titlebar) {
+                        struct sway_container *focus = seat_get_focused_container(seat);
+                        if (focus == cont || !container_has_ancestor(focus, cont)) {
+                                node = seat_get_focus_inactive(seat, &cont->node);
+                        }
+                }
+
+                seat_set_focus(seat, node);
+                transaction_commit_dirty();
+        }
+
         // Handle beginning floating move
         if (cont && is_floating_or_child && !is_fullscreen_or_child &&
-                        state == WLR_BUTTON_PRESSED) {
+                        state == WL_POINTER_BUTTON_STATE_PRESSED) {
                 uint32_t btn_move = config->floating_mod_inverse ? BTN_RIGHT : BTN_LEFT;
                 if (button == btn_move && (mod_pressed || on_titlebar)) {
-                        seat_set_focus_container(seat,
-                                        seat_get_focus_inactive_view(seat, &cont->node));
                         seatop_begin_move_floating(seat, container_toplevel_ancestor(cont));
                         return;
                 }
@@ -443,9 +463,10 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 
         // Handle beginning floating resize
         if (cont && is_floating_or_child && !is_fullscreen_or_child &&
-                        state == WLR_BUTTON_PRESSED) {
+                        state == WL_POINTER_BUTTON_STATE_PRESSED) {
                 // Via border
                 if (button == BTN_LEFT && resize_edge != WLR_EDGE_NONE) {
+                        seat_set_focus_container(seat, cont);
                         seatop_begin_resize_floating(seat, cont, resize_edge);
                         return;
                 }
@@ -460,6 +481,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                                 WLR_EDGE_RIGHT : WLR_EDGE_LEFT;
                         edge |= cursor->cursor->y > floater->pending.y + floater->pending.height / 2 ?
                                 WLR_EDGE_BOTTOM : WLR_EDGE_TOP;
+                        seat_set_focus_container(seat, floater);
                         seatop_begin_resize_floating(seat, floater, edge);
                         return;
                 }
@@ -467,55 +489,43 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 
         // Handle moving a tiling container
         if (config->tiling_drag && (mod_pressed || on_titlebar) &&
-                        state == WLR_BUTTON_PRESSED && !is_floating_or_child &&
+                        state == WL_POINTER_BUTTON_STATE_PRESSED && !is_floating_or_child &&
                         cont && cont->pending.fullscreen_mode == FULLSCREEN_NONE) {
-                struct sway_container *focus = seat_get_focused_container(seat);
-                bool focused = focus == cont || container_has_ancestor(focus, cont);
-                if (on_titlebar && !focused) {
-                        node = seat_get_focus_inactive(seat, &cont->node);
-                        seat_set_focus(seat, node);
-                }
-
                 // If moving a container by its title bar, use a threshold for the drag
                 if (!mod_pressed && config->tiling_drag_threshold > 0) {
                         seatop_begin_move_tiling_threshold(seat, cont);
                 } else {
                         seatop_begin_move_tiling(seat, cont);
                 }
+
                 return;
         }
 
         // Handle mousedown on a container surface
-        if (surface && cont && state == WLR_BUTTON_PRESSED) {
-                seat_set_focus_container(seat, cont);
-                seatop_begin_down(seat, cont, time_msec, sx, sy);
-                seat_pointer_notify_button(seat, time_msec, button, WLR_BUTTON_PRESSED);
+        if (surface && cont && state == WL_POINTER_BUTTON_STATE_PRESSED) {
+                seatop_begin_down(seat, cont, sx, sy);
+                seat_pointer_notify_button(seat, time_msec, button, WL_POINTER_BUTTON_STATE_PRESSED);
                 return;
         }
 
         // Handle clicking a container surface or decorations
-        if (cont && state == WLR_BUTTON_PRESSED) {
-                node = seat_get_focus_inactive(seat, &cont->node);
-                seat_set_focus(seat, node);
-                transaction_commit_dirty();
+        if (cont && state == WL_POINTER_BUTTON_STATE_PRESSED) {
                 seat_pointer_notify_button(seat, time_msec, button, state);
                 return;
         }
 
 #if HAVE_XWAYLAND
         // Handle clicking on xwayland unmanaged view
-        if (surface && wlr_surface_is_xwayland_surface(surface)) {
-                struct wlr_xwayland_surface *xsurface =
-                        wlr_xwayland_surface_from_wlr_surface(surface);
-                if (xsurface->override_redirect &&
-                                wlr_xwayland_or_surface_wants_focus(xsurface)) {
-                        struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
-                        wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
-                        seat_set_focus_surface(seat, xsurface->surface, false);
-                        transaction_commit_dirty();
-                        seat_pointer_notify_button(seat, time_msec, button, state);
-                        return;
-                }
+        struct wlr_xwayland_surface *xsurface;
+        if (surface &&
+                        (xsurface = wlr_xwayland_surface_try_from_wlr_surface(surface)) &&
+                        xsurface->override_redirect &&
+                        wlr_xwayland_or_surface_wants_focus(xsurface)) {
+                struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
+                wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
+                seat_set_focus_surface(seat, xsurface->surface, false);
+                transaction_commit_dirty();
+                seat_pointer_notify_button(seat, time_msec, button, state);
         }
 #endif
 
@@ -538,6 +548,21 @@ static void check_focus_follows_mouse(struct sway_seat *seat,
                 if (wlr_output == NULL) {
                         return;
                 }
+
+                struct wlr_surface *surface = NULL;
+                double sx, sy;
+                node_at_coords(seat, seat->cursor->cursor->x, seat->cursor->cursor->y,
+                                &surface, &sx, &sy);
+
+                // Focus topmost layer surface
+                struct wlr_layer_surface_v1 *layer = NULL;
+                if ((layer = toplevel_layer_surface_from_surface(surface)) &&
+                                layer->current.keyboard_interactive) {
+                        seat_set_focus_layer(seat, layer);
+                        transaction_commit_dirty();
+                        return;
+                }
+
                 struct sway_output *hovered_output = wlr_output->data;
                 if (focus && hovered_output != node_get_output(focus)) {
                         struct sway_workspace *ws = output_get_active_workspace(hovered_output);
@@ -598,12 +623,7 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
                 wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
         }
 
-        struct sway_drag_icon *drag_icon;
-        wl_list_for_each(drag_icon, &root->drag_icons, link) {
-                if (drag_icon->seat == seat) {
-                        drag_icon_update_position(drag_icon);
-                }
-        }
+        drag_icons_update_position(seat);
 
         e->previous_node = node;
 }
@@ -633,25 +653,50 @@ static void handle_tablet_tool_motion(struct sway_seat *seat,
                 wlr_tablet_v2_tablet_tool_notify_proximity_out(tool->tablet_v2_tool);
         }
 
-        struct sway_drag_icon *drag_icon;
-        wl_list_for_each(drag_icon, &root->drag_icons, link) {
-                if (drag_icon->seat == seat) {
-                        drag_icon_update_position(drag_icon);
-                }
-        }
+        drag_icons_update_position(seat);
 
         e->previous_node = node;
 }
 
+static void handle_touch_down(struct sway_seat *seat,
+                struct wlr_touch_down_event *event, double lx, double ly) {
+        struct wlr_surface *surface = NULL;
+        struct wlr_seat *wlr_seat = seat->wlr_seat;
+        struct sway_cursor *cursor = seat->cursor;
+        double sx, sy;
+        node_at_coords(seat, seat->touch_x, seat->touch_y, &surface, &sx, &sy);
+
+        if (surface && wlr_surface_accepts_touch(wlr_seat, surface)) {
+                if (seat_is_input_allowed(seat, surface)) {
+                        cursor->simulating_pointer_from_touch = false;
+                        seatop_begin_touch_down(seat, surface, event, sx, sy, lx, ly);
+                }
+        } else if (!cursor->simulating_pointer_from_touch &&
+                        (!surface || seat_is_input_allowed(seat, surface))) {
+                // Fallback to cursor simulation.
+                // The pointer_touch_id state is needed, so drags are not aborted when over
+                // a surface supporting touch and multi touch events don't interfere.
+                cursor->simulating_pointer_from_touch = true;
+                cursor->pointer_touch_id = seat->touch_id;
+                double dx, dy;
+                dx = seat->touch_x - cursor->cursor->x;
+                dy = seat->touch_y - cursor->cursor->y;
+                pointer_motion(cursor, event->time_msec, &event->touch->base, dx, dy,
+                                dx, dy);
+                dispatch_cursor_button(cursor, &event->touch->base, event->time_msec,
+                                BTN_LEFT, WL_POINTER_BUTTON_STATE_PRESSED);
+        }
+}
+
 /*----------------------------------------\
  * Functions used by handle_pointer_axis  /
  *--------------------------------------*/
 
 static uint32_t wl_axis_to_button(struct wlr_pointer_axis_event *event) {
         switch (event->orientation) {
-        case WLR_AXIS_ORIENTATION_VERTICAL:
+        case WL_POINTER_AXIS_VERTICAL_SCROLL:
                 return event->delta < 0 ? SWAY_SCROLL_UP : SWAY_SCROLL_DOWN;
-        case WLR_AXIS_ORIENTATION_HORIZONTAL:
+        case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
                 return event->delta < 0 ? SWAY_SCROLL_LEFT : SWAY_SCROLL_RIGHT;
         default:
                 sway_log(SWAY_DEBUG, "Unknown axis orientation");
@@ -708,6 +753,7 @@ static void handle_pointer_axis(struct sway_seat *seat,
 
         // Scrolling on a tabbed or stacked title bar (handled as press event)
         if (!handled && (on_titlebar || on_titlebar_border)) {
+                struct sway_node *new_focus;
                 enum sway_container_layout layout = container_parent_layout(cont);
                 if (layout == L_TABBED || layout == L_STACKED) {
                         struct sway_node *tabcontainer = node_get_parent(node);
@@ -715,7 +761,7 @@ static void handle_pointer_axis(struct sway_seat *seat,
                                 seat_get_active_tiling_child(seat, tabcontainer);
                         list_t *siblings = container_get_siblings(cont);
                         int desired = list_find(siblings, active->sway_container) +
-                                round(scroll_factor * event->delta_discrete / WLR_POINTER_AXIS_DISCRETE_STEP);
+                                roundf(scroll_factor * event->delta_discrete / WLR_POINTER_AXIS_DISCRETE_STEP);
                         if (desired < 0) {
                                 desired = 0;
                         } else if (desired >= siblings->length) {
@@ -724,14 +770,16 @@ static void handle_pointer_axis(struct sway_seat *seat,
 
                         struct sway_container *new_sibling_con = siblings->items[desired];
                         struct sway_node *new_sibling = &new_sibling_con->node;
-                        struct sway_node *new_focus =
-                                seat_get_focus_inactive(seat, new_sibling);
                         // Use the focused child of the tabbed/stacked container, not the
                         // container the user scrolled on.
-                        seat_set_focus(seat, new_focus);
-                        transaction_commit_dirty();
-                        handled = true;
+                        new_focus = seat_get_focus_inactive(seat, new_sibling);
+                } else {
+                        new_focus = seat_get_focus_inactive(seat, &cont->node);
                 }
+
+                seat_set_focus(seat, new_focus);
+                transaction_commit_dirty();
+                handled = true;
         }
 
         // Handle mouse bindings - x11 mouse buttons 4-7 - release event
@@ -747,8 +795,9 @@ static void handle_pointer_axis(struct sway_seat *seat,
 
         if (!handled) {
                 wlr_seat_pointer_notify_axis(cursor->seat->wlr_seat, event->time_msec,
-                        event->orientation, scroll_factor * event->delta,
-                        round(scroll_factor * event->delta_discrete), event->source);
+                        event->orientation, scroll_factor * event->delta, 
+                        roundf(scroll_factor * event->delta_discrete), event->source,
+                        event->relative_direction);
         }
 }
 
@@ -894,7 +943,7 @@ static void handle_hold_begin(struct sway_seat *seat,
                 // ... otherwise forward to client
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_hold_begin(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->fingers);
         }
 }
@@ -906,7 +955,7 @@ static void handle_hold_end(struct sway_seat *seat,
         if (!gesture_tracker_check(&seatop->gestures, GESTURE_TYPE_HOLD)) {
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_hold_end(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->cancelled);
                 return;
         }
@@ -939,7 +988,7 @@ static void handle_pinch_begin(struct sway_seat *seat,
                 // ... otherwise forward to client
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_pinch_begin(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->fingers);
         }
 }
@@ -955,7 +1004,7 @@ static void handle_pinch_update(struct sway_seat *seat,
                 // ... otherwise forward to client
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_pinch_update(
-                        cursor->pointer_gestures,
+                        server.input->pointer_gestures,
                         cursor->seat->wlr_seat,
                         event->time_msec, event->dx, event->dy,
                         event->scale, event->rotation);
@@ -969,7 +1018,7 @@ static void handle_pinch_end(struct sway_seat *seat,
         if (!gesture_tracker_check(&seatop->gestures, GESTURE_TYPE_PINCH)) {
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_pinch_end(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->cancelled);
                 return;
         }
@@ -1002,7 +1051,7 @@ static void handle_swipe_begin(struct sway_seat *seat,
                 // ... otherwise forward to client
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_swipe_begin(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->fingers);
         }
 }
@@ -1019,7 +1068,7 @@ static void handle_swipe_update(struct sway_seat *seat,
                 // ... otherwise forward to client
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_swipe_update(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->dx, event->dy);
         }
 }
@@ -1030,7 +1079,7 @@ static void handle_swipe_end(struct sway_seat *seat,
         struct seatop_default_event *seatop = seat->seatop_data;
         if (!gesture_tracker_check(&seatop->gestures, GESTURE_TYPE_SWIPE)) {
                 struct sway_cursor *cursor = seat->cursor;
-                wlr_pointer_gestures_v1_send_swipe_end(cursor->pointer_gestures,
+                wlr_pointer_gestures_v1_send_swipe_end(server.input->pointer_gestures,
                         cursor->seat->wlr_seat, event->time_msec, event->cancelled);
                 return;
         }
@@ -1087,6 +1136,7 @@ static const struct sway_seatop_impl seatop_impl = {
         .swipe_begin = handle_swipe_begin,
         .swipe_update = handle_swipe_update,
         .swipe_end = handle_swipe_end,
+        .touch_down = handle_touch_down,
         .rebase = handle_rebase,
         .allow_set_cursor = true,
 };