summaryrefslogtreecommitdiff
path: root/src/lib/ecore_drm
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-12 21:44:42 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-12 21:47:02 +0900
commitf40c91941d5992b4a12802c42e709cbd9861faa1 (patch)
tree2e5030ca6f8776b955ca7fc38aabff922710dbdd /src/lib/ecore_drm
parenta2a0ccf36b5becdd00005f339e03bb19154f8fdc (diff)
libinput check - move up to requiring 1.6 as a minimum for libinput
Diffstat (limited to 'src/lib/ecore_drm')
-rw-r--r--src/lib/ecore_drm/ecore_drm_evdev.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c b/src/lib/ecore_drm/ecore_drm_evdev.c
index 4e5ad45..3cc1f74 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}