summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/ecore_drm/ecore_drm_evdev.c8
-rw-r--r--src/lib/elput/elput_evdev.c7
2 files changed, 0 insertions, 15 deletions
diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c b/src/lib/ecore_drm/ecore_drm_evdev.c
index 4e5ad4527b..3cc1f74bce 100644
--- a/src/lib/ecore_drm/ecore_drm_evdev.c
+++ b/src/lib/ecore_drm/ecore_drm_evdev.c
@@ -585,7 +585,6 @@ _device_handle_button(struct libinput_device *device, struct libinput_event_poin
585 ecore_event_add(ECORE_EVENT_MOUSE_BUTTON_UP, ev, NULL, NULL); 585 ecore_event_add(ECORE_EVENT_MOUSE_BUTTON_UP, ev, NULL, NULL);
586} 586}
587 587
588#if LIBINPUT_HIGHER_08
589static double 588static double
590_event_scroll_get(struct libinput_event_pointer *pe, enum libinput_pointer_axis axis) 589_event_scroll_get(struct libinput_event_pointer *pe, enum libinput_pointer_axis axis)
591{ 590{
@@ -599,7 +598,6 @@ _event_scroll_get(struct libinput_event_pointer *pe, enum libinput_pointer_axis
599 } 598 }
600 return 0.0; 599 return 0.0;
601} 600}
602#endif
603 601
604static void 602static void
605_device_handle_axis(struct libinput_device *device, struct libinput_event_pointer *event) 603_device_handle_axis(struct libinput_device *device, struct libinput_event_pointer *event)
@@ -631,7 +629,6 @@ _device_handle_axis(struct libinput_device *device, struct libinput_event_pointe
631 ev->root.x = ev->x; 629 ev->root.x = ev->x;
632 ev->root.y = ev->y; 630 ev->root.y = ev->y;
633 631
634#if LIBINPUT_HIGHER_08
635 axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL; 632 axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL;
636 if (libinput_event_pointer_has_axis(event, axis)) 633 if (libinput_event_pointer_has_axis(event, axis))
637 ev->z = _event_scroll_get(event, axis); 634 ev->z = _event_scroll_get(event, axis);
@@ -642,11 +639,6 @@ _device_handle_axis(struct libinput_device *device, struct libinput_event_pointe
642 ev->direction = 1; 639 ev->direction = 1;
643 ev->z = _event_scroll_get(event, axis); 640 ev->z = _event_scroll_get(event, axis);
644 } 641 }
645#else
646 axis = libinput_event_pointer_get_axis(event);
647 if (axis == LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL) ev->direction = 1;
648 ev->z = libinput_event_pointer_get_axis_value(event);
649#endif
650 642
651 ecore_event_add(ECORE_EVENT_MOUSE_WHEEL, ev, NULL, NULL); 643 ecore_event_add(ECORE_EVENT_MOUSE_WHEEL, ev, NULL, NULL);
652} 644}
diff --git a/src/lib/elput/elput_evdev.c b/src/lib/elput/elput_evdev.c
index b41fbe508b..4943c45f4d 100644
--- a/src/lib/elput/elput_evdev.c
+++ b/src/lib/elput/elput_evdev.c
@@ -1191,7 +1191,6 @@ _pointer_axis(struct libinput_device *idevice, struct libinput_event_pointer *ev
1191 ptr = _evdev_pointer_get(dev->seat); 1191 ptr = _evdev_pointer_get(dev->seat);
1192 if (!ptr) return EINA_FALSE; 1192 if (!ptr) return EINA_FALSE;
1193 1193
1194#ifdef LIBINPUT_HIGHER_08
1195 vert = 1194 vert =
1196 libinput_event_pointer_has_axis(event, 1195 libinput_event_pointer_has_axis(event,
1197 LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL); 1196 LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
@@ -1213,12 +1212,6 @@ _pointer_axis(struct libinput_device *idevice, struct libinput_event_pointer *ev
1213 dir = 1; 1212 dir = 1;
1214 } 1213 }
1215 1214
1216#else
1217 axis = libinput_event_pointer_get_axis(event);
1218 if (axis == LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL) dir = 1;
1219 val = libinput_event_pointer_get_axis_value(event);
1220#endif
1221
1222 ptr->timestamp = libinput_event_pointer_get_time(event); 1215 ptr->timestamp = libinput_event_pointer_get_time(event);
1223 1216
1224 _pointer_axis_send(dev, dir, val); 1217 _pointer_axis_send(dev, dir, val);