diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2014-06-19 14:50:48 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-06-25 14:43:16 +1000 |
| commit | c28d90ba698c3cf411b73a0a4f1314ccb7bb9b9f (patch) | |
| tree | be4144509d1d5130e2bd2153c1fe6dc78b586938 | |
| parent | 3b2e3e6f9e6cbbc2c40bb1bc18603eb241c17338 (diff) | |
Fix for libinput 0.4.0 API changes
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/libinput.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 00e701c..abd3966 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.3.0]) +PKG_CHECK_MODULES(LIBINPUT, [libinput >= 0.4.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 9f03876..f158cd6 100644 --- a/src/libinput.c +++ b/src/libinput.c @@ -386,7 +386,7 @@ xf86libinput_handle_key(InputInfoPtr pInfo, struct libinput_event_keyboard *even key += XORG_KEYCODE_OFFSET; - is_press = (libinput_event_keyboard_get_key_state(event) == LIBINPUT_KEYBOARD_KEY_STATE_PRESSED); + is_press = (libinput_event_keyboard_get_key_state(event) == LIBINPUT_KEY_STATE_PRESSED); xf86PostKeyboardEvent(dev, key, is_press); } @@ -400,7 +400,7 @@ xf86libinput_handle_axis(InputInfoPtr pInfo, struct libinput_event_pointer *even double value; if (libinput_event_pointer_get_axis(event) == - LIBINPUT_POINTER_AXIS_VERTICAL_SCROLL) + LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL) axis = 3; else axis = 2; @@ -628,7 +628,7 @@ xf86libinput_uninit(InputDriverPtr drv, struct xf86libinput *driver_data = pInfo->private; if (driver_data) { if (--driver_context.device_count == 0) { - libinput_destroy(driver_context.libinput); + libinput_unref(driver_context.libinput); driver_context.libinput = NULL; } valuator_mask_free(&driver_data->valuators); |