summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-05-12 09:40:34 -0400
committerLibravatar GitHub <noreply@github.com>2018-05-12 09:40:34 -0400
commitb1c33ecc256c58c7ecee28e2f4507dd374727d62 (patch)
tree01ef02dca7eb448d9a6f2eb63bf60dfcd83ee86b
parentMerge pull request #1958 from swaywm/scdoc (diff)
parentMerge branch 'master' into wlroots-970 (diff)
downloadsway-b1c33ecc256c58c7ecee28e2f4507dd374727d62.tar.gz
sway-b1c33ecc256c58c7ecee28e2f4507dd374727d62.tar.zst
sway-b1c33ecc256c58c7ecee28e2f4507dd374727d62.zip
Merge pull request #1964 from emersion/wlroots-970
Send pointer discrete axis values
-rw-r--r--sway/input/cursor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index c0c6e827..51ce86e1 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -240,7 +240,7 @@ static void handle_cursor_axis(struct wl_listener *listener, void *data) {
240 struct sway_cursor *cursor = wl_container_of(listener, cursor, axis); 240 struct sway_cursor *cursor = wl_container_of(listener, cursor, axis);
241 struct wlr_event_pointer_axis *event = data; 241 struct wlr_event_pointer_axis *event = data;
242 wlr_seat_pointer_notify_axis(cursor->seat->wlr_seat, event->time_msec, 242 wlr_seat_pointer_notify_axis(cursor->seat->wlr_seat, event->time_msec,
243 event->orientation, event->delta); 243 event->orientation, event->delta, event->delta_discrete, event->source);
244} 244}
245 245
246static void handle_touch_down(struct wl_listener *listener, void *data) { 246static void handle_touch_down(struct wl_listener *listener, void *data) {