From 0b585795645f608093ae59199a71bf5be6790e3b Mon Sep 17 00:00:00 2001 From: emersion Date: Sat, 12 May 2018 13:04:47 +0100 Subject: Add support for discrete axis values --- include/backend/wayland.h | 1 + include/wlr/types/wlr_pointer.h | 1 + include/wlr/types/wlr_seat.h | 9 ++++++--- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/backend/wayland.h b/include/backend/wayland.h index fda27da9..46f18c84 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -72,6 +72,7 @@ struct wlr_wl_pointer { struct wlr_wl_input_device *input_device; struct wl_pointer *wl_pointer; enum wlr_axis_source axis_source; + int32_t axis_discrete; struct wlr_wl_output *output; struct wl_listener output_destroy; diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h index 45619e0a..48c89151 100644 --- a/include/wlr/types/wlr_pointer.h +++ b/include/wlr/types/wlr_pointer.h @@ -58,6 +58,7 @@ struct wlr_event_pointer_axis { enum wlr_axis_source source; enum wlr_axis_orientation orientation; double delta; + int32_t delta_discrete; }; #endif diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index e1fa27bb..ea5d532f 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -60,7 +60,8 @@ struct wlr_pointer_grab_interface { uint32_t (*button)(struct wlr_seat_pointer_grab *grab, uint32_t time, uint32_t button, uint32_t state); void (*axis)(struct wlr_seat_pointer_grab *grab, uint32_t time, - enum wlr_axis_orientation orientation, double value); + enum wlr_axis_orientation orientation, double value, + int32_t value_discrete); void (*cancel)(struct wlr_seat_pointer_grab *grab); }; @@ -300,7 +301,8 @@ uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time, * grabs. **/ void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time, - enum wlr_axis_orientation orientation, double value); + enum wlr_axis_orientation orientation, double value, + int32_t value_discrete); /** * Start a grab of the pointer of this seat. The grabber is responsible for @@ -341,7 +343,8 @@ uint32_t wlr_seat_pointer_notify_button(struct wlr_seat *wlr_seat, * Notify the seat of an axis event. */ void wlr_seat_pointer_notify_axis(struct wlr_seat *wlr_seat, uint32_t time, - enum wlr_axis_orientation orientation, double value); + enum wlr_axis_orientation orientation, double value, + int32_t value_discrete); /** * Whether or not the pointer has a grab other than the default grab. -- cgit v1.2.3