summaryrefslogtreecommitdiffstats
path: root/sys/dev/atkbdc/psm.c
diff options
context:
space:
mode:
authorrpaulo <rpaulo@FreeBSD.org>2015-04-25 01:23:29 +0000
committerrpaulo <rpaulo@FreeBSD.org>2015-04-25 01:23:29 +0000
commit465974d77be96e30c2bdce350ff807a99d5d20e4 (patch)
treee257265a6aca98ae5a534601e8f4cc6ae5ffa8c5 /sys/dev/atkbdc/psm.c
parentd67925d02440ca7f2f2d7f5f8f857828d2d7925e (diff)
downloadFreeBSD-src-465974d77be96e30c2bdce350ff807a99d5d20e4.zip
FreeBSD-src-465974d77be96e30c2bdce350ff807a99d5d20e4.tar.gz
MFC r281704:
Synaptics: don't report the middle button when clickPad is used.
Diffstat (limited to 'sys/dev/atkbdc/psm.c')
-rw-r--r--sys/dev/atkbdc/psm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index 1abfba0..e33c8cf 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -2746,7 +2746,8 @@ proc_synaptics(struct psm_softc *sc, packetbuf_t *pb, mousestatus_t *ms,
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;
OpenPOWER on IntegriCloud