From db84379242cea0283d4031be90dd80a34dd5d2df Mon Sep 17 00:00:00 2001 From: emersion Date: Sat, 12 May 2018 13:51:30 +0100 Subject: [PATCH] Send axis source event --- include/wlr/types/wlr_seat.h | 6 +++--- rootston/cursor.c | 2 +- types/data_device/wlr_drag.c | 2 +- types/seat/wlr_seat_pointer.c | 14 +++++++++----- types/wlr_wl_shell.c | 4 ++-- types/wlr_xdg_shell.c | 4 ++-- types/wlr_xdg_shell_v6.c | 4 ++-- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index ea5d532f..f4840c89 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -61,7 +61,7 @@ struct wlr_pointer_grab_interface { uint32_t button, uint32_t state); void (*axis)(struct wlr_seat_pointer_grab *grab, uint32_t time, enum wlr_axis_orientation orientation, double value, - int32_t value_discrete); + int32_t value_discrete, enum wlr_axis_source source); void (*cancel)(struct wlr_seat_pointer_grab *grab); }; @@ -302,7 +302,7 @@ uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time, **/ void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time, enum wlr_axis_orientation orientation, double value, - int32_t value_discrete); + int32_t value_discrete, enum wlr_axis_source source); /** * Start a grab of the pointer of this seat. The grabber is responsible for @@ -344,7 +344,7 @@ uint32_t wlr_seat_pointer_notify_button(struct wlr_seat *wlr_seat, */ void wlr_seat_pointer_notify_axis(struct wlr_seat *wlr_seat, uint32_t time, enum wlr_axis_orientation orientation, double value, - int32_t value_discrete); + int32_t value_discrete, enum wlr_axis_source source); /** * Whether or not the pointer has a grab other than the default grab. diff --git a/rootston/cursor.c b/rootston/cursor.c index 98ecef4f..55b145e2 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -313,7 +313,7 @@ void roots_cursor_handle_button(struct roots_cursor *cursor, void roots_cursor_handle_axis(struct roots_cursor *cursor, struct wlr_event_pointer_axis *event) { wlr_seat_pointer_notify_axis(cursor->seat->seat, event->time_msec, - event->orientation, event->delta, event->delta_discrete); + event->orientation, event->delta, event->delta_discrete, event->source); } void roots_cursor_handle_touch_down(struct roots_cursor *cursor, diff --git a/types/data_device/wlr_drag.c b/types/data_device/wlr_drag.c index 5f4cb03d..331fba2f 100644 --- a/types/data_device/wlr_drag.c +++ b/types/data_device/wlr_drag.c @@ -192,7 +192,7 @@ static uint32_t drag_handle_pointer_button(struct wlr_seat_pointer_grab *grab, static void drag_handle_pointer_axis(struct wlr_seat_pointer_grab *grab, uint32_t time, enum wlr_axis_orientation orientation, double value, - int32_t value_discrete) { + int32_t value_discrete, enum wlr_axis_source source) { // This space is intentionally left blank } diff --git a/types/seat/wlr_seat_pointer.c b/types/seat/wlr_seat_pointer.c index 8859c275..3271c090 100644 --- a/types/seat/wlr_seat_pointer.c +++ b/types/seat/wlr_seat_pointer.c @@ -26,9 +26,9 @@ static uint32_t default_pointer_button(struct wlr_seat_pointer_grab *grab, static void default_pointer_axis(struct wlr_seat_pointer_grab *grab, uint32_t time, enum wlr_axis_orientation orientation, double value, - int32_t value_discrete) { + int32_t value_discrete, enum wlr_axis_source source) { wlr_seat_pointer_send_axis(grab->seat, time, orientation, value, - value_discrete); + value_discrete, source); } static void default_pointer_cancel(struct wlr_seat_pointer_grab *grab) { @@ -227,7 +227,7 @@ uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time, enum wlr_axis_orientation orientation, double value, - int32_t value_discrete) { + int32_t value_discrete, enum wlr_axis_source source) { struct wlr_seat_client *client = wlr_seat->pointer_state.focused_client; if (client == NULL) { return; @@ -241,6 +241,9 @@ void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time, uint32_t version = wl_resource_get_version(resource); + if (version >= WL_POINTER_AXIS_SOURCE_SINCE_VERSION) { + wl_pointer_send_axis_source(resource, source); + } if (value) { if (value_discrete && version >= WL_POINTER_AXIS_DISCRETE_SINCE_VERSION) { @@ -315,10 +318,11 @@ uint32_t wlr_seat_pointer_notify_button(struct wlr_seat *wlr_seat, void wlr_seat_pointer_notify_axis(struct wlr_seat *wlr_seat, uint32_t time, enum wlr_axis_orientation orientation, double value, - int32_t value_discrete) { + int32_t value_discrete, enum wlr_axis_source source) { clock_gettime(CLOCK_MONOTONIC, &wlr_seat->last_event); struct wlr_seat_pointer_grab *grab = wlr_seat->pointer_state.grab; - grab->interface->axis(grab, time, orientation, value, value_discrete); + grab->interface->axis(grab, time, orientation, value, value_discrete, + source); } bool wlr_seat_pointer_has_grab(struct wlr_seat *seat) { diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index 423c048b..05f9f19c 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -94,9 +94,9 @@ static void shell_pointer_grab_cancel(struct wlr_seat_pointer_grab *grab) { static void shell_pointer_grab_axis(struct wlr_seat_pointer_grab *grab, uint32_t time, enum wlr_axis_orientation orientation, double value, - int32_t value_discrete) { + int32_t value_discrete, enum wlr_axis_source source) { wlr_seat_pointer_send_axis(grab->seat, time, orientation, value, - value_discrete); + value_discrete, source); } static const struct wlr_pointer_grab_interface shell_pointer_grab_impl = { diff --git a/types/wlr_xdg_shell.c b/types/wlr_xdg_shell.c index abc80e83..b626b772 100644 --- a/types/wlr_xdg_shell.c +++ b/types/wlr_xdg_shell.c @@ -78,9 +78,9 @@ static uint32_t xdg_pointer_grab_button(struct wlr_seat_pointer_grab *grab, static void xdg_pointer_grab_axis(struct wlr_seat_pointer_grab *grab, uint32_t time, enum wlr_axis_orientation orientation, double value, - int32_t value_discrete) { + int32_t value_discrete, enum wlr_axis_source source) { wlr_seat_pointer_send_axis(grab->seat, time, orientation, value, - value_discrete); + value_discrete, source); } static void xdg_pointer_grab_cancel(struct wlr_seat_pointer_grab *grab) { diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c index 548051c2..29e4e605 100644 --- a/types/wlr_xdg_shell_v6.c +++ b/types/wlr_xdg_shell_v6.c @@ -88,9 +88,9 @@ static uint32_t xdg_pointer_grab_button(struct wlr_seat_pointer_grab *grab, static void xdg_pointer_grab_axis(struct wlr_seat_pointer_grab *grab, uint32_t time, enum wlr_axis_orientation orientation, double value, - int32_t value_discrete) { + int32_t value_discrete, enum wlr_axis_source source) { wlr_seat_pointer_send_axis(grab->seat, time, orientation, value, - value_discrete); + value_discrete, source); } static void xdg_pointer_grab_cancel(struct wlr_seat_pointer_grab *grab) {