xserver-xorg-input-libinput: Changes to 'upstream-unstable'
configure.ac | 2 +-
include/libinput-properties.h | 6 +++---
src/xf86libinput.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 9b9fa156020c7859bea3b6196769f390bdabf1ee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 14 07:17:51 2016 +1000
xf86-input-libinput 0.19.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 7dea666..48e5b19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-libinput],
- [0.19.0],
+ [0.19.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-libinput])
AC_CONFIG_SRCDIR([Makefile.am])
commit 0d8d6f15e2961291c2bbf977913ba18ff20bad63
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 13 14:37:07 2016 +1000
Correct the horizontal scroll property name
Clear typo. Not bothering to be backwards compatible here, anything that uses
the #define will update on rebuild, anyone using the string directly should've
told me about the typo...
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
(cherry picked from commit 2f1df46ba9ef91c079f6485c04ac7c5515d6057a)
diff --git a/include/libinput-properties.h b/include/libinput-properties.h
index cb3dd2f..56ee625 100644
--- a/include/libinput-properties.h
+++ b/include/libinput-properties.h
@@ -140,6 +140,6 @@
/* Horizontal scroll events enabled: BOOL, 1 value (0 or 1).
* If disabled, horizontal scroll events are discarded */
-#define LIBINPUT_PROP_HORIZ_SCROLL_ENABLED "libinput Horizonal Scroll Enabled"
+#define LIBINPUT_PROP_HORIZ_SCROLL_ENABLED "libinput Horizontal Scroll Enabled"
#endif /* _LIBINPUT_PROPERTIES_H_ */
commit e85ec72025bf003cf73948d02297bf46159f1eac
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 16 09:34:36 2016 +1000
Comment two read-only properties as such
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit b508c54fa0d569beb00ccba3d5b27ca993aae94d)
diff --git a/include/libinput-properties.h b/include/libinput-properties.h
index d117729..cb3dd2f 100644
--- a/include/libinput-properties.h
+++ b/include/libinput-properties.h
@@ -33,13 +33,13 @@
/* Tap drag enabled/disabled: BOOL, 1 value */
#define LIBINPUT_PROP_TAP_DRAG "libinput Tapping Drag Enabled"
-/* Tap drag default enabled/disabled: BOOL, 1 value */
+/* Tap drag default enabled/disabled: BOOL, 1 value, read-only */
#define LIBINPUT_PROP_TAP_DRAG_DEFAULT "libinput Tapping Drag Enabled Default"
/* Tap drag lock enabled/disabled: BOOL, 1 value */
#define LIBINPUT_PROP_TAP_DRAG_LOCK "libinput Tapping Drag Lock Enabled"
-/* Tap drag lock default enabled/disabled: BOOL, 1 value */
+/* Tap drag lock default enabled/disabled: BOOL, 1 value, read-only */
#define LIBINPUT_PROP_TAP_DRAG_LOCK_DEFAULT "libinput Tapping Drag Lock Enabled Default"
/* Calibration matrix: FLOAT, 9 values of a 3x3 matrix, in rows */
commit 758e9037b56a502f90a032b2438dc307334ca190
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 9 07:58:51 2016 +1000
Discard buttons >= 256
https://bugs.freedesktop.org/show_bug.cgi?id=95295
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit ce85432f41549cd6f3c6e0c5e2e39d0c1aee8dfd)
diff --git a/src/xf86libinput.c b/src/xf86libinput.c
index dd3250c..392d862 100644
--- a/src/xf86libinput.c
+++ b/src/xf86libinput.c
@@ -1116,7 +1116,7 @@ xf86libinput_handle_button(InputInfoPtr pInfo, struct libinput_event_pointer *ev
if (draglock_get_mode(&driver_data->draglock) != DRAGLOCK_DISABLED)
draglock_filter_button(&driver_data->draglock, &button, &is_press);
- if (button)
+ if (button && button < 256)
xf86PostButtonEvent(dev, Relative, button, is_press, 0, 0);
}
Reply to: