4 files changed, 11 insertions, 1 deletions

diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 6a38190b..7d66e699 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -52,7 +52,9 @@ struct sway_cursor {
         struct wl_listener touch_down;
         struct wl_listener touch_up;
         struct wl_listener touch_motion;
+        struct wl_listener touch_frame;
         bool simulating_pointer_from_touch;
+        bool pointer_touch_up;
         int32_t pointer_touch_id;
 
         struct wl_listener tool_axis;
diff --git a/include/sway/input/libinput.h b/include/sway/input/libinput.h
index de019976..890d632e 100644
--- a/include/sway/input/libinput.h
+++ b/include/sway/input/libinput.h
@@ -6,4 +6,6 @@ void sway_input_configure_libinput_device(struct sway_input_device *device);
 
 void sway_input_reset_libinput_device(struct sway_input_device *device);
 
+bool sway_libinput_device_is_builtin(struct sway_input_device *device);
+
 #endif
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 4118df66..77c2278d 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -239,7 +239,10 @@ enum wlr_edges find_resize_edge(struct sway_container *cont,
 void seatop_begin_default(struct sway_seat *seat);
 
 void seatop_begin_down(struct sway_seat *seat, struct sway_container *con,
-                uint32_t time_msec, int sx, int sy);
+                uint32_t time_msec, double sx, double sy);
+
+void seatop_begin_down_on_surface(struct sway_seat *seat,
+                struct wlr_surface *surface, uint32_t time_msec, double sx, double sy);
 
 void seatop_begin_move_floating(struct sway_seat *seat,
                 struct sway_container *con);
diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h
index 6cf9bdb3..37744266 100644
--- a/include/sway/input/text_input.h
+++ b/include/sway/input/text_input.h
@@ -28,7 +28,10 @@ struct sway_input_method_relay {
 
         struct wl_listener input_method_new;
         struct wl_listener input_method_commit;
+        struct wl_listener input_method_grab_keyboard;
         struct wl_listener input_method_destroy;
+
+        struct wl_listener input_method_keyboard_grab_destroy;
 };
 
 struct sway_text_input {