svn commit: r304567 - head/sys/dev/usb/input

[Bruce Evans]

Author: bde
Date: Sun Aug 21 16:06:00 2016
New Revision: 304567
URL: https://svnweb.freebsd.org/changeset/base/304567

Log:
  Fix translation of the PrintScreen/SysRq and Pause/Break keys.  Almost
  everything was broken.  The cases that I noticed were Ctrl-PrintScreen
  not being mapped to the virtual scancode 0x5c (debug) and Pause not being
  mapped to the physical/virtual scancode 0x46 (slock).
  
  These keys are the most complicated ones due to kludges to give some
  compatibility back to before AT keyboards.
  
  Alt-PrintScreen must pretend to be a separate key from PrintScreen
  even at the "raw" level.  The (unique) usb code for it is 0x8a and we
  just have to map this to our unique virtual scancode 0x54, but we
  mapped it first to the internal code 0x7e and then to 0x79 which is a
  key on the Japanese 106/109 keyboard.  This fix is under the
  UKBD_EMULATE_ATASCANCODE option which shouldn't be used for non-AT
  keyboards.  If it is, then the syscons Japanese keymaps have nothing
  of importance for code 0x79 and can easily be changed.  0x54 is also
  unimportant in Japanese and US keymaps.
  
  NonAlt-PrintScreen and NonCtl-Pause/Break had many much larger bugs with
  smaller compatibility problems from fixing them.  The details are too
  ugly to give here.  Summary of the changed (hex) codes:
  
  K_RAW  PrintScreen (Ctl, Shift, Ctl-Shift):             E0-2A-E0-37 -> E0-37
  K_RAW  Alt-PrintScreen (all shift states):              79 -> 54
  K_RAW  Pause/Break (unshifted, Shift, Alt, Alt-Shift)): E0-46 -> E1-1D-45
  K_CODE ALT-PrintScreen (all shift states):              79 -> 54
  
  That is 15 of 32 shift combinations for 2 keys fixed, with 8 easy cases
  from the 79 -> 54 remapping.
  
  The difference is only large and with no workaround using a keymap for
  for K_RAW, but this affects other modes when ukbd is layered under kbmux
  because kbmux keeps all subdevices in K_RAW mode and translates.  Oops.
  I used kbdmux to generate the above table of changes.

Modified:
  head/sys/dev/usb/input/ukbd.c

Modified: head/sys/dev/usb/input/ukbd.c
==============================================================================
--- head/sys/dev/usb/input/ukbd.c	Sun Aug 21 16:03:44 2016	(r304566)
+++ head/sys/dev/usb/input/ukbd.c	Sun Aug 21 16:06:00 2016	(r304567)
@@ -323,7 +323,7 @@ static const uint8_t ukbd_trtab[256] = {
 	NN, NN, NN, NN, 115, 108, 111, 113,	/* 70 - 77 */
 	109, 110, 112, 118, 114, 116, 117, 119,	/* 78 - 7F */
 	121, 120, NN, NN, NN, NN, NN, 123,	/* 80 - 87 */
-	124, 125, 126, 127, 128, NN, NN, NN,	/* 88 - 8F */
+	124, 125, 84, 127, 128, NN, NN, NN,	/* 88 - 8F */
 	129, 130, NN, NN, NN, NN, NN, NN,	/* 90 - 97 */
 	NN, NN, NN, NN, NN, NN, NN, NN,	/* 98 - 9F */
 	NN, NN, NN, NN, NN, NN, NN, NN,	/* A0 - A7 */
@@ -1659,17 +1659,6 @@ next_code:
 			}
 		}
 		break;
-		/* XXX: I don't like these... */
-	case 0x5c:			/* print screen */
-		if (sc->sc_flags & ALTS) {
-			keycode = 0x54;	/* sysrq */
-		}
-		break;
-	case 0x68:			/* pause/break */
-		if (sc->sc_flags & CTLS) {
-			keycode = 0x6c;	/* break */
-		}
-		break;
 	}
 
 	/* return the key code in the K_CODE mode */
@@ -2049,7 +2038,7 @@ ukbd_key2scan(struct ukbd_softc *sc, int
 		/* 90-99 */
 		0x11d,	/* Ctrl-R */
 		0x135,	/* Divide */
-		0x137 | SCAN_PREFIX_SHIFT,	/* PrintScreen */
+		0x137,	/* PrintScreen */
 		0x138,	/* Alt-R */
 		0x147,	/* Home */
 		0x148,	/* Up */
@@ -2100,13 +2089,15 @@ ukbd_key2scan(struct ukbd_softc *sc, int
 	if ((code >= 89) && (code < (int)(89 + nitems(scan)))) {
 		code = scan[code - 89];
 	}
+	/* PrintScreen */
+	if (code == 0x137 && (!(shift & (MOD_CONTROL_L | MOD_CONTROL_R |
+	    MOD_ALT_L | MOD_ALT_R | MOD_SHIFT_L	| MOD_SHIFT_R)))) {
+		code |= SCAN_PREFIX_SHIFT;
+	}
 	/* Pause/Break */
-	if ((code == 104) && (!(shift & (MOD_CONTROL_L | MOD_CONTROL_R)))) {
+	if ((code == 0x146) && (!(shift & (MOD_CONTROL_L | MOD_CONTROL_R)))) {
 		code = (0x45 | SCAN_PREFIX_E1 | SCAN_PREFIX_CTL);
 	}
-	if (shift & (MOD_SHIFT_L | MOD_SHIFT_R)) {
-		code &= ~SCAN_PREFIX_SHIFT;
-	}
 	code |= (up ? SCAN_RELEASE : SCAN_PRESS);
 
 	if (code & SCAN_PREFIX) {