From 86b46e74c5fe27911c0fa8ece578d248845c9384 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 5 Feb 2016 16:27:50 +1000 Subject: [PATCH] libinput 1.1.6 --- .gitignore | 1 + ...-the-mode-button-on-the-Cyborg-RAT-5.patch | 309 ------------------ ...ad-drop-motion-hysteresis-by-default.patch | 124 ------- libinput.spec | 10 +- sources | 2 +- 5 files changed, 7 insertions(+), 439 deletions(-) delete mode 100644 0001-evdev-disable-the-mode-button-on-the-Cyborg-RAT-5.patch delete mode 100644 0001-touchpad-drop-motion-hysteresis-by-default.patch diff --git a/.gitignore b/.gitignore index 4b2b4d7..9a76206 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /libinput-1.1.3.tar.xz /libinput-1.1.4.tar.xz /libinput-1.1.5.tar.xz +/libinput-1.1.6.tar.xz diff --git a/0001-evdev-disable-the-mode-button-on-the-Cyborg-RAT-5.patch b/0001-evdev-disable-the-mode-button-on-the-Cyborg-RAT-5.patch deleted file mode 100644 index 1d3c1f7..0000000 --- a/0001-evdev-disable-the-mode-button-on-the-Cyborg-RAT-5.patch +++ /dev/null @@ -1,309 +0,0 @@ -From 456a18ce5e318cc440ef61001b322f9ad90d1810 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 29 Jan 2016 10:09:13 +1000 -Subject: [PATCH libinput] evdev: disable the mode button on the Cyborg RAT 5 - -This button sends a release N, press N+1 on each press, cycling through the -three event codes supported. This causes a stuck button since the current mode -is never released. - -Long-term this better served by a set of switches that toggle accordingly, for -now disable the button codes. - -https://bugs.freedesktop.org/show_bug.cgi?id=92127 - -Signed-off-by: Peter Hutterer -Reviewed-by: Hans de Goede -(cherry picked from commit e19d5d228cbda3ccd0fe1f11948032e12e1ed3c3) ---- - src/evdev.c | 36 +++++++++++++++++ - src/evdev.h | 1 + - test/Makefile.am | 1 + - test/device.c | 33 ++++++++++++++++ - test/litest-device-cyborg-rat-5.c | 71 ++++++++++++++++++++++++++++++++++ - test/litest.c | 2 + - test/litest.h | 1 + - udev/90-libinput-model-quirks.hwdb | 7 ++++ - udev/90-libinput-model-quirks.rules.in | 4 ++ - 9 files changed, 156 insertions(+) - create mode 100644 test/litest-device-cyborg-rat-5.c - -diff --git a/src/evdev.c b/src/evdev.c -index 430d7de..7448103 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -1663,6 +1663,7 @@ evdev_read_model_flags(struct evdev_device *device) - { "LIBINPUT_MODEL_JUMPING_SEMI_MT", EVDEV_MODEL_JUMPING_SEMI_MT }, - { "LIBINPUT_MODEL_ELANTECH_TOUCHPAD", EVDEV_MODEL_ELANTECH_TOUCHPAD }, - { "LIBINPUT_MODEL_APPLE_INTERNAL_KEYBOARD", EVDEV_MODEL_APPLE_INTERNAL_KEYBOARD }, -+ { "LIBINPUT_MODEL_CYBORG_RAT", EVDEV_MODEL_CYBORG_RAT }, - { NULL, EVDEV_MODEL_DEFAULT }, - }; - const struct model_map *m = model_map; -@@ -2215,6 +2216,39 @@ evdev_drain_fd(int fd) - } - } - -+static inline void -+evdev_pre_configure_model_quirks(struct evdev_device *device) -+{ -+ /* The Cyborg RAT has a mode button that cycles through event codes. -+ * On press, we get a release for the current mode and a press for the -+ * next mode: -+ * E: 0.000001 0004 0004 589833 # EV_MSC / MSC_SCAN 589833 -+ * E: 0.000001 0001 0118 0000 # EV_KEY / (null) 0 -+ * E: 0.000001 0004 0004 589834 # EV_MSC / MSC_SCAN 589834 -+ * E: 0.000001 0001 0119 0001 # EV_KEY / (null) 1 -+ * E: 0.000001 0000 0000 0000 # ------------ SYN_REPORT (0) ---------- +0ms -+ * E: 0.705000 0004 0004 589834 # EV_MSC / MSC_SCAN 589834 -+ * E: 0.705000 0001 0119 0000 # EV_KEY / (null) 0 -+ * E: 0.705000 0004 0004 589835 # EV_MSC / MSC_SCAN 589835 -+ * E: 0.705000 0001 011a 0001 # EV_KEY / (null) 1 -+ * E: 0.705000 0000 0000 0000 # ------------ SYN_REPORT (0) ---------- +705ms -+ * E: 1.496995 0004 0004 589833 # EV_MSC / MSC_SCAN 589833 -+ * E: 1.496995 0001 0118 0001 # EV_KEY / (null) 1 -+ * E: 1.496995 0004 0004 589835 # EV_MSC / MSC_SCAN 589835 -+ * E: 1.496995 0001 011a 0000 # EV_KEY / (null) 0 -+ * E: 1.496995 0000 0000 0000 # ------------ SYN_REPORT (0) ---------- +791ms -+ * -+ * https://bugs.freedesktop.org/show_bug.cgi?id=92127 -+ * -+ * Disable the event codes to avoid stuck buttons. -+ */ -+ if(device->model_flags & EVDEV_MODEL_CYBORG_RAT) { -+ libevdev_disable_event_code(device->evdev, EV_KEY, 0x118); -+ libevdev_disable_event_code(device->evdev, EV_KEY, 0x119); -+ libevdev_disable_event_code(device->evdev, EV_KEY, 0x11a); -+ } -+} -+ - struct evdev_device * - evdev_device_create(struct libinput_seat *seat, - struct udev_device *udev_device) -@@ -2284,6 +2318,8 @@ evdev_device_create(struct libinput_seat *seat, - matrix_init_identity(&device->abs.usermatrix); - matrix_init_identity(&device->abs.default_calibration); - -+ evdev_pre_configure_model_quirks(device); -+ - if (evdev_configure_device(device) == -1) - goto err; - -diff --git a/src/evdev.h b/src/evdev.h -index 97177ec..560559a 100644 ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -109,6 +109,7 @@ enum evdev_device_model { - EVDEV_MODEL_ELANTECH_TOUCHPAD = (1 << 11), - EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 12), - EVDEV_MODEL_APPLE_INTERNAL_KEYBOARD = (1 << 13), -+ EVDEV_MODEL_CYBORG_RAT = (1 << 14), - }; - - struct mt_slot { -diff --git a/test/Makefile.am b/test/Makefile.am -index 4c394bf..a298284 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -20,6 +20,7 @@ liblitest_la_SOURCES = \ - litest-device-asus-rog-gladius.c \ - litest-device-atmel-hover.c \ - litest-device-bcm5974.c \ -+ litest-device-cyborg-rat-5.c \ - litest-device-elantech-touchpad.c \ - litest-device-generic-singletouch.c \ - litest-device-keyboard.c \ -diff --git a/test/device.c b/test/device.c -index 03659ac..7bd7683 100644 ---- a/test/device.c -+++ b/test/device.c -@@ -1283,6 +1283,38 @@ START_TEST(device_quirks_no_abs_mt_y) - } - END_TEST - -+START_TEST(device_quirks_cyborg_rat_mode_button) -+{ -+ struct litest_device *dev = litest_current_device(); -+ struct libinput_device *device = dev->libinput_device; -+ struct libinput *li = dev->libinput; -+ -+ ck_assert(!libinput_device_pointer_has_button(device, 0x118)); -+ ck_assert(!libinput_device_pointer_has_button(device, 0x119)); -+ ck_assert(!libinput_device_pointer_has_button(device, 0x11a)); -+ -+ litest_drain_events(li); -+ -+ litest_event(dev, EV_KEY, 0x118, 0); -+ litest_event(dev, EV_KEY, 0x119, 1); -+ litest_event(dev, EV_SYN, SYN_REPORT, 0); -+ -+ litest_assert_empty_queue(li); -+ -+ litest_event(dev, EV_KEY, 0x119, 0); -+ litest_event(dev, EV_KEY, 0x11a, 1); -+ litest_event(dev, EV_SYN, SYN_REPORT, 0); -+ -+ litest_assert_empty_queue(li); -+ -+ litest_event(dev, EV_KEY, 0x11a, 0); -+ litest_event(dev, EV_KEY, 0x118, 1); -+ litest_event(dev, EV_SYN, SYN_REPORT, 0); -+ -+ litest_assert_empty_queue(li); -+} -+END_TEST -+ - void - litest_setup_tests(void) - { -@@ -1339,4 +1371,5 @@ litest_setup_tests(void) - litest_add_no_device("device:invalid rel events", device_abs_rel); - - litest_add_for_device("device:quirks", device_quirks_no_abs_mt_y, LITEST_ANKER_MOUSE_KBD); -+ litest_add_for_device("device:quirks", device_quirks_cyborg_rat_mode_button, LITEST_CYBORG_RAT); - } -diff --git a/test/litest-device-cyborg-rat-5.c b/test/litest-device-cyborg-rat-5.c -new file mode 100644 -index 0000000..a1db77a ---- /dev/null -+++ b/test/litest-device-cyborg-rat-5.c -@@ -0,0 +1,71 @@ -+/* -+ * Copyright © 2013 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+ -+#if HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "litest.h" -+#include "litest-int.h" -+ -+static void litest_cyborg_rat_setup(void) -+{ -+ struct litest_device *d = litest_create_device(LITEST_CYBORG_RAT); -+ litest_set_current_device(d); -+} -+ -+static struct input_id input_id = { -+ .bustype = 0x3, -+ .vendor = 0x6a3, -+ .product = 0xcd5, -+}; -+ -+static int events[] = { -+ EV_KEY, BTN_LEFT, -+ EV_KEY, BTN_RIGHT, -+ EV_KEY, BTN_MIDDLE, -+ EV_KEY, BTN_SIDE, -+ EV_KEY, BTN_EXTRA, -+ EV_KEY, BTN_FORWARD, -+ EV_KEY, BTN_TASK, -+ EV_KEY, 0x118, -+ EV_KEY, 0x119, -+ EV_KEY, 0x11a, -+ EV_REL, REL_X, -+ EV_REL, REL_Y, -+ EV_REL, REL_WHEEL, -+ -1 , -1, -+}; -+ -+struct litest_test_device litest_cyborg_rat_device = { -+ .type = LITEST_CYBORG_RAT, -+ .features = LITEST_RELATIVE | LITEST_BUTTON | LITEST_WHEEL, -+ .shortname = "cyborg_rat", -+ .setup = litest_cyborg_rat_setup, -+ .interface = NULL, -+ -+ .name = "Saitek Cyborg R.A.T.5 Mouse", -+ .id = &input_id, -+ .absinfo = NULL, -+ .events = events, -+}; -diff --git a/test/litest.c b/test/litest.c -index 1551dc7..2cc1a61 100644 ---- a/test/litest.c -+++ b/test/litest.c -@@ -369,6 +369,7 @@ extern struct litest_test_device litest_mouse_gladius_device; - extern struct litest_test_device litest_mouse_wheel_click_angle_device; - extern struct litest_test_device litest_apple_keyboard_device; - extern struct litest_test_device litest_anker_mouse_kbd_device; -+extern struct litest_test_device litest_cyborg_rat_device; - - struct litest_test_device* devices[] = { - &litest_synaptics_clickpad_device, -@@ -404,6 +405,7 @@ struct litest_test_device* devices[] = { - &litest_mouse_wheel_click_angle_device, - &litest_apple_keyboard_device, - &litest_anker_mouse_kbd_device, -+ &litest_cyborg_rat_device, - NULL, - }; - -diff --git a/test/litest.h b/test/litest.h -index 61b1b01..4235d2c 100644 ---- a/test/litest.h -+++ b/test/litest.h -@@ -146,6 +146,7 @@ enum litest_device_type { - LITEST_MOUSE_WHEEL_CLICK_ANGLE = -32, - LITEST_APPLE_KEYBOARD = -33, - LITEST_ANKER_MOUSE_KBD = -34, -+ LITEST_CYBORG_RAT = -41, - }; - - enum litest_device_feature { -diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb -index baebcb3..fa668d6 100644 ---- a/udev/90-libinput-model-quirks.hwdb -+++ b/udev/90-libinput-model-quirks.hwdb -@@ -38,6 +38,13 @@ libinput:name:*Apple Inc. Apple Internal Keyboard*:dmi:* - LIBINPUT_MODEL_APPLE_INTERNAL_KEYBOARD=1 - - ########################################## -+# Cyborg -+########################################## -+# Saitek Cyborg R.A.T.5 Mouse -+libinput:mouse:input:b0003v06A3p0CD5* -+ LIBINPUT_MODEL_CYBORG_RAT=1 -+ -+########################################## - # Elantech - ########################################## - libinput:name:*ETPS/2 Elantech Touchpad*:dmi:* -diff --git a/udev/90-libinput-model-quirks.rules.in b/udev/90-libinput-model-quirks.rules.in -index 5b07726..8bff192 100644 ---- a/udev/90-libinput-model-quirks.rules.in -+++ b/udev/90-libinput-model-quirks.rules.in -@@ -29,6 +29,10 @@ KERNELS=="*input*", \ - ENV{ID_INPUT_TOUCHPAD}=="1", \ - IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=libinput:touchpad:" - -+# libinput:mouse: -+ENV{ID_INPUT_MOUSE}=="1", \ -+ IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=libinput:mouse:" -+ - # libinput:name::dmi: - KERNELS=="input*", \ - IMPORT{builtin}="hwdb 'libinput:name:$attr{name}:$attr{[dmi/id]modalias}'" --- -2.5.0 - diff --git a/0001-touchpad-drop-motion-hysteresis-by-default.patch b/0001-touchpad-drop-motion-hysteresis-by-default.patch deleted file mode 100644 index 11c0e59..0000000 --- a/0001-touchpad-drop-motion-hysteresis-by-default.patch +++ /dev/null @@ -1,124 +0,0 @@ -From c6381801cf4dcc29ac13b6f52938f9e4a5f0b219 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 29 Jan 2016 16:25:31 +1000 -Subject: [PATCH libinput] touchpad: drop motion hysteresis by default - -Some older touchpad devices jitter a fair bit when a finger is resting on the -touchpad. That's why the hysteresis was introduced in the synaptics driver -back in 2011. However, the default value of the hysteresis in the synaptics -driver ended up being 0, even though the code looks like it's using a fraction -of the touchpad diagonal. When the hysteresis code was ported to libinput it -was eventually set to 0.5mm. - -Turns out this is still too high and tiny finger motions are either -nonreactive or quite jumpy, making it hard to select small targets. Drop the -default hysteresis by reducing its margin to 0, but leave it in place for -those devices where we need them (e.g. the cyapa touchpads). - -https://bugs.freedesktop.org/show_bug.cgi?id=93503 - -Signed-off-by: Peter Hutterer -Reviewed-by: Hans de Goede -(cherry picked from commit 6e0553ab5553d63fa737c1739cfa86fbeee9f641) ---- - src/evdev-mt-touchpad.c | 23 ++++++++++++++++++----- - src/evdev.c | 1 + - src/evdev.h | 1 + - udev/90-libinput-model-quirks.hwdb | 3 +++ - 4 files changed, 23 insertions(+), 5 deletions(-) - -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index db8aa1d..23b7419 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -1940,13 +1940,29 @@ tp_init_default_resolution(struct tp_dispatch *tp, - return 0; - } - -+static inline void -+tp_init_hysteresis(struct tp_dispatch *tp) -+{ -+ int res_x, res_y; -+ -+ res_x = tp->device->abs.absinfo_x->resolution; -+ res_y = tp->device->abs.absinfo_y->resolution; -+ -+ if (tp->device->model_flags & EVDEV_MODEL_CYAPA) { -+ tp->hysteresis_margin.x = res_x/2; -+ tp->hysteresis_margin.y = res_y/2; -+ } else { -+ tp->hysteresis_margin.x = 0; -+ tp->hysteresis_margin.y = 0; -+ } -+} -+ - static int - tp_init(struct tp_dispatch *tp, - struct evdev_device *device) - { - int width, height; - double diagonal; -- int res_x, res_y; - - tp->base.interface = &tp_interface; - tp->device = device; -@@ -1960,8 +1976,6 @@ tp_init(struct tp_dispatch *tp, - if (tp_init_slots(tp, device) != 0) - return -1; - -- res_x = tp->device->abs.absinfo_x->resolution; -- res_y = tp->device->abs.absinfo_y->resolution; - width = device->abs.dimensions.x; - height = device->abs.dimensions.y; - diagonal = sqrt(width*width + height*height); -@@ -1970,8 +1984,7 @@ tp_init(struct tp_dispatch *tp, - EV_ABS, - ABS_MT_DISTANCE); - -- tp->hysteresis_margin.x = res_x/2; -- tp->hysteresis_margin.y = res_y/2; -+ tp_init_hysteresis(tp); - - if (tp_init_accel(tp, diagonal) != 0) - return -1; -diff --git a/src/evdev.c b/src/evdev.c -index 7448103..281a2a0 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -1664,6 +1664,7 @@ evdev_read_model_flags(struct evdev_device *device) - { "LIBINPUT_MODEL_ELANTECH_TOUCHPAD", EVDEV_MODEL_ELANTECH_TOUCHPAD }, - { "LIBINPUT_MODEL_APPLE_INTERNAL_KEYBOARD", EVDEV_MODEL_APPLE_INTERNAL_KEYBOARD }, - { "LIBINPUT_MODEL_CYBORG_RAT", EVDEV_MODEL_CYBORG_RAT }, -+ { "LIBINPUT_MODEL_CYAPA", EVDEV_MODEL_CYAPA }, - { NULL, EVDEV_MODEL_DEFAULT }, - }; - const struct model_map *m = model_map; -diff --git a/src/evdev.h b/src/evdev.h -index 560559a..96bf621 100644 ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -110,6 +110,7 @@ enum evdev_device_model { - EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 12), - EVDEV_MODEL_APPLE_INTERNAL_KEYBOARD = (1 << 13), - EVDEV_MODEL_CYBORG_RAT = (1 << 14), -+ EVDEV_MODEL_CYAPA = (1 << 15), - }; - - struct mt_slot { -diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb -index fa668d6..f23a7f9 100644 ---- a/udev/90-libinput-model-quirks.hwdb -+++ b/udev/90-libinput-model-quirks.hwdb -@@ -73,6 +73,9 @@ libinput:name:Cypress APA Trackpad (cyapa):dmi:*svn*SAMSUNG*:pn*Lumpy* - libinput:name:Atmel maXTouch Touchpad:dmi:*svn*GOOGLE*:pn*Samus* - LIBINPUT_MODEL_CHROMEBOOK=1 - -+libinput:name:Cypress APA Trackpad (cyapa):dmi:* -+ LIBINPUT_MODEL_CYAPA=1 -+ - ########################################## - # LENOVO - ########################################## --- -2.5.0 - diff --git a/libinput.spec b/libinput.spec index c9d5e05..42dc823 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.1.5 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.1.6 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -21,9 +21,6 @@ Source0: http://www.freedesktop.org/software/libinput/libinput-%{version} # Not upstream, keep until kernel 4.2 or 4.1.x with dbf3c37086 Patch01: 0001-touchpad-serial-synaptics-need-to-fake-new-touches-o.patch -Patch02: 0001-evdev-disable-the-mode-button-on-the-Cyborg-RAT-5.patch -Patch03: 0001-touchpad-drop-motion-hysteresis-by-default.patch - BuildRequires: git BuildRequires: autoconf automake libtool pkgconfig BuildRequires: libevdev-devel @@ -100,6 +97,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %changelog +* Fri Feb 05 2016 Peter Hutterer 1.1.6-1 +- libinput 1.1.6 + * Thu Feb 04 2016 Peter Hutterer 1.1.5-4 - Fix patches from -3, they got corrupted somehow diff --git a/sources b/sources index ef5b0b0..f73ee05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d730cdb43aadee55145d0cf60430fa3 libinput-1.1.5.tar.xz +7ae03d6c4176537cb588b8d2a23cb297 libinput-1.1.6.tar.xz