From ab0fd39539848c5215f4579dcad682de41c3bcb5 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 22 May 2015 07:44:16 +1000
Subject: [PATCH] Init mixed rel/abs devices as rel devices (#1223619)

---
 ...s-axes-if-we-don-t-have-acceleration.patch | 73 +++++++++++++++++++
 xorg-x11-drv-libinput.spec                    |  8 +-
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 0001-Only-init-abs-axes-if-we-don-t-have-acceleration.patch

diff --git a/0001-Only-init-abs-axes-if-we-don-t-have-acceleration.patch b/0001-Only-init-abs-axes-if-we-don-t-have-acceleration.patch
new file mode 100644
index 0000000..e1103d2
--- /dev/null
+++ b/0001-Only-init-abs-axes-if-we-don-t-have-acceleration.patch
@@ -0,0 +1,73 @@
+From 3d6afca975e5c54d458974ca2e9ada3df209587c Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 20 May 2015 13:22:45 +1000
+Subject: [PATCH xf86-input-libinput] Only init abs axes if we don't have
+ acceleration
+
+A lot of devices (mainly MS input devices) have abs axes on top of the
+relative axes. Those axes are usually mute but with the current code we set up
+absolute axes for those devices. Relative events are then scaled by the server
+which makes the device appear slow.
+
+As an immediate fix always prefer relative axes and only set up absolute axes
+if the device has a calibration matrix but no pointer acceleration.
+This may mess up other devices where the relative axes are dead, we'll deal
+with this when it comes.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=90322
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+---
+ src/libinput.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/libinput.c b/src/libinput.c
+index 3e54529..c8669fc 100644
+--- a/src/libinput.c
++++ b/src/libinput.c
+@@ -85,6 +85,8 @@ struct xf86libinput {
+ 		double y_remainder;
+ 	} scale;
+ 
++	BOOL has_abs;
++
+ 	ValuatorMask *valuators;
+ 
+ 	struct options {
+@@ -526,6 +528,8 @@ xf86libinput_init_pointer_absolute(InputInfoPtr pInfo)
+ 	SetScrollValuator(dev, 2, SCROLL_TYPE_HORIZONTAL, driver_data->scroll.hdist, 0);
+ 	SetScrollValuator(dev, 3, SCROLL_TYPE_VERTICAL, driver_data->scroll.vdist, 0);
+ 
++	driver_data->has_abs = TRUE;
++
+ 	return Success;
+ }
+ static void
+@@ -636,7 +640,8 @@ xf86libinput_init(DeviceIntPtr dev)
+ 	if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_KEYBOARD))
+ 		xf86libinput_init_keyboard(pInfo);
+ 	if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_POINTER)) {
+-		if (libinput_device_config_calibration_has_matrix(device))
++		if (libinput_device_config_calibration_has_matrix(device) &&
++		    !libinput_device_config_accel_is_available(device))
+ 			xf86libinput_init_pointer_absolute(pInfo);
+ 		else
+ 			xf86libinput_init_pointer(pInfo);
+@@ -709,6 +714,13 @@ xf86libinput_handle_absmotion(InputInfoPtr pInfo, struct libinput_event_pointer
+ 	ValuatorMask *mask = driver_data->valuators;
+ 	double x, y;
+ 
++	if (!driver_data->has_abs) {
++		xf86IDrvMsg(pInfo, X_ERROR,
++			    "Discarding absolute event from relative device. "
++			    "Please file a bug\n");
++		return;
++	}
++
+ 	x = libinput_event_pointer_get_absolute_x_transformed(event, TOUCH_AXIS_MAX);
+ 	y = libinput_event_pointer_get_absolute_y_transformed(event, TOUCH_AXIS_MAX);
+ 
+-- 
+2.3.5
+
diff --git a/xorg-x11-drv-libinput.spec b/xorg-x11-drv-libinput.spec
index 7413367..f750c54 100644
--- a/xorg-x11-drv-libinput.spec
+++ b/xorg-x11-drv-libinput.spec
@@ -5,13 +5,15 @@
 Summary:    Xorg X11 libinput input driver
 Name:       xorg-x11-drv-libinput
 Version:    0.10.0
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:        http://ww.x.org
 License:    MIT
 
 Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:    90-libinput.conf
 
+Patch01:    0001-Only-init-abs-axes-if-we-don-t-have-acceleration.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: autoconf automake libtool
@@ -30,6 +32,7 @@ supporting all devices.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch01 -p1
 
 %build
 autoreconf --force -v --install || exit 1
@@ -65,6 +68,9 @@ Xorg X11 libinput input driver development files.
 %{_includedir}/xorg/libinput-properties.h
 
 %changelog
+* Fri May 22 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.10.0-2
+- Init mixed rel/abs devices as rel devices (#1223619)
+
 * Thu May 21 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.10.0-1
 - xf86-input-libinput 0.10.0