Attachment 138012 Details for Bug 101139 – 0001-filter-match-accel-roughly-with-macos.patch

[patch] 0001-filter-match-accel-roughly-with-macos.patch

0001-filter-match-accel-roughly-with-macos.patch (text/plain), 2.13 KB, created by Peter Hutterer on 2018-03-12 05:58:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Hutterer

Created: 2018-03-12 05:58:03 UTC

Size: 2.13 KB

patch

obsolete

>From d0582eac61bb3ed9c3631fe4160f3437ba6c56df Mon Sep 17 00:00:00 2001
>From: Peter Hutterer <peter.hutterer@who-t.net>
>Date: Mon, 12 Mar 2018 15:24:07 +1000
>Subject: [PATCH libinput] filter: match accel roughly with macos
>
>This seems to give me roughly the same behaviour as macos does on the center
>settings.
>
>Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
>---
> src/filter.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/src/filter.c b/src/filter.c
>index 206695bb..61984ebd 100644
>--- a/src/filter.c
>+++ b/src/filter.c
>@@ -135,7 +135,7 @@ filter_get_type(struct motion_filter *filter)
> #define DEFAULT_INCLINE 1.1			/* unitless factor */
> 
> /* Touchpad acceleration */
>-#define TOUCHPAD_DEFAULT_THRESHOLD 254		/* mm/s */
>+#define TOUCHPAD_DEFAULT_THRESHOLD 180		/* mm/s */
> #define TOUCHPAD_THRESHOLD_RANGE 184		/* mm/s */
> #define TOUCHPAD_ACCELERATION 9.0		/* unitless factor */
> #define TOUCHPAD_INCLINE 0.011			/* unitless factor */
>@@ -830,6 +830,7 @@ touchpad_accel_profile_linear(struct motion_filter *filter,
> 	const double threshold = accel_filter->threshold; /* units/us */
> 	const double incline = accel_filter->incline;
> 	double factor; /* unitless */
>+	double baseline = 0.9;
> 
> 	/* Convert to mm/s because that's something one can understand */
> 	speed_in = v_us2s(speed_in) * 25.4/accel_filter->dpi;
>@@ -868,11 +869,12 @@ touchpad_accel_profile_linear(struct motion_filter *filter,
> 	  * 0.3 is chosen simply because it is above the Nyquist frequency
> 	    for subpixel motion within a pixel.
> 	*/
>+	baseline = 0.9 + 0.5 * filter->speed_adjustment;
> 	if (speed_in < 7.0) {
>-		factor = 0.1 * speed_in + 0.3;
>+		factor = min(baseline, 0.1 * speed_in + 0.3);
> 	/* up to the threshold, we keep factor 1, i.e. 1:1 movement */
> 	} else if (speed_in < threshold) {
>-		factor = 1;
>+		factor = baseline;
> 	} else {
> 	/* Acceleration function above the threshold:
> 		y = ax' + b
>@@ -885,6 +887,7 @@ touchpad_accel_profile_linear(struct motion_filter *filter,
> 			=> x' := (x - T)
> 	 */
> 		factor = incline * (speed_in - threshold) + 1;
>+		factor = max(factor, baseline);
> 	}
> 
> 	/* Cap at the maximum acceleration factor */
>-- 
>2.14.3
>

Actions: View | Splinter Review

Attachments on bug 101139: 135510 | 135579 | 136584 | 136585 | 136627 | 136628 | 138012 | 138716

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.