Author: rpaulo
Date: Sat Apr 18 20:55:55 2015
New Revision: 281704
URL: https://svnweb.freebsd.org/changeset/base/281704
Log:
Synaptics: don't report the middle button when clickPad is used.
On trackpads that had support for both, we were sending two button
events when the trackpad was pressed.
Tested by: Jakob Alvermark <jakob at alvermark.net>
MFC after: 1 week
Modified:
head/sys/dev/atkbdc/psm.c
Modified: head/sys/dev/atkbdc/psm.c
==============================================================================
--- head/sys/dev/atkbdc/psm.c Sat Apr 18 20:55:33 2015 (r281703)
+++ head/sys/dev/atkbdc/psm.c Sat Apr 18 20:55:55 2015 (r281704)
@@ -2756,7 +2756,8 @@ proc_synaptics(struct psm_softc *sc, pac
touchpad_buttons |= MOUSE_BUTTON4DOWN;
if ((pb->ipacket[3] ^ pb->ipacket[0]) & 0x02)
touchpad_buttons |= MOUSE_BUTTON5DOWN;
- } else if (sc->synhw.capExtended && sc->synhw.capMiddle) {
+ } else if (sc->synhw.capExtended && sc->synhw.capMiddle &&
+ !sc->synhw.capClickPad) {
/* Middle Button */
if ((pb->ipacket[0] ^ pb->ipacket[3]) & 0x01)
touchpad_buttons |= MOUSE_BUTTON2DOWN;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
