libinput: Changes to 'ubuntu'
.gitignore |2 Makefile.am |2 README.md | 92 README.txt | 98 configure.ac | 145 - debian/changelog | 18 debian/libinput-tools.install |1 debian/patches/0001-libinput-add-orientation-and-size-of-touch-point-and.patch | 52 debian/patches/0002-extend-tools-to-print-and-display-touch-event-proper.patch | 134 - debian/patches/0003-Fix-premature-flushing-of-evdev-event-on-mx4-touchsc.patch |8 debian/patches/series |1 debian/rules |3 doc/Makefile.am |3 doc/building.dox | 103 - doc/device-configuration-via-udev.dox |2 doc/faqs.dox | 23 doc/libinput.doxygen.in |4 doc/page-hierarchy.dox |3 doc/switches.dox | 18 doc/timestamps.dox | 36 doc/tools.dox | 73 doc/touchpad-pressure.dox |2 meson.build | 683 ++ meson_options.txt | 20 src/Makefile.am |2 src/evdev-lid.c | 98 src/evdev-mt-touchpad-buttons.c |4 src/evdev-mt-touchpad-edge-scroll.c |2 src/evdev-mt-touchpad-gestures.c |5 src/evdev-mt-touchpad-tap.c | 86 src/evdev-mt-touchpad.c | 251 +- src/evdev-mt-touchpad.h | 22 src/evdev-tablet-pad.h |4 src/evdev-tablet.c | 536 +++-- src/evdev-tablet.h | 15 src/evdev.c | 95 src/evdev.h | 12 src/libinput-private.h | 26 src/libinput-restore-selinux-context.sh | 12 src/libinput-util.c |9 src/libinput-util.h | 41 src/libinput.c | 119 - src/libinput.h | 44 test/Makefile.am |3 test/litest-device-mouse-wheel-click-count.c |6 test/litest.c | 292 +- test/litest.h | 10 test/symbols-leak-test.in | 15 test/test-device.c |2 test/test-keyboard.c |3 test/test-lid.c | 54 test/test-log.c |1 test/test-misc.c | 14 test/test-path.c | 151 - test/test-pointer.c |4 test/test-tablet.c |
libinput: Changes to 'ubuntu'
configure.ac|4 +-- debian/changelog| 10 ++-- src/evdev-lid.c | 21 -- src/evdev-mt-touchpad.c | 17 ++ src/libinput-util.h |8 -- test/test-lid.c | 56 test/test-touchpad.c|8 +++--- 7 files changed, 98 insertions(+), 26 deletions(-) New commits: commit 5a37c042c1b921c13f54ad3f82326ae1a95268d2 Author: Timo AaltonenDate: Tue Jun 20 19:27:44 2017 +0300 release to artful diff --git a/debian/changelog b/debian/changelog index 4b2e019..eaf4ef3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,15 @@ -libinput (1.7.3-1) unstable; urgency=medium +libinput (1.7.3-1ubuntu1) artful; urgency=medium - * New upstream release. + * Merge from Debian. + * Refresh patches. - -- Timo Aaltonen Tue, 20 Jun 2017 19:18:50 +0300 + -- Timo Aaltonen Tue, 20 Jun 2017 19:27:20 +0300 -libinput (1.7.2-1ubuntu1) UNRELEASED; urgency=medium +libinput (1.7.3-1) unstable; urgency=medium - * Merge from Debian. - * Refresh patches. + * New upstream release. - -- Timo Aaltonen Wed, 17 May 2017 16:37:50 +0300 + -- Timo Aaltonen Tue, 20 Jun 2017 19:18:50 +0300 libinput (1.7.2-1) experimental; urgency=medium commit 76636da1c5edc0fa1edd5a45ccd20d7058cb9af5 Author: Timo Aaltonen Date: Tue Jun 20 19:19:03 2017 +0300 release to sid diff --git a/debian/changelog b/debian/changelog index 97b8616..411720c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libinput (1.7.3-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Tue, 20 Jun 2017 19:18:50 +0300 + libinput (1.7.2-1) experimental; urgency=medium * New upstream release. commit faf1a7b315e3292d78e6877a5c182fdd501918cf Author: Peter Hutterer Date: Fri Jun 9 10:12:05 2017 +1000 configure.ac: libinput 1.7.3 Signed-off-by: Peter Hutterer diff --git a/configure.ac b/configure.ac index 04c0755..51bd5a7 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.64]) m4_define([libinput_major_version], [1]) m4_define([libinput_minor_version], [7]) -m4_define([libinput_micro_version], [2]) +m4_define([libinput_micro_version], [3]) m4_define([libinput_version], [libinput_major_version.libinput_minor_version.libinput_micro_version]) @@ -36,7 +36,7 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz]) # b) If interfaces have been changed or added, but binary compatibility has #been preserved, change to C+1:0:A+1 # c) If the interface is the same as the previous version, change to C:R+1:A -LIBINPUT_LT_VERSION=22:4:12 +LIBINPUT_LT_VERSION=22:5:12 AC_SUBST(LIBINPUT_LT_VERSION) AM_SILENT_RULES([yes]) commit 183b67b69dc6a83cd8edc6c74550922af6509626 Author: Peter Hutterer Date: Tue May 9 15:07:20 2017 +1000 touchpad: pull the tap exclusion zone down to the full edge zone This was originally left outside of the button areas in case users tap in those zones, but we're getting false tap events in that zone. On a 100mm touchpad, the edge zone is merely 5mm, it's acceptable to ignore taps in that area even in the software button. We can revisit this if we see tap detection failures in the future. https://bugzilla.redhat.com/show_bug.cgi?id=1415796 Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede (cherry picked from commit 211bed2c25e4282820e5155191d4dc09201f1210) diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index 73f0fdd..cf9a511 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -544,15 +544,8 @@ tp_palm_tap_is_palm(const struct tp_dispatch *tp, const struct tp_touch *t) t->point.x < tp->palm.right_edge) return false; - /* We're inside the left/right palm edge and not in one of the -* software button areas */ - if (t->point.y < tp->buttons.bottom_area.top_edge) { - evdev_log_debug(tp->device, - "palm: palm-tap detected\n"); - return true; - } - - return false; + evdev_log_debug(tp->device, "palm: palm-tap detected\n"); + return true; } static bool diff --git a/test/test-touchpad.c b/test/test-touchpad.c index c0de99b..ecbdc43 100644 --- a/test/test-touchpad.c +++ b/test/test-touchpad.c @@ -1176,15 +1176,15 @@ START_TEST(touchpad_palm_detect_tap_softbuttons) litest_drain_events(li); - litest_touch_down(dev, 0, 95, 5); + litest_touch_down(dev, 0, 99, 99); litest_touch_up(dev, 0); litest_assert_empty_queue(li); -
libinput: Changes to 'ubuntu'
.gitignore |2 Makefile.am |3 autogen.sh |6 configure.ac | 30 debian/changelog | 49 debian/control |2 debian/libinput10.symbols |7 debian/patches/0001-libinput-add-orientation-and-size-of-touch-point-and.patch | 109 debian/patches/0002-extend-tools-to-print-and-display-touch-event-proper.patch | 29 debian/patches/0003-Fix-premature-flushing-of-evdev-event-on-mx4-touchsc.patch | 23 debian/patches/0004-Keep-stanza-for-new-symbols-on-version-0.22.0.patch | 15 debian/source/local-options |1 doc/Makefile.am |8 doc/building.dox | 79 doc/device-configuration-via-udev.dox |6 doc/faqs.dox | 31 doc/libinput.doxygen.in |6 doc/page-hierarchy.dox |3 doc/pointer-acceleration.dox |9 doc/style/header.html |2 doc/style/libinputdoxygen.css | 47 doc/svg/ptraccel-touchpad.svg | 1971 --- doc/switches.dox | 16 doc/tapping.dox | 10 doc/touchpad-pressure.dox | 138 doc/what-is-libinput.dox | 54 src/Makefile.am | 18 src/evdev-lid.c | 302 src/evdev-middle-button.c | 36 src/evdev-mt-touchpad-buttons.c | 64 src/evdev-mt-touchpad-edge-scroll.c | 37 src/evdev-mt-touchpad-gestures.c | 53 src/evdev-mt-touchpad-tap.c | 96 src/evdev-mt-touchpad.c | 512 - src/evdev-mt-touchpad.h | 51 src/evdev-tablet-pad-leds.c | 492 src/evdev-tablet-pad.c | 29 src/evdev-tablet-pad.h | 10 src/evdev-tablet.c | 114 src/evdev-tablet.h | 10 src/evdev.c | 586 - src/evdev.h | 242 src/filter-private.h |4 src/filter.c | 423 src/filter.h | 25 src/libinput-private.h | 69 src/libinput-util.c | 153 src/libinput-util.h | 21 src/libinput.c | 155 src/libinput.h | 187 src/libinput.sym |9 src/path-seat.c | 390 src/path-seat.h | 45 src/path.c | 385 src/path.h | 47 src/timer.c | 28
libinput: Changes to 'ubuntu'
Makefile.am|2 configure.ac | 44 debian/changelog | 19 +++ debian/control |1 doc/libinput.doxygen.in|3 - src/evdev-mt-touchpad.c| 40 +-- src/evdev.c| 52 +++ src/evdev.h| 43 +++- src/libinput-util.c| 97 - src/libinput-util.h| 75 src/path.c |2 src/udev-seat.c| 26 - test/Makefile.am |3 + test/litest.c | 28 -- test/misc.c| 95 test/touchpad-tap.c| 10 +-- test/touchpad.c| 28 +- udev/90-libinput-model-quirks.hwdb |8 +++ udev/Makefile.am |3 - 19 files changed, 482 insertions(+), 97 deletions(-) New commits: commit c2916e2acbcb42bd759b8e68e817fbbc62fe9fee Author: Timo AaltonenDate: Thu Dec 8 16:23:42 2016 +0200 release to zesty diff --git a/debian/changelog b/debian/changelog index 9075cf0..6b076b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libinput (1.5.3-1ubuntu1) zesty; urgency=medium + + * Merge from Debian. + + -- Timo Aaltonen Thu, 08 Dec 2016 16:22:20 +0200 + libinput (1.5.3-1) unstable; urgency=medium * New upstream release. commit c0df42d4780d19d539bd33deee75addf17079d21 Author: Timo Aaltonen Date: Thu Dec 8 16:18:31 2016 +0200 release to sid diff --git a/debian/changelog b/debian/changelog index 188419a..ba59dcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libinput (1.5.3-1) UNRELEASED; urgency=medium +libinput (1.5.3-1) unstable; urgency=medium * New upstream release. - -- Timo Aaltonen Thu, 08 Dec 2016 16:16:58 +0200 + -- Timo Aaltonen Thu, 08 Dec 2016 16:18:19 +0200 libinput (1.5.2-1) unstable; urgency=medium commit 578ecc62f68b1a6c2659ccd244db61e24f711731 Author: Timo Aaltonen Date: Thu Dec 8 16:18:13 2016 +0200 update changelog diff --git a/debian/changelog b/debian/changelog index 4390058..188419a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libinput (1.5.3-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Thu, 08 Dec 2016 16:16:58 +0200 + libinput (1.5.2-1) unstable; urgency=medium * New upstream release. commit 4e485470475fe120e398e49beb30e46b3a73f5c8 Author: Peter Hutterer Date: Wed Dec 7 14:23:34 2016 +1000 libinput 1.5.3 Signed-off-by: Peter Hutterer diff --git a/configure.ac b/configure.ac index 7c13a4e..b30a6fd 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.64]) m4_define([libinput_major_version], [1]) m4_define([libinput_minor_version], [5]) -m4_define([libinput_micro_version], [2]) +m4_define([libinput_micro_version], [3]) m4_define([libinput_version], [libinput_major_version.libinput_minor_version.libinput_micro_version]) @@ -35,7 +35,7 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz]) # b) If interfaces have been changed or added, but binary compatibility has #been preserved, change to C+1:0:A+1 # c) If the interface is the same as the previous version, change to C:R+1:A -LIBINPUT_LT_VERSION=20:3:10 +LIBINPUT_LT_VERSION=20:4:10 AC_SUBST(LIBINPUT_LT_VERSION) AM_SILENT_RULES([yes]) commit 9835acf7c76c2fb393b87e33585d917f7d056469 Author: Peter Hutterer Date: Mon Dec 5 13:39:42 2016 +1000 touchpad: sync BTN_TOOL_FINGER state on init The Elantech touchpad on my Asus Vivobook doesn't release BTN_TOOL_FINGER on up. If the touchpad was used before libinput initializes, the kernel filters the event because its state is already set. We never receive it and keep ignoring all events until the first switch to BTN_TOOL_DOUBLETAP and back. On touchpad init sync the BTN_TOOL_FINGER state and set it accordingly. This is the only event that can be legitimately down on init. We don't care about BTN_TOUCH because ignoring an ongoing touch on init is generally a good idea and we can ignore any multifinger gesture as well. Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede (cherry picked from commit 5552a6f145b9cb9d8e00f2fdf25e0acb75fe6c72) diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index af2a2cd..05e2ae5 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -1829,6 +1829,14 @@
libinput: Changes to 'ubuntu'
README.txt | 14 configure.ac | 33 debian/changelog | 22 debian/libinput10.symbols |4 debian/patches/0001-libinput-add-orientation-and-size-of-touch-point-and.patch | 1601 ++ debian/patches/0002-extend-tools-to-print-and-display-touch-event-proper.patch | 141 debian/patches/0003-Fix-premature-flushing-of-evdev-event-on-mx4-touchsc.patch | 171 + debian/patches/0004-Keep-stanza-for-new-symbols-on-version-0.22.0.patch | 61 debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch | 164 - debian/patches/series |6 debian/patches/touch-point-orientation-size.patch | 1587 - debian/upstream/signing-key.asc | 24 debian/watch |2 doc/Makefile.am |3 doc/building.dox | 100 doc/contributing.dox | 18 doc/libinput.doxygen.in |1 doc/middle-button-emulation.dox | 34 doc/page-hierarchy.dox |6 doc/pointer-acceleration.dox | 25 doc/reporting-bugs.dox | 113 doc/tablet-support.dox | 13 doc/test-suite.dox | 21 src/evdev-mt-touchpad-buttons.c | 113 src/evdev-mt-touchpad-edge-scroll.c | 21 src/evdev-mt-touchpad-gestures.c |5 src/evdev-mt-touchpad-tap.c | 82 src/evdev-mt-touchpad.c | 280 + src/evdev-mt-touchpad.h | 27 src/evdev-tablet-pad.c |1 src/evdev-tablet.c | 94 src/evdev-tablet.h |5 src/evdev.c | 1232 --- src/evdev.h | 156 src/libinput-private.h | 26 src/libinput-uninstalled.pc.in | 10 src/libinput-util.c | 34 src/libinput-util.h | 17 src/libinput.c | 47 src/libinput.h | 105 src/libinput.sym |6 test/Makefile.am | 109 test/device.c | 129 test/gestures.c |4 test/keyboard.c |2 test/litest-device-mouse-wheel-click-angle.c |3 test/litest-device-mouse-wheel-click-count.c | 77 test/litest-device-synaptics.c |4 test/litest-device-wacom-cintiq-13hdt-finger.c | 10 test/litest-device-wacom-cintiq-13hdt-pad.c |3 test/litest-device-wacom-cintiq-13hdt-pen.c | 10 test/litest-device-wacom-intuos-finger.c | 10 test/litest-device-wacom-intuos-tablet.c | 10 test/litest-device-wacom-intuos5-pad.c |1 test/litest.c | 588 ++- test/litest.h
libinput: Changes to 'ubuntu'
README.txt | 17 configure.ac|4 - debian/changelog| 12 +++ doc/faqs.dox| 48 doc/libinput.doxygen.in |1 src/evdev-mt-touchpad-edge-scroll.c |3 src/evdev-mt-touchpad.c | 34 - src/evdev-mt-touchpad.h |1 src/evdev-tablet.c | 25 -- src/evdev.c | 20 + src/evdev.h |2 test/Makefile.am|3 test/litest-device-wacom-hid4800-pen.c | 119 test/litest.c |8 ++ test/litest.h |4 + test/tablet.c | 88 +++ test/touchpad-tap.c | 12 +-- test/touchpad.c | 59 +++ test/trackpoint.c | 98 ++ udev/80-libinput-device-groups.rules.in |1 udev/90-libinput-model-quirks.hwdb | 12 +++ 21 files changed, 551 insertions(+), 20 deletions(-) New commits: commit eb7aaa4a21d3b56eb1e326df989ac798e0d9e024 Author: Timo AaltonenDate: Fri Sep 30 15:26:16 2016 +0300 upload to yak diff --git a/debian/changelog b/debian/changelog index 6e18943..8c937a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libinput (1.4.3-0ubuntu1) yakkety; urgency=medium + + * New upstream bugfix release. + + -- Timo Aaltonen Wed, 28 Sep 2016 15:44:08 +0300 + libinput (1.4.1-1) unstable; urgency=medium * New upstream release commit 8f525f358342af43bfaf654cdc9af10c2dc88495 Author: Peter Hutterer Date: Thu Sep 22 18:04:23 2016 +1000 configure.ac: libinput 1.4.3 Signed-off-by: Peter Hutterer diff --git a/configure.ac b/configure.ac index 844c4e2..71fe6e2 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.64]) m4_define([libinput_major_version], [1]) m4_define([libinput_minor_version], [4]) -m4_define([libinput_micro_version], [2]) +m4_define([libinput_micro_version], [3]) m4_define([libinput_version], [libinput_major_version.libinput_minor_version.libinput_micro_version]) @@ -35,7 +35,7 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz]) # b) If interfaces have been changed or added, but binary compatibility has #been preserved, change to C+1:0:A+1 # c) If the interface is the same as the previous version, change to C:R+1:A -LIBINPUT_LT_VERSION=19:3:9 +LIBINPUT_LT_VERSION=19:4:9 AC_SUBST(LIBINPUT_LT_VERSION) AM_SILENT_RULES([yes]) commit b8f05776e9cb33056e0d88fe21fe1fbe5f9989e5 Author: Peter Hutterer Date: Wed Sep 7 08:18:33 2016 +1000 touchpad: require at least 3 events before enabling trackpoint palm detection Some trackpoints, notably the one on the Lenovo T460s have a tendency to send the odd event even when they're not actually used. Trackpoint events trigger palm detection (see 0210f1fee193) and thus effectively disable the touchpad, causing the touchpad to appear nonresponsive. Fix this by requiring at least 3 events from a trackpoint before palm detection is enabled. For normal use it's hard enough to trigger a single event anyway so this should not affect the normal use-case. https://bugzilla.redhat.com/show_bug.cgi?id=1364850 Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede (cherry picked from commit 416fa44d80b0f2c53b652ddfa35dd4a156a65c65) diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index eedbd3b..8598234 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -1298,6 +1298,7 @@ tp_trackpoint_timeout(uint64_t now, void *data) tp_tap_resume(tp, now); tp->palm.trackpoint_active = false; + tp->palm.trackpoint_event_count = 0; } static void @@ -1310,6 +1311,13 @@ tp_trackpoint_event(uint64_t time, struct libinput_event *event, void *data) if (event->type == LIBINPUT_EVENT_POINTER_BUTTON) return; + tp->palm.trackpoint_last_event_time = time; + tp->palm.trackpoint_event_count++; + + /* Require at least three events before enabling palm detection */ + if (tp->palm.trackpoint_event_count < 3) + return; + if (!tp->palm.trackpoint_active) { tp_edge_scroll_stop_events(tp, time); tp_gesture_cancel(tp, time); @@ -1317,7 +1325,6 @@ tp_trackpoint_event(uint64_t time, struct libinput_event *event, void *data) tp->palm.trackpoint_active = true; } - tp->palm.trackpoint_last_event_time = time;
libinput: Changes to 'ubuntu'
debian/changelog |6 ++ debian/patches/touch-point-orientation-size.patch | 15 --- 2 files changed, 6 insertions(+), 15 deletions(-) New commits: commit 83db762de1f98ac78418c176d2aafb26d1cc1d0d Author: Timo AaltonenDate: Tue Aug 2 12:18:06 2016 +0300 touch-point-orientation-size.patch: Drop conflicting deg2rad. diff --git a/debian/changelog b/debian/changelog index e78e99f..74c9a7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libinput (1.4.0-1ubuntu2) yakkety; urgency=medium + + * touch-point-orientation-size.patch: Drop conflicting deg2rad. + + -- Timo Aaltonen Tue, 02 Aug 2016 12:16:25 +0300 + libinput (1.4.0-1ubuntu1) yakkety; urgency=medium * Merge from Debian. diff --git a/debian/patches/touch-point-orientation-size.patch b/debian/patches/touch-point-orientation-size.patch index 26992a9..0d74dd9 100644 --- a/debian/patches/touch-point-orientation-size.patch +++ b/debian/patches/touch-point-orientation-size.patch @@ -819,21 +819,6 @@ Signed-off-by: Andreas Pokorny void touch_notify_touch_up(struct libinput_device *device, a/src/libinput-util.h -+++ b/src/libinput-util.h -@@ -148,6 +148,12 @@ msleep(unsigned int ms) - usleep(ms * 1000); - } - -+static inline double -+deg2rad(double angle) -+{ -+ return angle * M_PI/180.0; -+} -+ - static inline int - long_bit_is_set(const unsigned long *array, int bit) - { --- a/src/libinput.c +++ b/src/libinput.c @@ -112,6 +112,8 @@ struct libinput_event_touch {
libinput: Changes to 'ubuntu'
.gitignore|2 configure.ac | 57 debian/changelog | 20 debian/libinput10.symbols | 20 debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch |2 debian/patches/touch-point-orientation-size.patch | 50 doc/Makefile.am | 30 doc/absolute-coordinate-ranges.dox| 119 + doc/clickpad-softbuttons.dox |4 doc/faqs.dox | 31 doc/page-hierarchy.dox|1 doc/svg/tablet-cintiq24hd-modes.svg | 460 ++ doc/svg/tablet-intuos-modes.svg | 321 doc/tablet-support.dox| 59 src/Makefile.am |1 src/evdev-middle-button.c | 16 src/evdev-mt-touchpad-buttons.c | 136 +- src/evdev-mt-touchpad-edge-scroll.c | 30 src/evdev-mt-touchpad-gestures.c | 40 src/evdev-mt-touchpad.c | 255 ++- src/evdev-mt-touchpad.h | 11 src/evdev-tablet-pad-leds.c | 177 ++ src/evdev-tablet-pad.c| 86 + src/evdev-tablet-pad.h| 18 src/evdev-tablet.c| 54 src/evdev-tablet.h|6 src/evdev.c | 179 +- src/evdev.h | 54 src/filter.c | 80 + src/libinput-private.h| 38 src/libinput-util.h | 52 src/libinput.c| 260 +++ src/libinput.h| 674 +++--- src/libinput.sym | 22 test/Makefile.am | 16 test/device.c | 16 test/gestures.c | 10 test/litest-device-alps-dualpoint.c | 11 test/litest-device-apple-magicmouse.c | 104 + test/litest-device-keyboard-all-codes.c | 76 + test/litest-device-logitech-trackball.c |2 test/litest-device-synaptics-i2c.c| 11 test/litest-device-wacom-cintiq-13hdt-finger.c| 102 + test/litest-device-wacom-cintiq-13hdt-pad.c | 121 + test/litest-device-wacom-cintiq-13hdt-pen.c | 147 ++ test/litest-device-wacom-cintiq-24hdt-pad.c | 148 ++ test/litest-device-wacom-ekr.c| 132 + test/litest.c | 133 + test/litest.h | 41 test/pad.c| 234 +++ test/pointer.c| 16 test/tablet.c |4 test/touchpad-buttons.c | 233 +++ test/touchpad.c | 258 ++- test/trackball.c | 273 tools/Makefile.am |2 tools/event-debug.c | 47 tools/event-gui.c |2 tools/libinput-list-devices.c | 48 udev/90-libinput-model-quirks.hwdb| 40 60 files changed, 4976 insertions(+), 616 deletions(-) New commits: commit 45ddc511b9fa7a99e920894da351e0796cbfa88a Author: Timo AaltonenDate: Tue Aug 2 10:53:37 2016 +0300 release to yak diff --git a/debian/changelog b/debian/changelog index 9cd7b00..e78e99f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libinput (1.4.0-1ubuntu1) yakkety; urgency=medium + + * Merge from Debian.
libinput: Changes to 'ubuntu'
configure.ac | 10 debian/changelog | 43 debian/control| 41 debian/copyright | 49 debian/libinput-bin.install |1 debian/libinput10-udeb.install|1 debian/libinput10.symbols | 18 debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch | 10 debian/patches/series |1 debian/patches/touch-point-orientation-size.patch | 128 -- debian/patches/touchpad-add-a-middle-button-software-area.diff| 302 debian/rules | 11 doc/Makefile.am | 13 doc/clickpad-softbuttons.dox | 14 doc/page-hierarchy.dox|1 doc/svg/software-buttons.svg | 30 doc/svg/tablet-interfaces.svg | 325 + doc/svg/tablet-left-handed.svg| 469 +++ doc/tablet-support.dox| 79 + doc/touchpad-jumping-cursors.dox | 54 src/Makefile.am |2 src/evdev-mt-touchpad-buttons.c | 31 src/evdev-mt-touchpad-gestures.c |2 src/evdev-mt-touchpad.c | 71 - src/evdev-mt-touchpad.h |3 src/evdev-tablet-pad.c| 624 ++ src/evdev-tablet-pad.h| 69 + src/evdev-tablet.c| 88 - src/evdev-tablet.h|2 src/evdev.c | 268 +++- src/evdev.h | 36 src/libinput-private.h| 26 src/libinput-util.h |5 src/libinput.c| 257 src/libinput.h| 363 + src/libinput.sym | 18 src/timer.c |3 test/Makefile.am |8 test/gestures.c |8 test/keyboard.c | 42 test/litest-device-generic-singletouch.c |1 test/litest-device-synaptics-x1-carbon-3rd.c | 11 test/litest-device-touchscreen-fuzz.c | 96 + test/litest-device-wacom-intuos3-pad.c| 117 + test/litest-device-wacom-intuos5-pad.c| 122 + test/litest-int.h | 16 test/litest.c | 272 test/litest.h | 134 +- test/misc.c | 51 test/pad.c| 431 ++ test/path.c |2 test/pointer.c| 148 ++ test/tablet.c | 72 + test/touch.c | 50 test/touchpad-buttons.c | 30 test/touchpad.c | 112 + test/trackpoint.c |1 tools/event-debug.c | 91 + tools/event-gui.c | 46 tools/publish-doc |9 udev/90-libinput-model-quirks.hwdb| 36 61 files changed, 4654 insertions(+), 720 deletions(-) New commits: commit e36c3a424b9bdcce7d427a10f11afed62c5cc9fb Author: Timo AaltonenDate: Wed Jun 8 10:58:06 2016 +0300 release to yakkety diff --git a/debian/changelog b/debian/changelog index dcdc675..aacd389 100644 --- a/debian/changelog +++ b/debian/changelog @@
libinput: Changes to 'ubuntu'
configure.ac |4 debian/changelog | 14 debian/patches/series |1 debian/patches/touchpad-add-a-middle-button-software-area.diff | 302 ++ doc/t440-support.dox |2 doc/tablet-support.dox |3 src/evdev-mt-touchpad-buttons.c| 23 src/evdev-mt-touchpad-gestures.c |3 src/evdev-mt-touchpad.c|5 src/evdev-tablet.c |4 src/evdev.c|2 src/filter.c |2 src/libinput.c |2 src/libinput.h | 12 test/tablet.c | 10 test/trackpoint.c | 132 16 files changed, 492 insertions(+), 29 deletions(-) New commits: commit 6aef4eeecb3ed23fd4f0513546afaa0055cd6b67 Author: Timo AaltonenDate: Thu Apr 14 13:18:13 2016 +0300 release to xenial diff --git a/debian/changelog b/debian/changelog index 56bf389..ed5d3d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libinput (1.2.3-1ubuntu1) UNRELEASED; urgency=medium +libinput (1.2.3-1ubuntu1) xenial; urgency=medium * Merge from debian. * touchpad-add-a-middle-button-software-area.diff: Add a software area for middle-button emulation. (LP: #1570282) - -- Timo Aaltonen Thu, 14 Apr 2016 12:28:32 +0300 + -- Timo Aaltonen Thu, 14 Apr 2016 13:17:43 +0300 libinput (1.2.3-1) unstable; urgency=medium commit 2641c775d55fe591bcbcbe568c03b2016ecbe0e6 Author: Timo Aaltonen Date: Thu Apr 14 13:17:40 2016 +0300 add middle-button area diff --git a/debian/changelog b/debian/changelog index 0dcc1d6..56bf389 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libinput (1.2.3-1ubuntu1) UNRELEASED; urgency=medium + + * Merge from debian. + * touchpad-add-a-middle-button-software-area.diff: Add a software area +for middle-button emulation. (LP: #1570282) + + -- Timo Aaltonen Thu, 14 Apr 2016 12:28:32 +0300 + libinput (1.2.3-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/series b/debian/patches/series index 63b23e6..1b21a7f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ touch-point-orientation-size.patch fix-premature-flushing-of-evdev-event-on-mx4.patch +touchpad-add-a-middle-button-software-area.diff diff --git a/debian/patches/touchpad-add-a-middle-button-software-area.diff b/debian/patches/touchpad-add-a-middle-button-software-area.diff new file mode 100644 index 000..441148a --- /dev/null +++ b/debian/patches/touchpad-add-a-middle-button-software-area.diff @@ -0,0 +1,302 @@ +commit 886b5a2cd8c785e48ddf5ceb4a902cd1f518d2a9 +Author: Peter Hutterer +Date: Mon Apr 4 10:06:36 2016 +1000 + +touchpad: add a middle button software area + +Middle button interaction is most commonly to paste and it is a single-event +interaction (button press). We provided middle button in software button mode +by emulating it with a two-finger press with L+R down at the same time. This +is also what many touchpads are spectacularly bad at, it is very common to +detect the physical button down event before the second finger registers, +resulting in left or right clicks where a middle button should be triggered. + +Unless the fingers are resting on the touchpad for at least one scanout, the +success rate for middle button emulation is only at 70% or so. + +This patch adds a 25%-width middle button area between the left and the right +software button, everything else stays the same. To avoid immediate breakage, +the middle button emulation remains but may be removed in the future. +The doc is updated to only refer to the middle button area now. + +https://bugs.freedesktop.org/show_bug.cgi?id=94755 + +Signed-off-by: Peter Hutterer +Reviewed-by: Hans de Goede + +diff --git a/doc/clickpad-softbuttons.dox b/doc/clickpad-softbuttons.dox +index a4f2e44..cf4c8c9 100644 +--- a/doc/clickpad-softbuttons.dox b/doc/clickpad-softbuttons.dox +@@ -20,16 +20,20 @@ generated by libinput and passed to the caller in response to a click. + @section software_buttons Software button areas + + On most clickpads, this is the default behavior. The bottom of the touchpad +-is split in the
libinput: Changes to 'ubuntu'
.gitignore|1 configure.ac | 17 debian/changelog | 33 debian/control|1 debian/libinput10.symbols | 52 debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch |2 debian/patches/touch-point-orientation-size.patch | 58 doc/Makefile.am |1 doc/absolute-axes.dox | 18 doc/device-configuration-via-udev.dox |4 doc/gestures.dox | 38 doc/normalization-of-relative-motion.dox |8 doc/page-hierarchy.dox|4 doc/pointer-acceleration.dox |6 doc/svg/gesture-2fg-ambiguity.svg | 496 + doc/svg/pinch-gestures-softbuttons.svg| 365 doc/svg/tablet-axes.svg | 564 + doc/svg/tablet-out-of-bounds.svg | 271 doc/svg/tablet.svg| 199 doc/tablet-support.dox| 211 doc/tapping.dox |6 doc/touchpad-tap-state-machine.svg| 1467 ++- src/Makefile.am |4 src/evdev-mt-touchpad-buttons.c | 27 src/evdev-mt-touchpad-edge-scroll.c |5 src/evdev-mt-touchpad-gestures.c | 395 - src/evdev-mt-touchpad-tap.c | 57 src/evdev-mt-touchpad.c | 237 src/evdev-mt-touchpad.h | 51 src/evdev-tablet.c| 1691 src/evdev-tablet.h| 204 src/evdev.c | 95 src/evdev.h | 26 src/filter.c | 94 src/filter.h |3 src/libinput-private.h| 100 src/libinput-util.h | 56 src/libinput.c| 826 ++ src/libinput.h| 1011 ++ src/libinput.sym | 55 test/Makefile.am | 18 test/device.c | 103 test/gestures.c | 892 ++ test/litest-device-anker-mouse-kbd.c | 225 test/litest-device-apple-internal-keyboard.c | 239 test/litest-device-cyborg-rat-5.c | 71 test/litest-device-huion-pentablet.c | 113 test/litest-device-synaptics-hover.c |2 test/litest-device-synaptics-i2c.c| 102 test/litest-device-wacom-bamboo-tablet.c | 119 test/litest-device-wacom-cintiq-24hd.c| 147 test/litest-device-wacom-cintiq-tablet.c | 158 test/litest-device-wacom-intuos-tablet.c | 163 test/litest-device-wacom-isdv4-tablet.c | 112 test/litest-device-waltop-tablet.c| 241 test/litest-device-yubikey.c | 169 test/litest-int.h |8 test/litest-selftest.c|4 test/litest.c | 188 test/litest.h | 597 + test/misc.c | 114 test/path.c | 60 test/pointer.c| 10 test/tablet.c | 3680 ++ test/touchpad-tap.c | 296 test/touchpad.c | 485 + test/udev.c
libinput: Changes to 'ubuntu'
configure.ac |4 +- debian/changelog | 12 +++ src/evdev.c | 15 + src/libinput.h |2 + test/misc.c | 83 +++ 5 files changed, 114 insertions(+), 2 deletions(-) New commits: commit 167a360e3e4201204aadce949aa5d98969b220ce Author: Timo AaltonenDate: Wed Jan 20 12:42:52 2016 +0200 release to xenial diff --git a/debian/changelog b/debian/changelog index 5598b40..214656b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libinput (1.1.4-1ubuntu1) xenial; urgency=medium + + * Merge from debian. + + -- Timo Aaltonen Wed, 20 Jan 2016 12:42:12 +0200 + libinput (1.1.4-1) unstable; urgency=medium * New upstream release. commit 6976558ad785fa431208064494e0c9518f280243 Author: Timo Aaltonen Date: Thu Jan 14 14:14:10 2016 +0200 upload to unstable diff --git a/debian/changelog b/debian/changelog index e9d8135..6706bc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libinput (1.1.4-1) UNRELEASED; urgency=medium +libinput (1.1.4-1) unstable; urgency=medium * New upstream release. - -- Timo Aaltonen Wed, 13 Jan 2016 16:37:39 +0200 + -- Timo Aaltonen Thu, 14 Jan 2016 14:13:45 +0200 libinput (1.1.3-1) unstable; urgency=medium commit 6bf08ff96cc5b6b4ffdb95b95418ad2009dd924a Author: Timo Aaltonen Date: Wed Jan 13 16:41:41 2016 +0200 update the changelog diff --git a/debian/changelog b/debian/changelog index 288102e..e9d8135 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libinput (1.1.4-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Wed, 13 Jan 2016 16:37:39 +0200 + libinput (1.1.3-1) unstable; urgency=medium [ Andreas Boll ] commit a340736e9b9399f630ff4b436930c1dee26cb803 Author: Peter Hutterer Date: Tue Dec 22 11:18:07 2015 +1000 configure.ac: libinput 1.1.4 Signed-off-by: Peter Hutterer diff --git a/configure.ac b/configure.ac index 92f3e22..711aa42 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.64]) m4_define([libinput_major_version], [1]) m4_define([libinput_minor_version], [1]) -m4_define([libinput_micro_version], [3]) +m4_define([libinput_micro_version], [4]) m4_define([libinput_version], [libinput_major_version.libinput_minor_version.libinput_micro_version]) @@ -31,7 +31,7 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz]) # b) If interfaces have been changed or added, but binary compatibility has #been preserved, change to C+1:0:A+1 # c) If the interface is the same as the previous version, change to C:R+1:A -LIBINPUT_LT_VERSION=16:3:6 +LIBINPUT_LT_VERSION=16:4:6 AC_SUBST(LIBINPUT_LT_VERSION) AM_SILENT_RULES([yes]) commit 7ca6a7b13cf92776846bef866e5d73beac43fc99 Author: Peter Hutterer Date: Tue Dec 22 11:03:55 2015 +1000 doc: add missing @config tag to libinput_config_send_event_modes Signed-off-by: Peter Hutterer diff --git a/src/libinput.h b/src/libinput.h index 9057446..79d6e90 100644 --- a/src/libinput.h +++ b/src/libinput.h @@ -2371,6 +2371,8 @@ libinput_device_config_calibration_get_default_matrix(struct libinput_device *de float matrix[6]); /** + * @ingroup config + * * The send-event mode of a device defines when a device may generate events * and pass those events to the caller. */ commit 30df66d0a6dfd36f760a32394d5ddb8a45a92403 Author: Peter Hutterer Date: Wed Dec 16 10:48:39 2015 +1000 evdev: drain any pending evdev events on a device open_restricted() doesn't always mean 'open the fd'. When the X server uses systemd-logind, the fd is opened once before PreInit and then kept open across devices being disabled and enabled through the protocol. When the device is re-enabled and libinput_path_add_device is called for the device, we may have events pending on the fd, leaking information that we should just ignore. There's also the potential of inconsistent state. The kernel updates the device state whenever it processes an event, the evdev ioctls return that state. If events are pending, the state we see is newer than the events we process immediately after initialization. That can lead to confusion. Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede diff --git a/src/evdev.c b/src/evdev.c index 9fecdc4..3708072 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -2202,6 +2202,17 @@ evdev_set_device_group(struct evdev_device *device, return 0; } +static inline void +evdev_drain_fd(int fd)
libinput: Changes to 'ubuntu'
configure.ac |4 debian/changelog | 26 debian/control| 30 debian/libinput-tools.install |2 debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch | 19 debian/patches/touch-point-orientation-size.patch | 24 doc/device-configuration-via-udev.dox | 18 doc/palm-detection.dox|5 doc/svg/edge-scrolling.svg|2 doc/svg/twofinger-scrolling.svg |2 src/evdev-mt-touchpad-gestures.c |2 src/evdev-mt-touchpad.c |6 src/evdev.c | 63 + src/evdev.h |1 src/libinput-util.h |2 src/libinput.c|2 test/Makefile.am |2 test/gestures.c |8 test/litest-device-asus-rog-gladius.c | 334 ++ test/litest-device-mouse-wheel-click-angle.c | 74 ++ test/litest.c | 65 + test/litest.h | 19 test/pointer.c| 34 - test/touchpad.c | 99 ++ tools/event-debug.c | 18 udev/90-libinput-model-quirks.hwdb| 12 26 files changed, 776 insertions(+), 97 deletions(-) New commits: commit b4654b3daaca631c1fc058c61a690090f022fb47 Author: Timo AaltonenDate: Thu Dec 17 16:15:58 2015 +0200 release to xenial diff --git a/debian/changelog b/debian/changelog index da38120..31d6954 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libinput (1.1.3-1ubuntu1) UNRELEASED; urgency=medium +libinput (1.1.3-1ubuntu1) xenial; urgency=medium * Merge from debian. * patches: Refreshed. - -- Timo Aaltonen Thu, 17 Dec 2015 16:12:19 +0200 + -- Timo Aaltonen Thu, 17 Dec 2015 16:15:47 +0200 libinput (1.1.3-1) unstable; urgency=medium commit 80fffb5d25fe6432f9dd8d9388126c9ca9751c2d Author: Timo Aaltonen Date: Thu Dec 17 16:14:53 2015 +0200 add libinput-tools.install.. diff --git a/debian/libinput-tools.install b/debian/libinput-tools.install new file mode 100644 index 000..68671de --- /dev/null +++ b/debian/libinput-tools.install @@ -0,0 +1,2 @@ +usr/bin/* +usr/share/man/man1/* commit 6e9a9ed2e27d0109ac0ad9a64e0dfeb32d64d821 Author: Timo Aaltonen Date: Thu Dec 17 16:13:42 2015 +0200 refresh patches diff --git a/debian/changelog b/debian/changelog index 0e5b5ef..da38120 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libinput (1.1.3-1ubuntu1) UNRELEASED; urgency=medium + + * Merge from debian. + * patches: Refreshed. + + -- Timo Aaltonen Thu, 17 Dec 2015 16:12:19 +0200 + libinput (1.1.3-1) unstable; urgency=medium [ Andreas Boll ] diff --git a/debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch b/debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch index 790c144..e1fb1d6 100644 --- a/debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch +++ b/debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch @@ -15,20 +15,9 @@ Signed-off-by: Andreas Pokorny test/touch.c | 110 +++ 2 files changed, 115 insertions(+), 5 deletions(-) -diff --git a/src/evdev.c b/src/evdev.c -index 04df275..3e22aa9 100644 --- a/src/evdev.c +++ b/src/evdev.c -@@ -557,7 +557,7 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) - static enum evdev_key_type - get_key_type(uint16_t code) - { -- if (code == BTN_TOUCH) -+ if (code >= BTN_DIGI && code <= BTN_TOOL_QUADTAP) - return EVDEV_KEY_TYPE_NONE; - - if (code >= KEY_ESC && code <= KEY_MICMUTE) -@@ -630,16 +630,16 @@ evdev_process_key(struct evdev_device *device, +@@ -654,16 +654,16 @@ evdev_process_key(struct evdev_device *d if (e->value == 2) return; @@ -49,11 +38,9 @@ index 04df275..3e22aa9 100644 /* Ignore key release events from the kernel for keys that libinput * never got a pressed event for. */ if (e->value == 0) {
libinput: Changes to 'ubuntu'
debian/changelog |9 debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch | 179 debian/patches/series |1 debian/patches/touch-point-orientation-size.patch | 220 +- 4 files changed, 303 insertions(+), 106 deletions(-) New commits: commit 0ce381ef522eedfebdee70b944bc1afd36eeffe8 Author: Timo AaltonenDate: Thu Nov 5 11:03:26 2015 +0200 fix-premature-flushing-of-evdev-event-on-mx4.patch: Added. (LP: #1504168) diff --git a/debian/changelog b/debian/changelog index 55fa12a..b6a1e94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ libinput (1.1.0-1ubuntu2) UNRELEASED; urgency=medium * touch-point-orientation-size.patch: Updated to v8 from list, but use old version for symbols. + * fix-premature-flushing-of-evdev-event-on-mx4.patch: Added. (LP: +#1504168) -- Timo Aaltonen Thu, 05 Nov 2015 11:01:40 +0200 diff --git a/debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch b/debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch new file mode 100644 index 000..790c144 --- /dev/null +++ b/debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch @@ -0,0 +1,179 @@ +Subject: [PATCH v2 libinput] Fix premature flushing of evdev event on mx4 touchscreen +From: Andreas Pokorny +Date: 07.09.2015 22:57 +To: peter.hutte...@who-t.net, wayland-de...@lists.freedesktop.org +CC: Andreas Pokorny + +The mx4 touchscreen driver emits BTN_TOUCH and BTN_TOOL_FINGER key events +on a new contact. Prior to this patch only the BTN_TOUCH event was filtered +out. Now the whole range of BTN_ events for tool types and certain builtin +multi finger gestures are marked as non-key type. + +Signed-off-by: Andreas Pokorny +--- + src/evdev.c | 10 +++--- + test/touch.c | 110 +++ + 2 files changed, 115 insertions(+), 5 deletions(-) + +diff --git a/src/evdev.c b/src/evdev.c +index 04df275..3e22aa9 100644 +--- a/src/evdev.c b/src/evdev.c +@@ -557,7 +557,7 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) + static enum evdev_key_type + get_key_type(uint16_t code) + { +- if (code == BTN_TOUCH) ++ if (code >= BTN_DIGI && code <= BTN_TOOL_QUADTAP) + return EVDEV_KEY_TYPE_NONE; + + if (code >= KEY_ESC && code <= KEY_MICMUTE) +@@ -630,16 +630,16 @@ evdev_process_key(struct evdev_device *device, + if (e->value == 2) + return; + +- if (e->code == BTN_TOUCH) { +- if (!device->is_mt) ++ type = get_key_type(e->code); ++ ++ if (type == EVDEV_KEY_TYPE_NONE) { ++ if (e->code == BTN_TOUCH && !device->is_mt) + evdev_process_touch_button(device, time, e->value); + return; + } + + evdev_flush_pending_event(device, time); + +- type = get_key_type(e->code); +- + /* Ignore key release events from the kernel for keys that libinput +* never got a pressed event for. */ + if (e->value == 0) { +diff --git a/test/touch.c b/test/touch.c +index 875d94d..0e7f893 100644 +--- a/test/touch.c b/test/touch.c +@@ -912,6 +912,114 @@ START_TEST(touch_point_no_minor_or_orientation) + } + END_TEST + ++START_TEST(touchscreen_with_btn_tool_finger_on_down) ++{ ++ struct libevdev_uinput *uinput; ++ struct libinput *li; ++ struct libinput_device *device; ++ struct libinput_event *event; ++ struct libinput_event_touch *tev; ++ const struct input_absinfo abs[] = { ++ { ABS_X, 0, 1152, 0, 0, 0 }, ++ { ABS_Y, 0, 1920, 0, 0, 0 }, ++ { ABS_MT_SLOT, 0, 9, 0, 0, 0 }, ++ { ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 }, ++ { ABS_MT_POSITION_X, 0, 1152, 0, 0, 0 }, ++ { ABS_MT_POSITION_Y, 0, 1920, 0, 0, 0 }, ++ { ABS_MT_TOUCH_MAJOR, 0, 23, 0, 0, 0 }, ++ { ABS_MT_TOUCH_MINOR, 0, 23, 0, 0, 0 }, ++ { -1, -1, -1, -1, -1, -1 } ++ }; ++ const struct input_event input_sequence[] = { ++ { {0}, EV_ABS, ABS_MT_SLOT, 0}, ++ { {0}, EV_ABS, ABS_MT_TRACKING_ID, 9}, ++ { {0}, EV_KEY, BTN_TOUCH, 1}, ++ { {0}, EV_KEY, BTN_TOOL_FINGER, 1}, ++ { {0}, EV_ABS, ABS_MT_POSITION_X, 128}, ++ { {0}, EV_ABS, ABS_MT_POSITION_Y, 240}, ++ { {0}, EV_ABS, ABS_MT_TOUCH_MAJOR, 5}, ++ { {0}, EV_ABS, ABS_MT_TOUCH_MINOR, 4}, ++ { {0}, EV_SYN, SYN_REPORT, 0}, ++ { {0}, EV_ABS, ABS_MT_TOUCH_MAJOR, 6}, ++ { {0}, EV_SYN, SYN_REPORT, 0}, ++ { {0}, EV_ABS, ABS_MT_TRACKING_ID, -1}, ++ { {0}, EV_KEY,
libinput: Changes to 'ubuntu'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6408134c71c3384cd97b9efb476773f7cde01d2e Author: Timo AaltonenDate: Thu Nov 5 15:25:32 2015 +0200 release to xenial diff --git a/debian/changelog b/debian/changelog index b6a1e94..84b3a98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libinput (1.1.0-1ubuntu2) UNRELEASED; urgency=medium +libinput (1.1.0-1ubuntu2) xenial; urgency=medium * touch-point-orientation-size.patch: Updated to v8 from list, but use old version for symbols. * fix-premature-flushing-of-evdev-event-on-mx4.patch: Added. (LP: #1504168) - -- Timo Aaltonen Thu, 05 Nov 2015 11:01:40 +0200 + -- Timo Aaltonen Thu, 05 Nov 2015 15:16:20 +0200 libinput (1.1.0-1ubuntu1) xenial; urgency=medium
libinput: Changes to 'ubuntu'
configure.ac | 27 debian/changelog | 12 doc/Makefile.am |6 doc/absolute-axes.dox|2 doc/dot/evemu.gv | 19 doc/faqs.dox |2 doc/gestures.dox |2 doc/normalization-of-relative-motion.dox |6 doc/page-hierarchy.dox |1 doc/palm-detection.dox |4 doc/pointer-acceleration.dox | 110 doc/reporting-bugs.dox |8 doc/seats.dox|4 doc/svg/ptraccel-linear.svg | 5486 +++ doc/svg/ptraccel-low-dpi.svg | 3748 + doc/svg/ptraccel-touchpad.svg| 1723 + doc/svg/ptraccel-trackpoint.svg | 3689 doc/tapping.dox |2 doc/tools.dox|4 doc/touchpads.dox|6 src/evdev-middle-button.c|4 src/evdev-mt-touchpad-edge-scroll.c | 23 src/evdev-mt-touchpad-gestures.c |3 src/evdev-mt-touchpad.c | 27 src/evdev-mt-touchpad.h |4 src/evdev.c | 71 src/evdev.h | 11 src/filter-private.h |8 src/filter.c | 591 ++- src/filter.h | 44 src/libinput-private.h | 14 src/libinput-util.h |6 src/libinput.c | 30 src/libinput.h | 12 test/device.c| 155 test/litest-int.h|4 test/litest.c| 21 test/touchpad.c | 111 tools/Makefile.am|2 tools/make-ptraccel-graphs.sh| 79 tools/ptraccel-debug.c | 48 tools/shared.c | 244 - udev/libinput-model-quirks.c |2 43 files changed, 15992 insertions(+), 383 deletions(-) New commits: commit 3a9fc5c482ec51047526f47d851af356e48b0e3a Author: Timo AaltonenDate: Fri Sep 25 05:48:40 2015 +0300 release to wily diff --git a/debian/changelog b/debian/changelog index b4520e7..f1ff48f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libinput (1.0.1-1ubuntu1) UNRELEASED; urgency=medium +libinput (1.0.1-1ubuntu1) wily; urgency=medium * Merge new upstream release from Debian. - -- Timo Aaltonen Thu, 24 Sep 2015 04:54:21 +0300 + -- Timo Aaltonen Fri, 25 Sep 2015 05:48:21 +0300 libinput (1.0.1-1) unstable; urgency=medium commit 0b72f4e6681fe7a4c7d9b3525564f6a29ca3c762 Author: Timo Aaltonen Date: Fri Sep 25 05:48:19 2015 +0300 update the changelog diff --git a/debian/changelog b/debian/changelog index b043d23..b4520e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libinput (1.0.1-1ubuntu1) UNRELEASED; urgency=medium + + * Merge new upstream release from Debian. + + -- Timo Aaltonen Thu, 24 Sep 2015 04:54:21 +0300 + libinput (1.0.1-1) unstable; urgency=medium * New upstream release. commit 90022b44a90b0bde65fe3fbe1a6c4091e3b70187 Author: Timo Aaltonen Date: Thu Sep 3 11:52:21 2015 +0300 release to unstable diff --git a/debian/changelog b/debian/changelog index 4db3485..b0c365e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libinput (1.0.1-1) UNRELEASED; urgency=medium +libinput (1.0.1-1) unstable; urgency=medium * New upstream release. - -- Timo Aaltonen Thu, 03 Sep 2015 11:47:19 +0300 + -- Timo Aaltonen Thu, 03 Sep 2015 11:52:08 +0300 libinput (0.21.0-1) unstable; urgency=medium commit 5f6f888debc2a6deed9cbb1630ec3ef01efc3757 Author: Timo Aaltonen Date: Thu Sep 3 11:48:14 2015 +0300 update the changelog diff --git a/debian/changelog b/debian/changelog index 6f96377..4db3485 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libinput (1.0.1-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Thu, 03 Sep 2015 11:47:19 +0300 + libinput (0.21.0-1) unstable; urgency=medium * New upstream release. commit a52cc616b4c00d0975a3311a2a06057bdb419ba2 Author: Peter Hutterer Date: Thu Sep 3 16:34:35 2015 +1000 configure.ac: libinput 1.0.1 Signed-off-by: Peter Hutterer diff --git a/configure.ac b/configure.ac index 60664d1..4e0d9f6 100644 --- a/configure.ac +++ b/configure.ac @@
libinput: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits:
libinput: Changes to 'ubuntu'
debian/changelog | 10 debian/libinput10.symbols | 11 debian/patches/fix-litest.patch | 44 debian/patches/series |2 debian/patches/touch-point-orientation-size.patch | 1675 ++ 5 files changed, 1742 insertions(+) New commits: commit 28c3fd8ff064ee5ec7f2f2644e5a493c7d91add4 Author: Robert Ancell robert.anc...@canonical.com Date: Mon Aug 24 15:56:17 2015 +0100 * debian/patches/touch-point-orientation-size.patch: * debian/patches/fix-litest.patch: - Add support for touchscreen contact properties (LP: #1488064) * debian/libinput10.symbols: - Updated diff --git a/debian/changelog b/debian/changelog index 6f96377..8159edb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libinput (0.21.0-1ubuntu1) wily; urgency=medium + + * debian/patches/touch-point-orientation-size.patch: + * debian/patches/fix-litest.patch: +- Add support for touchscreen contact properties (LP: #1488064) + * debian/libinput10.symbols: +- Updated + + -- Robert Ancell robert.anc...@canonical.com Mon, 24 Aug 2015 13:13:32 +0100 + libinput (0.21.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/libinput10.symbols b/debian/libinput10.symbols index 406f01e..eb427b6 100644 --- a/debian/libinput10.symbols +++ b/debian/libinput10.symbols @@ -6,6 +6,7 @@ libinput.so.10 libinput10 #MINVER# LIBINPUT_0.19.0@LIBINPUT_0.19.0 0.21.0 LIBINPUT_0.20.0@LIBINPUT_0.20.0 0.21.0 LIBINPUT_0.21.0@LIBINPUT_0.21.0 0.21.0 + LIBINPUT_0.22.0@LIBINPUT_0.22.0 0.21.0-1ubuntu1 libinput_config_status_to_str@LIBINPUT_0.12.0 0.15.0 libinput_device_config_accel_get_default_speed@LIBINPUT_0.12.0 0.15.0 libinput_device_config_accel_get_speed@LIBINPUT_0.12.0 0.15.0 @@ -123,6 +124,12 @@ libinput.so.10 libinput10 #MINVER# libinput_event_pointer_get_time_usec@LIBINPUT_0.21.0 0.21.0 libinput_event_pointer_has_axis@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_base_event@LIBINPUT_0.12.0 0.15.0 + libinput_event_touch_get_major@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_major_transformed@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_minor@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_minor_transformed@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_orientation@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_get_pressure@LIBINPUT_0.22.0 0.21.0-1ubuntu1 libinput_event_touch_get_seat_slot@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_slot@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_time@LIBINPUT_0.12.0 0.15.0 @@ -131,6 +138,10 @@ libinput.so.10 libinput10 #MINVER# libinput_event_touch_get_x_transformed@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_y@LIBINPUT_0.12.0 0.15.0 libinput_event_touch_get_y_transformed@LIBINPUT_0.12.0 0.15.0 + libinput_event_touch_has_major@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_has_minor@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_has_orientation@LIBINPUT_0.22.0 0.21.0-1ubuntu1 + libinput_event_touch_has_pressure@LIBINPUT_0.22.0 0.21.0-1ubuntu1 libinput_get_event@LIBINPUT_0.12.0 0.15.0 libinput_get_fd@LIBINPUT_0.12.0 0.15.0 libinput_get_user_data@LIBINPUT_0.12.0 0.15.0 diff --git a/debian/patches/fix-litest.patch b/debian/patches/fix-litest.patch new file mode 100644 index 000..e476d8d --- /dev/null +++ b/debian/patches/fix-litest.patch @@ -0,0 +1,44 @@ +With this change auto assign events will be skipped if no replacement value +is provided. This behavior is practical when emitting mt events, as those +only contain the axis values that changed. + +Signed-off-by: Andreas Pokorny andreas.pokorny at canonical.com +--- + test/litest.c | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test/litest.c b/test/litest.c +index 26c5e43..8fc7bca 100644 +--- a/test/litest.c b/test/litest.c +@@ -1292,7 +1292,6 @@ litest_auto_assign_value(struct litest_device *d, + value = touching ? 0 : 1; + break; + default: +- value = -1; + if (!axis_replacement_value(axes, ev-code, value) + d-interface-get_axis_default) + d-interface-get_axis_default(d, ev-code, value); +@@ -1342,8 +1341,8 @@ litest_slot_start(struct litest_device *d, +y, +axes, +touching); +- +- litest_event(d, ev-type, ev-code, value); ++ if (value != LITEST_AUTO_ASSIGN) ++ litest_event(d, ev-type, ev-code, value); + ev++; + } + } +@@ -1428,7 +1427,8 @@ litest_slot_move(struct litest_device *d, +y, +axes, +