Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xf86-input-libinput for
openSUSE:Factory checked in at 2021-09-26 21:48:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-libinput (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-libinput.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-libinput"
Sun Sep 26 21:48:29 2021 rev:39 rq:920283 version:1.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-libinput/xf86-input-libinput.changes
2021-06-25 15:01:56.584195865 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-input-libinput.new.1899/xf86-input-libinput.changes
2021-09-26 21:49:18.582821910 +0200
@@ -1,0 +2,11 @@
+Mon Sep 20 08:47:19 UTC 2021 - Stefan Dirsch <[email protected]>
+
+- Update to version 1.2.0
+ * This release introduces support for touchpad gestures that will
+ be available as part of X server 21.1. Additionally high-resolution
+ scrolling data is now acquired from libinput if available and sent
+ downstream to X server. The default scroll distance has been bumped
+ to 120 in the process, but this should not affect correctly written
+ clients.
+
+-------------------------------------------------------------------
Old:
----
xf86-input-libinput-1.1.0.tar.bz2
xf86-input-libinput-1.1.0.tar.bz2.sig
New:
----
xf86-input-libinput-1.2.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-libinput.spec ++++++
--- /var/tmp/diff_new_pack.z96n5N/_old 2021-09-26 21:49:19.114822568 +0200
+++ /var/tmp/diff_new_pack.z96n5N/_new 2021-09-26 21:49:19.118822573 +0200
@@ -17,14 +17,14 @@
Name: xf86-input-libinput
-Version: 1.1.0
+Version: 1.2.0
Release: 0
Summary: Libinput driver for the Xorg X server
License: MIT
Group: System/X11/Servers/XF86_4
URL: https://xorg.freedesktop.org/
Source0:
https://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
-Source1:
https://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2.sig
+#Source1:
https://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2.sig
Source2: %{name}.keyring
Patch0: n_enable-tapping.patch
BuildRequires: pkgconfig
++++++ xf86-input-libinput-1.1.0.tar.bz2 -> xf86-input-libinput-1.2.0.tar.bz2
++++++
++++ 5548 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-libinput-1.1.0/ChangeLog new/xf86-input-libinput-1.2.0/ChangeLog
--- old/xf86-input-libinput-1.1.0/ChangeLog 2021-06-24 00:32:33.000000000
+0200
+++ new/xf86-input-libinput-1.2.0/ChangeLog 2021-09-19 18:58:51.000000000
+0200
@@ -1,3 +1,91 @@
+commit cbdd9efaab17b90567f1cb8f44da657a40c33d6d
+Author: Povilas Kanapickas <[email protected]>
+Date: Sun Sep 19 19:55:46 2021 +0300
+
+ xf86-input-libinput 1.2.0
+
+ Signed-off-by: Povilas Kanapickas <[email protected]>
+
+commit 4c54f4d0d2267425730e88c35d3aa4c373988272
+Author: Peter Hutterer <[email protected]>
+Date: Thu Sep 16 11:08:44 2021 +1000
+
+ Rename HAS_GESTURES to HAVE_GESTURES
+
+ HAVE_FOO is generally used everywhere (see HAVE_CONFIG_H) so let's keep
+ this consistent.
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit 83312147716cfb4627cd9ae8e58ac5aec50e168f
+Author: Povilas Kanapickas <[email protected]>
+Date: Wed Sep 15 20:09:33 2021 +0300
+
+ gitlab-ci: Configure xorgproto build from source
+
+ We need newer xorgproto than what's in fedora as we depend on inputproto
+ 2.3.99.1 or newer.
+
+commit 8588a19f63f9c17f66a83850e20955450c3098a2
+Author: Povilas Kanapickas <[email protected]>
+Date: Wed Sep 15 19:45:49 2021 +0300
+
+ Require inputproto 2.4 to build the gesture support
+
+ Signed-off-by: Povilas Kanapickas <[email protected]>
+
+commit beb94333e1450006942a7f0ee38bc2a2f5719238
+Author: Peter Hutterer <[email protected]>
+Date: Wed Jan 23 20:07:37 2019 +1000
+
+ Use the new v120 API from libinput if available
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit ca9042c7f08f8f0dc214b9cc19f3243728ec8c4a
+Author: Jos?? Exp??sito <[email protected]>
+Date: Wed Aug 4 17:51:26 2021 +0200
+
+ Get scroll source in the event handler
+
+ Where libinput supports high-resolution scroll events, the scroll source
+ is encoded in the event type.
+
+ Get the scroll source in xf86libinput_handle_event to facilitate the
+ migration.
+
+ Refactor, no functional changes.
+
+ Signed-off-by: Jos?? Exp??sito <[email protected]>
+
+commit bf8dc2e2ed0780b947eccfc9ac3694c518dee605
+Author: Peter Hutterer <[email protected]>
+Date: Wed Jan 23 09:01:24 2019 +1000
+
+ Upgrade the default scroll distance to 120
+
+ This is just a number, to be used as divider and shouldn't have any effect
in
+ correctly written clients. With the high-res scrolling coming up however,
we
+ have a few devices where the dist cannot be expressed as an integer
fraction
+ of 15, so let's up it to 120 because we know all hardware wheels have to
be an
+ integer fraction of that that, thanks to Microsoft's API requirements.
+
+ For non-wheel scrolls we need to now map into the new range. Previously we
+ just passed the scroll events on from the touchpad/button scrolling,
meaning a
+ vdist of 15 meant 15 "libinput pixels" of scrolling resulted in a logical
+ wheel click. Now that we have 120 as vdist, we need to times the input
data by
+ 8 to keep the same proportions.
+
+ See 39b0bb4585106a56a51236d8e9843b2da8d745a5 for the previous revert.
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit ecd845c30752a328acfeccb7750dc70350beab0d
+Author: Povilas Kanapickas <[email protected]>
+Date: Sat Oct 10 02:57:40 2020 +0300
+
+ Implement support for touchpad gestures
+
commit 0d9184cb769d38f3cf5a92004211315e5407183d
Author: Peter Hutterer <[email protected]>
Date: Thu Jun 24 08:26:19 2021 +1000
@@ -677,9 +765,6 @@
Signed-off-by: Peter Hutterer <[email protected]>
-Notes (test-jelly):
- SUCCESS: jelly: make check Mon May 15 11:42:39 AEST 2017
-
commit 8772a593b45740f4429218648c9e3a305b3fe896
Author: Martin Kepplinger <[email protected]>
Date: Thu May 4 08:49:34 2017 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-libinput-1.1.0/compile new/xf86-input-libinput-1.2.0/compile
--- old/xf86-input-libinput-1.1.0/compile 2021-06-24 00:32:29.000000000
+0200
+++ new/xf86-input-libinput-1.2.0/compile 2021-09-19 18:58:45.000000000
+0200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <[email protected]>.
#
# This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN* | MSYS*)
+ CYGWIN*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/* | msys/*)
+ cygwin/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-libinput-1.1.0/config.h.in
new/xf86-input-libinput-1.2.0/config.h.in
--- old/xf86-input-libinput-1.1.0/config.h.in 2021-06-24 00:32:28.000000000
+0200
+++ new/xf86-input-libinput-1.2.0/config.h.in 2021-09-19 18:58:45.000000000
+0200
@@ -3,9 +3,15 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
+/* inputproto 2.4 is available */
+#undef HAVE_INPUTPROTO24
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+/* libinput_event_pointer_get_scroll_value_v120() is available */
+#undef HAVE_LIBINPUT_AXIS_VALUE_V120
+
/* libinput_device_config_scroll_get_button_lock() is available */
#undef HAVE_LIBINPUT_SCROLL_BUTTON_LOCK
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-libinput-1.1.0/configure.ac
new/xf86-input-libinput-1.2.0/configure.ac
--- old/xf86-input-libinput-1.1.0/configure.ac 2021-06-24 00:32:23.000000000
+0200
+++ new/xf86-input-libinput-1.2.0/configure.ac 2021-09-19 18:58:38.000000000
+0200
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-libinput],
- [1.1.0],
+ [1.2.0],
[https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/issues],
[xf86-input-libinput])
AC_CONFIG_SRCDIR([Makefile.am])
@@ -47,6 +47,9 @@
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.19] xproto [inputproto >= 2.2])
PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.11.0])
+PKG_CHECK_MODULES(INPUTPROTO24, [inputproto >= 2.3.99.1],
+ [AC_DEFINE(HAVE_INPUTPROTO24, [1], [inputproto 2.4 is
available])])
+
OLD_LIBS=$LIBS
OLD_CFLAGS=$CFLAGS
LIBS="$LIBS $LIBINPUT_LIBS"
@@ -62,6 +65,18 @@
[libinput_have_scroll_button_lock=yes]],
[AC_MSG_RESULT([no])
[libinput_have_scroll_button_lock=no]])
+
+AC_MSG_CHECKING([if libinput_event_pointer_get_scroll_value_v120 is available])
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[#include <libinput.h>]],
+
[[libinput_event_pointer_get_scroll_value_v120(NULL, 0)]])],
+ [AC_MSG_RESULT([yes])
+ AC_DEFINE(HAVE_LIBINPUT_AXIS_VALUE_V120, [1],
+ [libinput_event_pointer_get_scroll_value_v120() is
available])
+ [libinput_have_axis_value_v120=yes]],
+ [AC_MSG_RESULT([no])
+ [libinput_have_axis_value_v120=no]])
+
LIBS=$OLD_LIBS
CFLAGS=$OLD_CFLAGS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-libinput-1.1.0/missing new/xf86-input-libinput-1.2.0/missing
--- old/xf86-input-libinput-1.1.0/missing 2021-06-24 00:32:29.000000000
+0200
+++ new/xf86-input-libinput-1.2.0/missing 2021-09-19 18:58:45.000000000
+0200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <[email protected]>, 1996.
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-libinput-1.1.0/src/xf86libinput.c
new/xf86-input-libinput-1.2.0/src/xf86libinput.c
--- old/xf86-input-libinput-1.1.0/src/xf86libinput.c 2021-06-24
00:32:23.000000000 +0200
+++ new/xf86-input-libinput-1.2.0/src/xf86libinput.c 2021-09-19
18:58:38.000000000 +0200
@@ -78,6 +78,13 @@
#define CAP_TABLET 0x8
#define CAP_TABLET_TOOL 0x10
#define CAP_TABLET_PAD 0x20
+#define CAP_GESTURE 0x40
+
+#if HAVE_INPUTPROTO24
+#if ABI_XINPUT_VERSION >= SET_ABI_VERSION(24, 4)
+#define HAVE_GESTURES
+#endif
+#endif
struct xf86libinput_driver {
struct libinput *libinput;
@@ -1089,8 +1096,17 @@
if (ntouches == 0) /* unknown - mtdev */
ntouches = TOUCH_MAX_SLOTS;
InitTouchClassDeviceStruct(dev, ntouches, XIDirectTouch, 2);
+}
+#ifdef HAVE_GESTURES
+static void
+xf86libinput_init_gesture(InputInfoPtr pInfo)
+{
+ DeviceIntPtr dev = pInfo->dev;
+ int ntouches = TOUCH_MAX_SLOTS;
+ InitGestureClassDeviceStruct(dev, ntouches);
}
+#endif
static int
xf86libinput_init_tablet_pen_or_eraser(InputInfoPtr pInfo,
@@ -1335,6 +1351,10 @@
}
if (driver_data->capabilities & CAP_TOUCH)
xf86libinput_init_touch(pInfo);
+#ifdef HAVE_GESTURES
+ if (driver_data->capabilities & CAP_GESTURE)
+ xf86libinput_init_gesture(pInfo);
+#endif
if (driver_data->capabilities & CAP_TABLET_TOOL)
xf86libinput_init_tablet(pInfo);
if (driver_data->capabilities & CAP_TABLET_PAD)
@@ -1547,9 +1567,9 @@
* so the use-case above shouldn't matter anymore.
*/
static inline double
-get_wheel_scroll_value(struct xf86libinput *driver_data,
- struct libinput_event_pointer *event,
- enum libinput_pointer_axis axis)
+guess_wheel_scroll_value(struct xf86libinput *driver_data,
+ struct libinput_event_pointer *event,
+ enum libinput_pointer_axis axis)
{
struct scroll_axis *s;
double f;
@@ -1609,33 +1629,91 @@
return s->dist/s->fraction * discrete;
}
+#if HAVE_LIBINPUT_AXIS_VALUE_V120
+static inline double
+get_wheel_120_value(struct xf86libinput *driver_data,
+ struct libinput_event_pointer *event,
+ enum libinput_pointer_axis axis)
+{
+ struct scroll_axis *s;
+ double angle;
+
+ switch (axis) {
+ case LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL:
+ s = &driver_data->scroll.h;
+ break;
+ case LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL:
+ s = &driver_data->scroll.v;
+ break;
+ default:
+ return 0.0;
+ }
+
+ angle = libinput_event_pointer_get_scroll_value_v120(event, axis);
+ return s->dist * angle/120;
+}
+#endif
+
+static inline double
+get_wheel_scroll_value(struct xf86libinput *driver_data,
+ struct libinput_event_pointer *event,
+ enum libinput_pointer_axis axis)
+{
+#if HAVE_LIBINPUT_AXIS_VALUE_V120
+ return get_wheel_120_value(driver_data, event, axis);
+#else
+ return guess_wheel_scroll_value(driver_data, event, axis);
+#endif
+}
+
+static inline double
+get_finger_or_continuous_scroll_value(struct libinput_event_pointer *event,
+ enum libinput_pointer_axis axis)
+{
+#if HAVE_LIBINPUT_AXIS_VALUE_V120
+ return libinput_event_pointer_get_scroll_value(event, axis);
+#else
+ return libinput_event_pointer_get_axis_value(event, axis);
+#endif
+}
+
static inline bool
calculate_axis_value(struct xf86libinput *driver_data,
enum libinput_pointer_axis axis,
struct libinput_event_pointer *event,
+ enum libinput_pointer_axis_source source,
double *value_out)
{
- enum libinput_pointer_axis_source source;
double value;
if (!libinput_event_pointer_has_axis(event, axis))
return false;
- source = libinput_event_pointer_get_axis_source(event);
+ /* Event may be LIBINPUT_POINTER_AXIS or
+ * LIBINPUT_EVENT_POINTER_SCROLL_{WHEEL|FINGER|CONTINUOUS}, depending
+ * on the libinput version.
+ *
+ * libinput guarantees the axis source is set for the second set of
+ * events too but we can switch to the event type once we ditch
+ * libinput < 1.19 support.
+ */
if (source == LIBINPUT_POINTER_AXIS_SOURCE_WHEEL) {
value = get_wheel_scroll_value(driver_data, event, axis);
} else {
double dist = driver_data->options.scroll_pixel_distance;
assert(dist != 0.0);
- value = libinput_event_pointer_get_axis_value(event, axis);
+ value = get_finger_or_continuous_scroll_value(event, axis);
/* We need to scale this value into our scroll increment range
* because that one is constant for the lifetime of the
* device. The user may change the ScrollPixelDistance
* though, so where we have a dist of 10 but an increment of
* 15, we need to scale from 0..10 into 0..15.
+ *
+ * We now switched to vdist of 120, so make this
+ * proportionate - 120/15 is 8.
*/
- value = value/dist * SCROLL_INCREMENT;
+ value = value/dist * SCROLL_INCREMENT * 8;
}
*value_out = value;
@@ -1644,32 +1722,26 @@
}
static void
-xf86libinput_handle_axis(InputInfoPtr pInfo, struct libinput_event_pointer
*event)
+xf86libinput_handle_axis(InputInfoPtr pInfo,
+ struct libinput_event *e,
+ enum libinput_pointer_axis_source source)
{
+ struct libinput_event_pointer *event;
DeviceIntPtr dev = pInfo->dev;
struct xf86libinput *driver_data = pInfo->private;
ValuatorMask *mask = driver_data->valuators;
double value;
- enum libinput_pointer_axis_source source;
if ((driver_data->capabilities & CAP_POINTER) == 0)
return;
valuator_mask_zero(mask);
- source = libinput_event_pointer_get_axis_source(event);
- switch(source) {
- case LIBINPUT_POINTER_AXIS_SOURCE_FINGER:
- case LIBINPUT_POINTER_AXIS_SOURCE_WHEEL:
- case LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS:
- break;
- default:
- return;
- }
-
+ event = libinput_event_get_pointer_event(e);
if (calculate_axis_value(driver_data,
LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL,
event,
+ source,
&value))
valuator_mask_set_double(mask, 3, value);
@@ -1679,9 +1751,15 @@
if (calculate_axis_value(driver_data,
LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,
event,
+ source,
&value))
valuator_mask_set_double(mask, 2, value);
+ if (source == LIBINPUT_POINTER_AXIS_SOURCE_WHEEL &&
+ !valuator_mask_isset(mask, 2) &&
+ !valuator_mask_isset(mask, 3))
+ return;
+
out:
xf86PostMotionEventM(dev, Relative, mask);
}
@@ -1737,6 +1815,86 @@
xf86PostTouchEvent(dev, touchids[slot], type, 0, m);
}
+#ifdef HAVE_GESTURES
+static void
+xf86libinput_handle_gesture_swipe(InputInfoPtr pInfo,
+ struct libinput_event_gesture *event,
+ enum libinput_event_type event_type)
+{
+ DeviceIntPtr dev = pInfo->dev;
+ struct xf86libinput *driver_data = pInfo->private;
+ int type;
+ uint32_t flags = 0;
+
+ if ((driver_data->capabilities & CAP_GESTURE) == 0)
+ return;
+
+ switch (event_type) {
+ case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
+ type = XI_GestureSwipeBegin;
+ break;
+ case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE:
+ type = XI_GestureSwipeUpdate;
+ break;
+ case LIBINPUT_EVENT_GESTURE_SWIPE_END:
+ type = XI_GestureSwipeEnd;
+ if (libinput_event_gesture_get_cancelled(event))
+ flags |= XIGestureSwipeEventCancelled;
+ break;
+ default:
+ return;
+ }
+
+ xf86PostGestureSwipeEvent(dev, type,
+
libinput_event_gesture_get_finger_count(event),
+ flags,
+ libinput_event_gesture_get_dx(event),
+ libinput_event_gesture_get_dy(event),
+
libinput_event_gesture_get_dx_unaccelerated(event),
+
libinput_event_gesture_get_dy_unaccelerated(event));
+}
+
+static void
+xf86libinput_handle_gesture_pinch(InputInfoPtr pInfo,
+ struct libinput_event_gesture *event,
+ enum libinput_event_type event_type)
+{
+ DeviceIntPtr dev = pInfo->dev;
+ struct xf86libinput *driver_data = pInfo->private;
+ int type;
+ uint32_t flags = 0;
+
+ if ((driver_data->capabilities & CAP_GESTURE) == 0)
+ return;
+
+ switch (event_type) {
+ case LIBINPUT_EVENT_GESTURE_PINCH_BEGIN:
+ type = XI_GesturePinchBegin;
+ break;
+ case LIBINPUT_EVENT_GESTURE_PINCH_UPDATE:
+ type = XI_GesturePinchUpdate;
+ break;
+ case LIBINPUT_EVENT_GESTURE_PINCH_END:
+ type = XI_GesturePinchEnd;
+ if (libinput_event_gesture_get_cancelled(event))
+ flags |= XIGesturePinchEventCancelled;
+ break;
+ default:
+ return;
+ }
+
+ xf86PostGesturePinchEvent(dev, type,
+
libinput_event_gesture_get_finger_count(event),
+ flags,
+ libinput_event_gesture_get_dx(event),
+ libinput_event_gesture_get_dy(event),
+
libinput_event_gesture_get_dx_unaccelerated(event),
+
libinput_event_gesture_get_dy_unaccelerated(event),
+ libinput_event_gesture_get_scale(event),
+
libinput_event_gesture_get_angle_delta(event));
+}
+#endif
+
static InputInfoPtr
xf86libinput_pick_device(struct xf86libinput_device *shared_device,
struct libinput_event *event)
@@ -2279,9 +2437,30 @@
libinput_event_get_keyboard_event(event));
break;
case LIBINPUT_EVENT_POINTER_AXIS:
+#if !HAVE_LIBINPUT_AXIS_VALUE_V120
+ /* ignore POINTER_AXIS where we have libinput 1.19 and
higher */
xf86libinput_handle_axis(pInfo,
-
libinput_event_get_pointer_event(event));
+ event,
+
libinput_event_pointer_get_axis_source(event));
+#endif
break;
+#if HAVE_LIBINPUT_AXIS_VALUE_V120
+ case LIBINPUT_EVENT_POINTER_SCROLL_WHEEL:
+ xf86libinput_handle_axis(pInfo,
+ event,
+
LIBINPUT_POINTER_AXIS_SOURCE_WHEEL);
+ break;
+ case LIBINPUT_EVENT_POINTER_SCROLL_FINGER:
+ xf86libinput_handle_axis(pInfo,
+ event,
+
LIBINPUT_POINTER_AXIS_SOURCE_FINGER);
+ break;
+ case LIBINPUT_EVENT_POINTER_SCROLL_CONTINUOUS:
+ xf86libinput_handle_axis(pInfo,
+ event,
+
LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS);
+ break;
+#endif
case LIBINPUT_EVENT_TOUCH_FRAME:
break;
case LIBINPUT_EVENT_TOUCH_UP:
@@ -2295,9 +2474,20 @@
case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE:
case LIBINPUT_EVENT_GESTURE_SWIPE_END:
+#ifdef HAVE_GESTURES
+ xf86libinput_handle_gesture_swipe(pInfo,
+
libinput_event_get_gesture_event(event),
+ type);
+#endif
+ break;
case LIBINPUT_EVENT_GESTURE_PINCH_BEGIN:
case LIBINPUT_EVENT_GESTURE_PINCH_UPDATE:
case LIBINPUT_EVENT_GESTURE_PINCH_END:
+#ifdef HAVE_GESTURES
+ xf86libinput_handle_gesture_pinch(pInfo,
+
libinput_event_get_gesture_event(event),
+ type);
+#endif
break;
case LIBINPUT_EVENT_TABLET_TOOL_AXIS:
event_handling = xf86libinput_handle_tablet_axis(pInfo,
@@ -3295,6 +3485,10 @@
options = xf86ReplaceBoolOption(options,
"_libinput/cap-pointer", 1);
if (capabilities & CAP_TOUCH)
options = xf86ReplaceBoolOption(options, "_libinput/cap-touch",
1);
+#ifdef HAVE_GESTURES
+ if (capabilities & CAP_GESTURE)
+ options = xf86ReplaceBoolOption(options,
"_libinput/cap-gesture", 1);
+#endif
if (capabilities & CAP_TABLET_TOOL)
options = xf86ReplaceBoolOption(options,
"_libinput/cap-tablet-tool", 1);
if (capabilities & CAP_TABLET_PAD)
@@ -3333,6 +3527,10 @@
capabilities |= CAP_POINTER;
if (xf86CheckBoolOption(pInfo->options, "_libinput/cap-touch", 0))
capabilities |= CAP_TOUCH;
+#ifdef HAVE_GESTURES
+ if (xf86CheckBoolOption(pInfo->options, "_libinput/cap-gesture", 0))
+ capabilities |= CAP_GESTURE;
+#endif
if (xf86CheckBoolOption(pInfo->options, "_libinput/cap-tablet-tool", 0))
capabilities |= CAP_TABLET_TOOL;
@@ -3468,8 +3666,8 @@
* affect touchpad scroll speed. For wheels it doesn't matter as
* we're using the discrete value only.
*/
- driver_data->scroll.v.dist = SCROLL_INCREMENT;
- driver_data->scroll.h.dist = SCROLL_INCREMENT;
+ driver_data->scroll.v.dist = 120;
+ driver_data->scroll.h.dist = 120;
if (!is_subdevice) {
if (libinput_device_has_capability(device,
LIBINPUT_DEVICE_CAP_POINTER))
@@ -3478,6 +3676,10 @@
driver_data->capabilities |= CAP_KEYBOARD;
if (libinput_device_has_capability(device,
LIBINPUT_DEVICE_CAP_TOUCH))
driver_data->capabilities |= CAP_TOUCH;
+#ifdef HAVE_GESTURES
+ if (libinput_device_has_capability(device,
LIBINPUT_DEVICE_CAP_GESTURE))
+ driver_data->capabilities |= CAP_GESTURE;
+#endif
if (libinput_device_has_capability(device,
LIBINPUT_DEVICE_CAP_TABLET_TOOL))
driver_data->capabilities |= CAP_TABLET;
if (libinput_device_has_capability(device,
LIBINPUT_DEVICE_CAP_TABLET_PAD))
@@ -3500,7 +3702,7 @@
* this device, create a separate device instead */
if (!is_subdevice &&
driver_data->capabilities & CAP_KEYBOARD &&
- driver_data->capabilities & (CAP_POINTER|CAP_TOUCH)) {
+ driver_data->capabilities & (CAP_POINTER|CAP_TOUCH|CAP_GESTURE)) {
driver_data->capabilities &= ~CAP_KEYBOARD;
xf86libinput_create_subdevice(pInfo,
CAP_KEYBOARD,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xf86-input-libinput-1.1.0/test-driver
new/xf86-input-libinput-1.2.0/test-driver
--- old/xf86-input-libinput-1.1.0/test-driver 2021-06-24 00:32:29.000000000
+0200
+++ new/xf86-input-libinput-1.2.0/test-driver 2021-09-19 18:58:46.000000000
+0200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2018 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
