Add support for discrete axis values

This commit is contained in:
emersion 2018-05-12 13:04:47 +01:00
parent 84609d347a
commit 0b58579564
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
12 changed files with 58 additions and 22 deletions

View file

@ -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;

View file

@ -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

View file

@ -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.