diff --git a/configure.ac b/configure.ac index b57a575..e29abd4 100644 --- a/configure.ac +++ b/configure.ac @@ -45,7 +45,7 @@ XORG_DEFAULT_OPTIONS # Obtain compiler/linker options from server and required extensions PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto [inputproto >= 2.2]) -PKG_CHECK_MODULES(LIBINPUT, [libinput >= 0.8.0]) +PKG_CHECK_MODULES(LIBINPUT, [libinput >= 0.11.0]) # Define a configure option for an alternate input module directory AC_ARG_WITH(xorg-module-dir, diff --git a/src/libinput.c b/src/libinput.c index 0ab240c..be0b24d 100644 --- a/src/libinput.c +++ b/src/libinput.c @@ -419,7 +419,7 @@ xf86libinput_init_pointer(InputInfoPtr pInfo) Atom axislabels[TOUCHPAD_NUM_AXES]; for (i = BTN_BACK; i >= BTN_SIDE; i--) { - if (libinput_device_has_button(driver_data->device, i)) { + if (libinput_device_pointer_has_button(driver_data->device, i)) { nbuttons += i - BTN_SIDE + 1; break; } @@ -467,7 +467,7 @@ xf86libinput_init_pointer_absolute(InputInfoPtr pInfo) Atom axislabels[TOUCHPAD_NUM_AXES]; for (i = BTN_BACK; i >= BTN_SIDE; i--) { - if (libinput_device_has_button(driver_data->device, i)) { + if (libinput_device_pointer_has_button(driver_data->device, i)) { nbuttons += i - BTN_SIDE + 1; break; } @@ -1582,8 +1582,8 @@ LibinputSetPropertyScrollButton(DeviceIntPtr dev, if (!xf86libinput_check_device (dev, atom)) return BadMatch; - supported = libinput_device_has_button(device, - btn_xorg2linux(button)); + supported = libinput_device_pointer_has_button(device, + btn_xorg2linux(button)); if (button && !supported) return BadValue; } else {