aboutsummaryrefslogtreecommitdiffstats
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
parentelm_widget_item_static_focus: do not accept the adapter as subchild (diff)
downloadefl-f40c91941d5992b4a12802c42e709cbd9861faa1.tar.gz
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 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
ecore_event_add(ECORE_EVENT_MOUSE_BUTTON_UP, ev, NULL, NULL);
}
-#if LIBINPUT_HIGHER_08
static double
_event_scroll_get(struct libinput_event_pointer *pe, enum libinput_pointer_axis axis)
{
@@ -599,7 +598,6 @@ _event_scroll_get(struct libinput_event_pointer *pe, enum libinput_pointer_axis
}
return 0.0;
}
-#endif
static void
_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
ev->root.x = ev->x;
ev->root.y = ev->y;
-#if LIBINPUT_HIGHER_08
axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL;
if (libinput_event_pointer_has_axis(event, axis))
ev->z = _event_scroll_get(event, axis);
@@ -642,11 +639,6 @@ _device_handle_axis(struct libinput_device *device, struct libinput_event_pointe
ev->direction = 1;
ev->z = _event_scroll_get(event, axis);
}
-#else
- axis = libinput_event_pointer_get_axis(event);
- if (axis == LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL) ev->direction = 1;
- ev->z = libinput_event_pointer_get_axis_value(event);
-#endif
ecore_event_add(ECORE_EVENT_MOUSE_WHEEL, ev, NULL, NULL);
}