diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/input/cursor.h | 4 | ||||
-rw-r--r-- | include/sway/input/seat.h | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index 828ac370..4a3774d9 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h | |||
@@ -108,6 +108,10 @@ void cursor_unhide(struct sway_cursor *cursor); | |||
108 | int cursor_get_timeout(struct sway_cursor *cursor); | 108 | int cursor_get_timeout(struct sway_cursor *cursor); |
109 | void cursor_notify_key_press(struct sway_cursor *cursor); | 109 | void cursor_notify_key_press(struct sway_cursor *cursor); |
110 | 110 | ||
111 | void pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, | ||
112 | struct wlr_input_device *device, double dx, double dy, | ||
113 | double dx_unaccel, double dy_unaccel); | ||
114 | |||
111 | void dispatch_cursor_button(struct sway_cursor *cursor, | 115 | void dispatch_cursor_button(struct sway_cursor *cursor, |
112 | struct wlr_input_device *device, uint32_t time_msec, uint32_t button, | 116 | struct wlr_input_device *device, uint32_t time_msec, uint32_t button, |
113 | enum wlr_button_state state); | 117 | enum wlr_button_state state); |
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h index 4abe91f7..227da78b 100644 --- a/include/sway/input/seat.h +++ b/include/sway/input/seat.h | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h> | 4 | #include <wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h> |
5 | #include <wlr/types/wlr_layer_shell_v1.h> | 5 | #include <wlr/types/wlr_layer_shell_v1.h> |
6 | #include <wlr/types/wlr_seat.h> | 6 | #include <wlr/types/wlr_seat.h> |
7 | #include <wlr/types/wlr_touch.h> | ||
7 | #include <wlr/util/edges.h> | 8 | #include <wlr/util/edges.h> |
8 | #include "sway/config.h" | 9 | #include "sway/config.h" |
9 | #include "sway/input/input-manager.h" | 10 | #include "sway/input/input-manager.h" |
@@ -36,6 +37,12 @@ struct sway_seatop_impl { | |||
36 | void (*swipe_end)(struct sway_seat *seat, | 37 | void (*swipe_end)(struct sway_seat *seat, |
37 | struct wlr_pointer_swipe_end_event *event); | 38 | struct wlr_pointer_swipe_end_event *event); |
38 | void (*rebase)(struct sway_seat *seat, uint32_t time_msec); | 39 | void (*rebase)(struct sway_seat *seat, uint32_t time_msec); |
40 | void (*touch_motion)(struct sway_seat *seat, | ||
41 | struct wlr_touch_motion_event *event, double lx, double ly); | ||
42 | void (*touch_up)(struct sway_seat *seat, | ||
43 | struct wlr_touch_up_event *event); | ||
44 | void (*touch_down)(struct sway_seat *seat, | ||
45 | struct wlr_touch_down_event *event, double lx, double ly); | ||
39 | void (*tablet_tool_motion)(struct sway_seat *seat, | 46 | void (*tablet_tool_motion)(struct sway_seat *seat, |
40 | struct sway_tablet_tool *tool, uint32_t time_msec); | 47 | struct sway_tablet_tool *tool, uint32_t time_msec); |
41 | void (*tablet_tool_tip)(struct sway_seat *seat, struct sway_tablet_tool *tool, | 48 | void (*tablet_tool_tip)(struct sway_seat *seat, struct sway_tablet_tool *tool, |
@@ -256,10 +263,13 @@ enum wlr_edges find_resize_edge(struct sway_container *cont, | |||
256 | void seatop_begin_default(struct sway_seat *seat); | 263 | void seatop_begin_default(struct sway_seat *seat); |
257 | 264 | ||
258 | void seatop_begin_down(struct sway_seat *seat, struct sway_container *con, | 265 | void seatop_begin_down(struct sway_seat *seat, struct sway_container *con, |
259 | uint32_t time_msec, double sx, double sy); | 266 | double sx, double sy); |
260 | 267 | ||
261 | void seatop_begin_down_on_surface(struct sway_seat *seat, | 268 | void seatop_begin_down_on_surface(struct sway_seat *seat, |
262 | struct wlr_surface *surface, uint32_t time_msec, double sx, double sy); | 269 | struct wlr_surface *surface, double sx, double sy); |
270 | |||
271 | void seatop_begin_touch_down(struct sway_seat *seat, struct wlr_surface *surface, | ||
272 | struct wlr_touch_down_event *event, double sx, double sy, double lx, double ly); | ||
263 | 273 | ||
264 | void seatop_begin_move_floating(struct sway_seat *seat, | 274 | void seatop_begin_move_floating(struct sway_seat *seat, |
265 | struct sway_container *con); | 275 | struct sway_container *con); |
@@ -319,6 +329,15 @@ void seatop_swipe_update(struct sway_seat *seat, | |||
319 | void seatop_swipe_end(struct sway_seat *seat, | 329 | void seatop_swipe_end(struct sway_seat *seat, |
320 | struct wlr_pointer_swipe_end_event *event); | 330 | struct wlr_pointer_swipe_end_event *event); |
321 | 331 | ||
332 | void seatop_touch_motion(struct sway_seat *seat, | ||
333 | struct wlr_touch_motion_event *event, double lx, double ly); | ||
334 | |||
335 | void seatop_touch_up(struct sway_seat *seat, | ||
336 | struct wlr_touch_up_event *event); | ||
337 | |||
338 | void seatop_touch_down(struct sway_seat *seat, | ||
339 | struct wlr_touch_down_event *event, double lx, double ly); | ||
340 | |||
322 | void seatop_rebase(struct sway_seat *seat, uint32_t time_msec); | 341 | void seatop_rebase(struct sway_seat *seat, uint32_t time_msec); |
323 | 342 | ||
324 | /** | 343 | /** |