svn commit: r360353 - head/sys/dev/atkbdc

[Vladimir Kondratyev]

Author: wulf
Date: Sun Apr 26 20:06:08 2020
New Revision: 360353
URL: https://svnweb.freebsd.org/changeset/base/360353

Log:
  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 at googlemail.com>
  MFC after:	1 week

Modified:
  head/sys/dev/atkbdc/psm.c

Modified: head/sys/dev/atkbdc/psm.c
==============================================================================
--- head/sys/dev/atkbdc/psm.c	Sun Apr 26 19:43:27 2020	(r360352)
+++ head/sys/dev/atkbdc/psm.c	Sun Apr 26 20:06:08 2020	(r360353)
@@ -3371,7 +3371,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