Date: Sat, 18 Apr 2015 20:55:56 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281704 - head/sys/dev/atkbdc Message-ID: <201504182055.t3IKtuRx057644@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504182055.t3IKtuRx057644>