d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

psm(4): respect tap_disabled configuration with enabled Extended support

Browse Source 
This fixes a bug where, even when hw.psm.tap_enabled=0, touchpad taps
were processed.
tap_enabled has three states: unconfigured, disabled, and enabled (-1, 0, 1).
To respect PR kern/139272, taps are ignored only when explicity disabled.

Submitted by:	Ben LeMasurier <ben@crypt.ly> (initial version)
MFC after:	2 weeks
This commit is contained in:
wulf 2019-04-20 21:04:56 +00:00
parent 68284b4a20
commit b07da6e7b4
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/man/man4/psm.4
View File

@ -354,8 +354,8 @@ Tap and drag gestures can be disabled by setting
to
.Em 0
at boot-time.
Currently, this is only supported on Synaptics touchpads with Extended
support disabled.
Currently, this is supported on Synaptics touchpads regardless of Extended
support state and on Elantech touchpads with Extended support enabled.
The behaviour may be changed after boot by setting
the sysctl with the same name and by restarting
.Xr moused 8

12
sys/dev/atkbdc/psm.c
View File

@ -3820,9 +3820,15 @@ psmgestures(struct psm_softc *sc, finger_t *fingers, int nfingers,
gest->in_vscroll = 0;
/* Compute tap timeout. */
gest->taptimeout.tv_sec = tap_timeout / 1000000;
gest->taptimeout.tv_usec = tap_timeout % 1000000;
timevaladd(&gest->taptimeout, &sc->lastsoftintr);
if (tap_enabled != 0) {
gest->taptimeout = (struct timeval) {
.tv_sec = tap_timeout / 1000000,
.tv_usec = tap_timeout % 1000000,
};
timevaladd(
&gest->taptimeout, &sc->lastsoftintr);
} else
timevalclear(&gest->taptimeout);
sc->flags |= PSM_FLAGS_FINGERDOWN;