commit 6f21084
Michael Forney
·
2015-03-16 07:59:51 +0000 UTC
parent 4945a2e
seat: Update for newer libinput API Fixes #23.
1 files changed,
+18,
-5
+18,
-5
1@@ -262,6 +262,19 @@ static uint32_t device_capabilities(struct libinput_device * device)
2 return capabilities;
3 }
4
5+static void handle_libinput_axis_event(struct libinput_event_pointer * event,
6+ enum libinput_pointer_axis axis)
7+{
8+ if (!libinput_event_pointer_has_axis(event, axis))
9+ return;
10+
11+ double amount;
12+
13+ amount = libinput_event_pointer_get_axis_value(event, axis);
14+ handle_axis(libinput_event_pointer_get_time(event), axis,
15+ wl_fixed_from_double(amount));
16+}
17+
18 static int handle_libinput_data(int fd, uint32_t mask, void * data)
19 {
20 struct libinput_event * generic_event;
21@@ -319,13 +332,13 @@ static int handle_libinput_data(int fd, uint32_t mask, void * data)
22 case LIBINPUT_EVENT_POINTER_AXIS:
23 {
24 struct libinput_event_pointer * event;
25- wl_fixed_t amount;
26
27 event = libinput_event_get_pointer_event(generic_event);
28- amount = wl_fixed_from_double
29- (libinput_event_pointer_get_axis_value(event));
30- handle_axis(libinput_event_pointer_get_time(event),
31- libinput_event_pointer_get_axis(event), amount);
32+ handle_libinput_axis_event
33+ (event, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
34+ handle_libinput_axis_event
35+ (event, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
36+
37 break;
38 }
39 default: