diff options
Diffstat (limited to 'include/sway/input')
-rw-r--r-- | include/sway/input/cursor.h | 2 | ||||
-rw-r--r-- | include/sway/input/libinput.h | 2 | ||||
-rw-r--r-- | include/sway/input/seat.h | 5 | ||||
-rw-r--r-- | include/sway/input/text_input.h | 3 |
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 { | |||
52 | struct wl_listener touch_down; | 52 | struct wl_listener touch_down; |
53 | struct wl_listener touch_up; | 53 | struct wl_listener touch_up; |
54 | struct wl_listener touch_motion; | 54 | struct wl_listener touch_motion; |
55 | struct wl_listener touch_frame; | ||
55 | bool simulating_pointer_from_touch; | 56 | bool simulating_pointer_from_touch; |
57 | bool pointer_touch_up; | ||
56 | int32_t pointer_touch_id; | 58 | int32_t pointer_touch_id; |
57 | 59 | ||
58 | struct wl_listener tool_axis; | 60 | 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); | |||
6 | 6 | ||
7 | void sway_input_reset_libinput_device(struct sway_input_device *device); | 7 | void sway_input_reset_libinput_device(struct sway_input_device *device); |
8 | 8 | ||
9 | bool sway_libinput_device_is_builtin(struct sway_input_device *device); | ||
10 | |||
9 | #endif | 11 | #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, | |||
239 | void seatop_begin_default(struct sway_seat *seat); | 239 | void seatop_begin_default(struct sway_seat *seat); |
240 | 240 | ||
241 | void seatop_begin_down(struct sway_seat *seat, struct sway_container *con, | 241 | void seatop_begin_down(struct sway_seat *seat, struct sway_container *con, |
242 | uint32_t time_msec, int sx, int sy); | 242 | uint32_t time_msec, double sx, double sy); |
243 | |||
244 | void seatop_begin_down_on_surface(struct sway_seat *seat, | ||
245 | struct wlr_surface *surface, uint32_t time_msec, double sx, double sy); | ||
243 | 246 | ||
244 | void seatop_begin_move_floating(struct sway_seat *seat, | 247 | void seatop_begin_move_floating(struct sway_seat *seat, |
245 | struct sway_container *con); | 248 | 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 { | |||
28 | 28 | ||
29 | struct wl_listener input_method_new; | 29 | struct wl_listener input_method_new; |
30 | struct wl_listener input_method_commit; | 30 | struct wl_listener input_method_commit; |
31 | struct wl_listener input_method_grab_keyboard; | ||
31 | struct wl_listener input_method_destroy; | 32 | struct wl_listener input_method_destroy; |
33 | |||
34 | struct wl_listener input_method_keyboard_grab_destroy; | ||
32 | }; | 35 | }; |
33 | 36 | ||
34 | struct sway_text_input { | 37 | struct sway_text_input { |