diff options
Diffstat (limited to 'include/sway/input/cursor.h')
-rw-r--r-- | include/sway/input/cursor.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index 3a71a35f..527d0350 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h | |||
@@ -35,15 +35,14 @@ struct sway_cursor { | |||
35 | pixman_region32_t confine; // invalid if active_constraint == NULL | 35 | pixman_region32_t confine; // invalid if active_constraint == NULL |
36 | bool active_confine_requires_warp; | 36 | bool active_confine_requires_warp; |
37 | 37 | ||
38 | struct wlr_pointer_gestures_v1 *pointer_gestures; | 38 | struct wl_listener hold_begin; |
39 | struct wl_listener hold_end; | ||
39 | struct wl_listener pinch_begin; | 40 | struct wl_listener pinch_begin; |
40 | struct wl_listener pinch_update; | 41 | struct wl_listener pinch_update; |
41 | struct wl_listener pinch_end; | 42 | struct wl_listener pinch_end; |
42 | struct wl_listener swipe_begin; | 43 | struct wl_listener swipe_begin; |
43 | struct wl_listener swipe_update; | 44 | struct wl_listener swipe_update; |
44 | struct wl_listener swipe_end; | 45 | struct wl_listener swipe_end; |
45 | struct wl_listener hold_begin; | ||
46 | struct wl_listener hold_end; | ||
47 | 46 | ||
48 | struct wl_listener motion; | 47 | struct wl_listener motion; |
49 | struct wl_listener motion_absolute; | 48 | struct wl_listener motion_absolute; |
@@ -53,6 +52,7 @@ struct sway_cursor { | |||
53 | 52 | ||
54 | struct wl_listener touch_down; | 53 | struct wl_listener touch_down; |
55 | struct wl_listener touch_up; | 54 | struct wl_listener touch_up; |
55 | struct wl_listener touch_cancel; | ||
56 | struct wl_listener touch_motion; | 56 | struct wl_listener touch_motion; |
57 | struct wl_listener touch_frame; | 57 | struct wl_listener touch_frame; |
58 | bool simulating_pointer_from_touch; | 58 | bool simulating_pointer_from_touch; |
@@ -64,6 +64,7 @@ struct sway_cursor { | |||
64 | struct wl_listener tool_proximity; | 64 | struct wl_listener tool_proximity; |
65 | struct wl_listener tool_button; | 65 | struct wl_listener tool_button; |
66 | bool simulating_pointer_from_tool_tip; | 66 | bool simulating_pointer_from_tool_tip; |
67 | bool simulating_pointer_from_tool_button; | ||
67 | uint32_t tool_buttons; | 68 | uint32_t tool_buttons; |
68 | 69 | ||
69 | struct wl_listener request_set_cursor; | 70 | struct wl_listener request_set_cursor; |
@@ -107,9 +108,13 @@ void cursor_unhide(struct sway_cursor *cursor); | |||
107 | int cursor_get_timeout(struct sway_cursor *cursor); | 108 | int cursor_get_timeout(struct sway_cursor *cursor); |
108 | void cursor_notify_key_press(struct sway_cursor *cursor); | 109 | void cursor_notify_key_press(struct sway_cursor *cursor); |
109 | 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 | |||
110 | void dispatch_cursor_button(struct sway_cursor *cursor, | 115 | void dispatch_cursor_button(struct sway_cursor *cursor, |
111 | 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, |
112 | enum wlr_button_state state); | 117 | enum wl_pointer_button_state state); |
113 | 118 | ||
114 | void dispatch_cursor_axis(struct sway_cursor *cursor, | 119 | void dispatch_cursor_axis(struct sway_cursor *cursor, |
115 | struct wlr_pointer_axis_event *event); | 120 | struct wlr_pointer_axis_event *event); |
@@ -140,4 +145,6 @@ uint32_t get_mouse_button(const char *name, char **error); | |||
140 | 145 | ||
141 | const char *get_mouse_button_name(uint32_t button); | 146 | const char *get_mouse_button_name(uint32_t button); |
142 | 147 | ||
148 | void handle_request_set_cursor_shape(struct wl_listener *listener, void *data); | ||
149 | |||
143 | #endif | 150 | #endif |