* Increase minimum finger width to prevent entering scroll mode erroneously
* Attempt to clarify what the sysctl variables for finger scroll do * Add hysteresis to validity check so changing it does not get rejected Thanks to Martin Husemann and Michael van Elst for reporting the issues.
This commit is contained in:
parent
fe21bc8f27
commit
ee3d5db25b
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: synaptics.c,v 1.44 2018/11/06 09:13:17 blymn Exp $ */
|
/* $NetBSD: synaptics.c,v 1.45 2018/11/28 09:14:03 blymn Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, Steve C. Woodford
|
* Copyright (c) 2005, Steve C. Woodford
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
#include "opt_pms.h"
|
#include "opt_pms.h"
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.44 2018/11/06 09:13:17 blymn Exp $");
|
__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.45 2018/11/28 09:14:03 blymn Exp $");
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/systm.h>
|
#include <sys/systm.h>
|
||||||
|
@ -120,8 +120,8 @@ static int synaptics_max_speed_x = 32;
|
||||||
static int synaptics_max_speed_y = 32;
|
static int synaptics_max_speed_y = 32;
|
||||||
static int synaptics_max_speed_z = 2;
|
static int synaptics_max_speed_z = 2;
|
||||||
static int synaptics_movement_threshold = 4;
|
static int synaptics_movement_threshold = 4;
|
||||||
static int synaptics_fscroll_min = 5;
|
static int synaptics_fscroll_min = 13;
|
||||||
static int synaptics_fscroll_max = 12;
|
static int synaptics_fscroll_max = 14;
|
||||||
static int synaptics_dz_hold = 30;
|
static int synaptics_dz_hold = 30;
|
||||||
static int synaptics_movement_enable = 1;
|
static int synaptics_movement_enable = 1;
|
||||||
|
|
||||||
|
@ -793,7 +793,7 @@ pms_sysctl_synaptics(struct sysctllog **clog)
|
||||||
if ((rc = sysctl_createv(clog, 0, NULL, &node,
|
if ((rc = sysctl_createv(clog, 0, NULL, &node,
|
||||||
CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
|
CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
|
||||||
CTLTYPE_INT, "finger_scroll-min",
|
CTLTYPE_INT, "finger_scroll-min",
|
||||||
SYSCTL_DESCR("Minimum width for finger scrolling detection"),
|
SYSCTL_DESCR("Minimum width at which y cursor movements will be converted to scroll wheel events"),
|
||||||
pms_sysctl_synaptics_verify, 0,
|
pms_sysctl_synaptics_verify, 0,
|
||||||
&synaptics_fscroll_min,
|
&synaptics_fscroll_min,
|
||||||
0, CTL_HW, root_num, CTL_CREATE,
|
0, CTL_HW, root_num, CTL_CREATE,
|
||||||
|
@ -805,7 +805,7 @@ pms_sysctl_synaptics(struct sysctllog **clog)
|
||||||
if ((rc = sysctl_createv(clog, 0, NULL, &node,
|
if ((rc = sysctl_createv(clog, 0, NULL, &node,
|
||||||
CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
|
CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
|
||||||
CTLTYPE_INT, "finger_scroll-max",
|
CTLTYPE_INT, "finger_scroll-max",
|
||||||
SYSCTL_DESCR("Maximum width for finger scrolling detection"),
|
SYSCTL_DESCR("Maximum width at which y cursor movements will be converted to scroll wheel events"),
|
||||||
pms_sysctl_synaptics_verify, 0,
|
pms_sysctl_synaptics_verify, 0,
|
||||||
&synaptics_fscroll_max,
|
&synaptics_fscroll_max,
|
||||||
0, CTL_HW, root_num, CTL_CREATE,
|
0, CTL_HW, root_num, CTL_CREATE,
|
||||||
|
@ -817,7 +817,7 @@ pms_sysctl_synaptics(struct sysctllog **clog)
|
||||||
if ((rc = sysctl_createv(clog, 0, NULL, &node,
|
if ((rc = sysctl_createv(clog, 0, NULL, &node,
|
||||||
CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
|
CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
|
||||||
CTLTYPE_INT, "finger_scroll-hysteresis",
|
CTLTYPE_INT, "finger_scroll-hysteresis",
|
||||||
SYSCTL_DESCR("Number of packets to stay in finger scroll mode"),
|
SYSCTL_DESCR("Number of packets to keep reporting y cursor movements as scroll wheel events"),
|
||||||
pms_sysctl_synaptics_verify, 0,
|
pms_sysctl_synaptics_verify, 0,
|
||||||
&synaptics_dz_hold,
|
&synaptics_dz_hold,
|
||||||
0, CTL_HW, root_num, CTL_CREATE,
|
0, CTL_HW, root_num, CTL_CREATE,
|
||||||
|
@ -903,6 +903,10 @@ pms_sysctl_synaptics_verify(SYSCTLFN_ARGS)
|
||||||
if ((t < 5) || (t > 14))
|
if ((t < 5) || (t > 14))
|
||||||
return (EINVAL);
|
return (EINVAL);
|
||||||
} else
|
} else
|
||||||
|
if (node.sysctl_num == synaptics_dz_hold_nodenum) {
|
||||||
|
if (t < 0)
|
||||||
|
return (EINVAL);
|
||||||
|
} else
|
||||||
if (node.sysctl_num == synaptics_movement_enable_nodenum) {
|
if (node.sysctl_num == synaptics_movement_enable_nodenum) {
|
||||||
if (t < 0 || t > 1)
|
if (t < 0 || t > 1)
|
||||||
return (EINVAL);
|
return (EINVAL);
|
||||||
|
|
Loading…
Reference in New Issue