fix for xf86-input-libinput 1.2.0

3 files changed, 28 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3bc5d6d1151a..c0482ac7c648 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libinput-multiplier
 	pkgdesc = scroll patch, discrete deltay multiplier
 	pkgver = 1.19.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://freedesktop.org/wiki/Software/libinput
 	arch = x86_64
 	license = custom
@@ -19,6 +19,6 @@ pkgbase = libinput-multiplier
 	source = https://freedesktop.org/software/libinput/libinput-1.19.0.tar.xz
 	source = multiplier.patch
 	sha512sums = daf42ce797f2b5aef8d6f7a5c0d967590581e6ac12c26fa6bde5fbc619d75319e39ca55d65d5347e554dd6a48b91f5fed4d3167eabef8ad1ebc43bc0c3e8e220
-	sha512sums = cae69ca6c92b7566e91ba073c34c0752464a878c1415306a7ec9a22a158989f4e3bb11eb5b0237bac947a6ee1765daabc8bb5af5f1e02bea2d98c6d9cfc01a4c
+	sha512sums = aa22c523072e13c9a76153a89443d51fd16def29ccdc53aea142e278ad02820f2f7fef5b40e94fa2ed4c2062e237f70a9847d975e9100c998b39451f7267c3cc
 
 pkgname = libinput-multiplier
diff --git a/PKGBUILD b/PKGBUILD
index c77fdc09b844..0766b6761411 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ _pkgname=libinput
 _patch=multiplier.patch
 pkgname=$_pkgname-multiplier
 pkgver=1.19.0
-pkgrel=1
+pkgrel=2
 pkgdesc='scroll patch, discrete deltay multiplier'
 arch=(x86_64)
 url=http://freedesktop.org/wiki/Software/libinput
@@ -18,7 +18,7 @@ optdepends=('gtk3: libinput debug-gui'
 source=(https://freedesktop.org/software/$_pkgname/$_pkgname-$pkgver.tar.xz
         $_patch)
 sha512sums=(daf42ce797f2b5aef8d6f7a5c0d967590581e6ac12c26fa6bde5fbc619d75319e39ca55d65d5347e554dd6a48b91f5fed4d3167eabef8ad1ebc43bc0c3e8e220
-            cae69ca6c92b7566e91ba073c34c0752464a878c1415306a7ec9a22a158989f4e3bb11eb5b0237bac947a6ee1765daabc8bb5af5f1e02bea2d98c6d9cfc01a4c)
+            aa22c523072e13c9a76153a89443d51fd16def29ccdc53aea142e278ad02820f2f7fef5b40e94fa2ed4c2062e237f70a9847d975e9100c998b39451f7267c3cc)
 prepare() {
   cd "${srcdir}"/$_pkgname-$pkgver
   patch -Np1 -i ../$_patch
diff --git a/multiplier.patch b/multiplier.patch
index 6b8726644d7e..b0a29e188c0b 100644
--- a/multiplier.patch
+++ b/multiplier.patch
@@ -1,8 +1,8 @@
 diff --git a/src/evdev.c b/src/evdev.c
-index 8afa8e4..fae672a 100644
+index f332bc1..0dbb4e0 100644
 --- a/src/evdev.c
 +++ b/src/evdev.c
-@@ -1186,6 +1186,7 @@ evdev_read_wheel_click_props(struct evdev_device *device)
+@@ -1369,6 +1369,7 @@ evdev_read_wheel_click_props(struct evdev_device *device)
  	} else {
  		angles.x = angles.y;
  	}
@@ -11,7 +11,7 @@ index 8afa8e4..fae672a 100644
  	return angles;
  }
 diff --git a/src/libinput.c b/src/libinput.c
-index 6d00a00..0bf1324 100644
+index a0c8504..112f96d 100644
 --- a/src/libinput.c
 +++ b/src/libinput.c
 @@ -33,6 +33,9 @@
@@ -24,7 +24,7 @@ index 6d00a00..0bf1324 100644
  
  #include "libinput.h"
  #include "libinput-private.h"
-@@ -719,6 +722,16 @@ libinput_event_pointer_get_axis_value(struct libinput_event_pointer *event,
+@@ -747,6 +750,16 @@ libinput_event_pointer_get_axis_value(struct libinput_event_pointer *event,
  	return value;
  }
  
@@ -41,8 +41,12 @@ index 6d00a00..0bf1324 100644
  LIBINPUT_EXPORT double
  libinput_event_pointer_get_axis_value_discrete(struct libinput_event_pointer *event,
  					       enum libinput_pointer_axis axis)
-@@ -739,7 +752,7 @@ libinput_event_pointer_get_axis_value_discrete(struct libinput_event_pointer *ev
- 			value = event->discrete.x;
+@@ -764,10 +777,10 @@ libinput_event_pointer_get_axis_value_discrete(struct libinput_event_pointer *ev
+ 	} else {
+ 		switch (axis) {
+ 		case LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL:
+-			value = event->discrete.x;
++			value = event->discrete.x * atoi(multiplier);
  			break;
  		case LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL:
 -			value = event->discrete.y;
@@ -50,7 +54,20 @@ index 6d00a00..0bf1324 100644
  			break;
  		}
  	}
-@@ -1783,6 +1796,7 @@ libinput_init(struct libinput *libinput,
+@@ -820,10 +833,10 @@ libinput_event_pointer_get_scroll_value_v120(struct libinput_event_pointer *even
+ 	} else {
+ 		switch (axis) {
+ 		case LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL:
+-			value = event->v120.x;
++			value = event->v120.x * atoi(multiplier);
+ 			break;
+ 		case LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL:
+-			value = event->v120.y;
++			value = event->v120.y * atoi(multiplier);
+ 			break;
+ 		}
+ 	}
+@@ -1874,6 +1887,7 @@ libinput_init(struct libinput *libinput,
  		close(libinput->epoll_fd);
  		return -1;
  	}