Date: Sun, 3 May 2020 23:38:22 +0000 (UTC) From: Vladimir Kondratyev <wulf@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r360617 - in stable: 11/sys/dev/atkbdc 12/sys/dev/atkbdc Message-ID: <202005032338.043NcM5j078242@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wulf Date: Sun May 3 23:38:21 2020 New Revision: 360617 URL: https://svnweb.freebsd.org/changeset/base/360617 Log: MFC r360353: psm(4): Fix wrong key-release event occuring after trackpoint use. Some models of laptops e.g. "X1 Carbon 3rd Gen Thinkpad" have LRM buttons wired as so called "Synaptic touchpads extended buttons" rather thah real trackpoint buttons. Handle this case with merging of events from both sources. PR: 245877 Reported by: Raichoo <raichoo@googlemail.com> Modified: stable/12/sys/dev/atkbdc/psm.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/dev/atkbdc/psm.c Directory Properties: stable/11/ (props changed) Modified: stable/12/sys/dev/atkbdc/psm.c ============================================================================== --- stable/12/sys/dev/atkbdc/psm.c Sun May 3 23:15:14 2020 (r360616) +++ stable/12/sys/dev/atkbdc/psm.c Sun May 3 23:38:21 2020 (r360617) @@ -3366,7 +3366,7 @@ proc_synaptics(struct psm_softc *sc, packetbuf_t *pb, evdev_push_rel(sc->evdev_r, REL_X, *x); evdev_push_rel(sc->evdev_r, REL_Y, -*y); evdev_push_mouse_btn(sc->evdev_r, - guest_buttons); + guest_buttons | sc->extended_buttons); evdev_sync(sc->evdev_r); } #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005032338.043NcM5j078242>