USB -> Mac keycode data.

Review URL: https://chromiumcodereview.appspot.com/9704016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126690 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 375 insertions, 324 deletions

diff --git a/remoting/host/event_executor_mac.cc b/remoting/host/event_executor_mac.cc
index 6ced472..799b892 100644
--- a/remoting/host/event_executor_mac.cc
+++ b/remoting/host/event_executor_mac.cc
@@ -19,6 +19,11 @@ namespace remoting {
 
 namespace {
 
+// USB to Mac keycode mapping table.
+#define USB_KEYMAP(usb, xkb, win, mac) {usb, mac}
+#include "remoting/host/usb_keycode_map.h"
+#define INVALID_KEYCODE 0xffff
+
 using protocol::MouseEvent;
 using protocol::KeyEvent;
 
@@ -56,47 +61,53 @@ EventExecutorMac::EventExecutorMac(
 // TODO(wez): Replace this with something more closely tied to what
 // WebInputEventFactory does on Linux/GTK, and which respects the
 // host's keyboard layout.
+//
+// TODO(garykac): Remove this table once we switch to using USB
+// keycodes.
 const int kUsVkeyToKeysym[256] = {
   // 0x00 - 0x07
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0x04 - 0x07
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0x08 - 0x0B
-  kVK_Delete, kVK_Tab, -1, -1,
+  kVK_Delete, kVK_Tab, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0x0C - 0x0F
-  -1, kVK_Return, -1, -1,
+  INVALID_KEYCODE, kVK_Return, INVALID_KEYCODE, INVALID_KEYCODE,
 
   // 0x10 - 0x13
-  kVK_Shift, kVK_Control, kVK_Option, -1,
+  kVK_Shift, kVK_Control, kVK_Option, INVALID_KEYCODE,
   // 0x14 - 0x17
-  kVK_CapsLock, kVK_JIS_Kana, /* VKEY_HANGUL */ -1, /* VKEY_JUNJA */ -1,
+  kVK_CapsLock, kVK_JIS_Kana, /* VKEY_HANGUL */ INVALID_KEYCODE,
+  /* VKEY_JUNJA */ INVALID_KEYCODE,
   // 0x18 - 0x1B
-  /* VKEY_FINAL */ -1, /* VKEY_Kanji */ -1, -1, kVK_Escape,
+  /* VKEY_FINAL */ INVALID_KEYCODE, /* VKEY_Kanji */ INVALID_KEYCODE,
+  INVALID_KEYCODE, kVK_Escape,
   // 0x1C - 0x1F
-  /* VKEY_CONVERT */ -1, /* VKEY_NONCONVERT */ -1,
-  /* VKEY_ACCEPT */ -1, /* VKEY_MODECHANGE */ -1,
+  /* VKEY_CONVERT */ INVALID_KEYCODE, /* VKEY_NONCONVERT */ INVALID_KEYCODE,
+  /* VKEY_ACCEPT */ INVALID_KEYCODE, /* VKEY_MODECHANGE */ INVALID_KEYCODE,
 
   // 0x20 - 0x23
   kVK_Space, kVK_PageUp, kVK_PageDown, kVK_End,
   // 0x24 - 0x27
   kVK_Home, kVK_LeftArrow, kVK_UpArrow, kVK_RightArrow,
   // 0x28 - 0x2B
-  kVK_DownArrow, /* VKEY_SELECT */ -1, /* VKEY_PRINT */ -1,
-  /* VKEY_EXECUTE */ -1,
+  kVK_DownArrow, /* VKEY_SELECT */ INVALID_KEYCODE,
+  /* VKEY_PRINT */ INVALID_KEYCODE, /* VKEY_EXECUTE */ INVALID_KEYCODE,
   // 0x2C - 0x2F
-  /* VKEY_SNAPSHOT */ -1, /* XK_INSERT */ -1, kVK_ForwardDelete, kVK_Help,
+  /* VKEY_SNAPSHOT */ INVALID_KEYCODE, /* XK_INSERT */ INVALID_KEYCODE,
+  kVK_ForwardDelete, kVK_Help,
 
   // 0x30 - 0x33
   kVK_ANSI_0, kVK_ANSI_1, kVK_ANSI_2, kVK_ANSI_3,
   // 0x34 - 0x37
   kVK_ANSI_4, kVK_ANSI_5, kVK_ANSI_6, kVK_ANSI_7,
   // 0x38 - 0x3B
-  kVK_ANSI_8, kVK_ANSI_9, -1, -1,
+  kVK_ANSI_8, kVK_ANSI_9, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0x3C - 0x3F
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
 
   // 0x40 - 0x43
-  -1, kVK_ANSI_A, kVK_ANSI_B, kVK_ANSI_C,
+  INVALID_KEYCODE, kVK_ANSI_A, kVK_ANSI_B, kVK_ANSI_C,
   // 0x44 - 0x47
   kVK_ANSI_D, kVK_ANSI_E, kVK_ANSI_F, kVK_ANSI_G,
   // 0x48 - 0x4B
@@ -111,7 +122,7 @@ const int kUsVkeyToKeysym[256] = {
   // 0x58 - 0x5B
   kVK_ANSI_X, kVK_ANSI_Y, kVK_ANSI_Z, kVK_Command,
   // 0x5C - 0x5F
-  kVK_Command, kVK_Command, -1, /* VKEY_SLEEP */ -1,
+  kVK_Command, kVK_Command, INVALID_KEYCODE, /* VKEY_SLEEP */ INVALID_KEYCODE,
 
   // 0x60 - 0x63
   kVK_ANSI_Keypad0, kVK_ANSI_Keypad1, kVK_ANSI_Keypad2, kVK_ANSI_Keypad3,
@@ -121,7 +132,7 @@ const int kUsVkeyToKeysym[256] = {
   kVK_ANSI_Keypad8, kVK_ANSI_Keypad9, kVK_ANSI_KeypadMultiply,
   kVK_ANSI_KeypadPlus,
   // 0x6C - 0x6F
-  /* VKEY_SEPARATOR */ -1, kVK_ANSI_KeypadMinus,
+  /* VKEY_SEPARATOR */ INVALID_KEYCODE, kVK_ANSI_KeypadMinus,
   kVK_ANSI_KeypadDecimal, kVK_ANSI_KeypadDivide,
 
   // 0x70 - 0x73
@@ -136,92 +147,123 @@ const int kUsVkeyToKeysym[256] = {
   // 0x80 - 0x83
   kVK_F17, kVK_F18, kVK_F19, kVK_F20,
   // 0x84 - 0x87
-  /* VKEY_F21 */ -1, /* VKEY_F22 */ -1, /* VKEY_F23 */ -1, /* XKEY_F24 */ -1,
+  /* VKEY_F21 */ INVALID_KEYCODE, /* VKEY_F22 */ INVALID_KEYCODE,
+  /* VKEY_F23 */ INVALID_KEYCODE, /* XKEY_F24 */ INVALID_KEYCODE,
   // 0x88 - 0x8B
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0x8C - 0x8F
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
 
   // 0x90 - 0x93
-  /* VKEY_NUMLOCK */ -1, /* VKEY_SCROLL */ -1, -1, -1,
+  /* VKEY_NUMLOCK */ INVALID_KEYCODE, /* VKEY_SCROLL */ INVALID_KEYCODE,
+  INVALID_KEYCODE, INVALID_KEYCODE,
   // 0x94 - 0x97
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0x98 - 0x9B
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0x9C - 0x9F
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
 
   // 0xA0 - 0xA3
   kVK_Shift, kVK_RightShift, kVK_Control, kVK_RightControl,
   // 0xA4 - 0xA7
-  kVK_Option, kVK_RightOption, /* XF86kVK_Back */ -1, /* XF86kVK_Forward */ -1,
+  kVK_Option, kVK_RightOption,
+  /* XF86kVK_Back */ INVALID_KEYCODE, /* XF86kVK_Forward */ INVALID_KEYCODE,
   // 0xA8 - 0xAB
-  /* XF86kVK_Refresh */ -1, /* XF86kVK_Stop */ -1, /* XF86kVK_Search */ -1,
-  /* XF86kVK_Favorites */ -1,
+  /* XF86kVK_Refresh */ INVALID_KEYCODE, /* XF86kVK_Stop */ INVALID_KEYCODE,
+  /* XF86kVK_Search */ INVALID_KEYCODE,
+  /* XF86kVK_Favorites */ INVALID_KEYCODE,
   // 0xAC - 0xAF
-  /* XF86kVK_HomePage */ -1, kVK_Mute, kVK_VolumeDown, kVK_VolumeUp,
+  /* XF86kVK_HomePage */ INVALID_KEYCODE, kVK_Mute, kVK_VolumeDown,
+  kVK_VolumeUp,
 
   // 0xB0 - 0xB3
-  /* XF86kVK_AudioNext */ -1, /* XF86kVK_AudioPrev */ -1,
-  /* XF86kVK_AudioStop */ -1, /* XF86kVK_AudioPause */ -1,
+  /* XF86kVK_AudioNext */ INVALID_KEYCODE,
+  /* XF86kVK_AudioPrev */ INVALID_KEYCODE,
+  /* XF86kVK_AudioStop */ INVALID_KEYCODE,
+  /* XF86kVK_AudioPause */ INVALID_KEYCODE,
   // 0xB4 - 0xB7
-  /* XF86kVK_Mail */ -1, /* XF86kVK_AudioMedia */ -1, /* XF86kVK_Launch0 */ -1,
-  /* XF86kVK_Launch1 */ -1,
+  /* XF86kVK_Mail */ INVALID_KEYCODE, /* XF86kVK_AudioMedia */ INVALID_KEYCODE,
+  /* XF86kVK_Launch0 */ INVALID_KEYCODE, /* XF86kVK_Launch1 */ INVALID_KEYCODE,
   // 0xB8 - 0xBB
-  -1, -1, kVK_ANSI_Semicolon, kVK_ANSI_Equal,
+  INVALID_KEYCODE, INVALID_KEYCODE, kVK_ANSI_Semicolon, kVK_ANSI_Equal,
   // 0xBC - 0xBF
   kVK_ANSI_Comma, kVK_ANSI_Minus, kVK_ANSI_Period, kVK_ANSI_Slash,
 
   // 0xC0 - 0xC3
-  kVK_ANSI_Grave, -1, -1, -1,
+  kVK_ANSI_Grave, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0xC4 - 0xC7
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0xC8 - 0xCB
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0xCC - 0xCF
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
 
   // 0xD0 - 0xD3
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0xD4 - 0xD7
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0xD8 - 0xDB
-  -1, -1, -1, kVK_ANSI_LeftBracket,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, kVK_ANSI_LeftBracket,
   // 0xDC - 0xDF
   kVK_ANSI_Backslash, kVK_ANSI_RightBracket, kVK_ANSI_Quote,
-  /* VKEY_OEM_8 */ -1,
+  /* VKEY_OEM_8 */ INVALID_KEYCODE,
 
   // 0xE0 - 0xE3
-  -1, -1, /* VKEY_OEM_102 */ -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, /* VKEY_OEM_102 */ INVALID_KEYCODE,
+  INVALID_KEYCODE,
   // 0xE4 - 0xE7
-  -1, /* VKEY_PROCESSKEY */ -1, -1, /* VKEY_PACKET */ -1,
+  INVALID_KEYCODE, /* VKEY_PROCESSKEY */ INVALID_KEYCODE, INVALID_KEYCODE,
+  /* VKEY_PACKET */ INVALID_KEYCODE,
   // 0xE8 - 0xEB
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0xEC - 0xEF
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
 
   // 0xF0 - 0xF3
-  -1, -1, -1, -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE, INVALID_KEYCODE,
   // 0xF4 - 0xF7
-  -1, -1, /* VKEY_ATTN */ -1, /* VKEY_CRSEL */ -1,
+  INVALID_KEYCODE, INVALID_KEYCODE, /* VKEY_ATTN */ INVALID_KEYCODE,
+  /* VKEY_CRSEL */ INVALID_KEYCODE,
   // 0xF8 - 0xFB
-  /* VKEY_EXSEL */ -1, /* VKEY_EREOF */ -1, /* VKEY_PLAY */ -1,
-  /* VKEY_ZOOM */ -1,
+  /* VKEY_EXSEL */ INVALID_KEYCODE, /* VKEY_EREOF */ INVALID_KEYCODE,
+  /* VKEY_PLAY */ INVALID_KEYCODE, /* VKEY_ZOOM */ INVALID_KEYCODE,
   // 0xFC - 0xFF
-  /* VKEY_NONAME */ -1, /* VKEY_PA1 */ -1, /* VKEY_OEM_CLEAR */ -1, -1
+  /* VKEY_NONAME */ INVALID_KEYCODE, /* VKEY_PA1 */ INVALID_KEYCODE,
+  /* VKEY_OEM_CLEAR */ INVALID_KEYCODE, INVALID_KEYCODE
 };
 
+uint16_t UsbKeycodeToMacKeycode(uint32_t usb_keycode) {
+  if (usb_keycode == 0)
+    return INVALID_KEYCODE;
+
+  for (uint i = 0; i < arraysize(usb_keycode_map); i++) {
+    if (usb_keycode_map[i].usb_keycode == usb_keycode)
+      return usb_keycode_map[i].native_keycode;
+  }
+
+  return INVALID_KEYCODE;
+}
+
 void EventExecutorMac::InjectKeyEvent(const KeyEvent& event) {
-  int key_code = event.keycode();
-  if (key_code >= 0 && key_code < 256) {
-    int key_sym = kUsVkeyToKeysym[key_code];
-    if (key_sym != -1) {
-      // We use the deprecated event injection API because the new one doesn't
-      // work with switched-out sessions (curtain mode).
-      CGError error = CGPostKeyboardEvent(0, key_sym, event.pressed());
-      if (error != kCGErrorSuccess) {
-        LOG(WARNING) << "CGPostKeyboardEvent error " << error;
-      }
+  int keycode = 0;
+  if (event.has_usb_keycode() && event.usb_keycode() != INVALID_KEYCODE) {
+    keycode = UsbKeycodeToMacKeycode(event.usb_keycode());
+    VLOG(1) << "USB keycode: " << std::hex << event.usb_keycode()
+            << " to Mac keycode: " << keycode << std::dec;
+  } else {
+    int win_keycode = event.keycode();
+    if (win_keycode >= 0 && win_keycode < 256) {
+      keycode = kUsVkeyToKeysym[win_keycode];
+    }
+  }
+
+  if (keycode != INVALID_KEYCODE) {
+    // We use the deprecated event injection API because the new one doesn't
+    // work with switched-out sessions (curtain mode).
+    CGError error = CGPostKeyboardEvent(0, keycode, event.pressed());
+    if (error != kCGErrorSuccess) {
+      LOG(WARNING) << "CGPostKeyboardEvent error " << error;
     }
   }
 }
diff --git a/remoting/host/usb_keycode_map.h b/remoting/host/usb_keycode_map.h
index 3845c18c..9828769 100644
--- a/remoting/host/usb_keycode_map.h
+++ b/remoting/host/usb_keycode_map.h
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// Data in this file was created by referencing:
+//  USB HID Usage Tables (v1.11) 27 June 2001
+//  HIToolbox/Events.h (Mac)
+
 typedef struct {
   // USB keycode:
   //  Upper 16-bits: USB Usage Page.
@@ -25,8 +29,8 @@ const usb_keymap usb_keycode_map[] = {
   // in the 0x0c USB page.
 
   //            USB      XKB     Win     Mac
-  USB_KEYMAP(0x010082, 0x0096, 0x0000, 0x0000),  // SystemSleep
-  USB_KEYMAP(0x010083, 0x0097, 0x0000, 0x0000),  // SystemWakeUp
+  USB_KEYMAP(0x010082, 0x0096, 0x0000, 0xffff),  // SystemSleep
+  USB_KEYMAP(0x010083, 0x0097, 0x0000, 0xffff),  // SystemWakeUp
 
   // =========================================
   // USB Usage Page 0x07: Keyboard/Keypad Page
@@ -38,276 +42,281 @@ const usb_keymap usb_keycode_map[] = {
   // XKB#006d Linefeed
   // XKB#008a SunProps cf. USB#0700a3 CrSel/Props
   // XKB#008e SunOpen
+  // Mac#003f kVK_Function
+  // Mac#000a kVK_ISO_Section (ISO keyboards only)
+  // Mac#0066 kVK_JIS_Eisu (USB#07008a Henkan?)
 
   //            USB      XKB     Win     Mac
-  USB_KEYMAP(0x070000, 0x0000, 0x0000, 0x0000),  // Reserved
-  USB_KEYMAP(0x070001, 0x0000, 0x0000, 0x0000),  // ErrorRollOver
-  USB_KEYMAP(0x070002, 0x0000, 0x0000, 0x0000),  // POSTFail
-  USB_KEYMAP(0x070003, 0x0000, 0x0000, 0x0000),  // ErrorUndefined
+  USB_KEYMAP(0x070000, 0x0000, 0x0000, 0xffff),  // Reserved
+  USB_KEYMAP(0x070001, 0x0000, 0x0000, 0xffff),  // ErrorRollOver
+  USB_KEYMAP(0x070002, 0x0000, 0x0000, 0xffff),  // POSTFail
+  USB_KEYMAP(0x070003, 0x0000, 0x0000, 0xffff),  // ErrorUndefined
   USB_KEYMAP(0x070004, 0x0026, 0x0000, 0x0000),  // aA
-  USB_KEYMAP(0x070005, 0x0038, 0x0000, 0x0000),  // bB
-  USB_KEYMAP(0x070006, 0x0036, 0x0000, 0x0000),  // cC
-  USB_KEYMAP(0x070007, 0x0028, 0x0000, 0x0000),  // dD
-
-  USB_KEYMAP(0x070008, 0x001a, 0x0000, 0x0000),  // eE
-  USB_KEYMAP(0x070009, 0x0029, 0x0000, 0x0000),  // fF
-  USB_KEYMAP(0x07000a, 0x002a, 0x0000, 0x0000),  // gG
-  USB_KEYMAP(0x07000b, 0x002b, 0x0000, 0x0000),  // hH
-  USB_KEYMAP(0x07000c, 0x001f, 0x0000, 0x0000),  // iI
-  USB_KEYMAP(0x07000d, 0x002c, 0x0000, 0x0000),  // jJ
-  USB_KEYMAP(0x07000e, 0x002d, 0x0000, 0x0000),  // kK
-  USB_KEYMAP(0x07000f, 0x002e, 0x0000, 0x0000),  // lL
-
-  USB_KEYMAP(0x070010, 0x003a, 0x0000, 0x0000),  // mM
-  USB_KEYMAP(0x070011, 0x0039, 0x0000, 0x0000),  // nN
-  USB_KEYMAP(0x070012, 0x0020, 0x0000, 0x0000),  // oO
-  USB_KEYMAP(0x070013, 0x0021, 0x0000, 0x0000),  // pP
-  USB_KEYMAP(0x070014, 0x0018, 0x0000, 0x0000),  // qQ
-  USB_KEYMAP(0x070015, 0x001b, 0x0000, 0x0000),  // rR
-  USB_KEYMAP(0x070016, 0x0027, 0x0000, 0x0000),  // sS
-  USB_KEYMAP(0x070017, 0x001c, 0x0000, 0x0000),  // tT
-
-  USB_KEYMAP(0x070018, 0x001e, 0x0000, 0x0000),  // uU
-  USB_KEYMAP(0x070019, 0x0037, 0x0000, 0x0000),  // vV
-  USB_KEYMAP(0x07001a, 0x0019, 0x0000, 0x0000),  // wW
-  USB_KEYMAP(0x07001b, 0x0035, 0x0000, 0x0000),  // xX
-  USB_KEYMAP(0x07001c, 0x001d, 0x0000, 0x0000),  // yY
-  USB_KEYMAP(0x07001d, 0x0034, 0x0000, 0x0000),  // zZ
-  USB_KEYMAP(0x07001e, 0x000a, 0x0000, 0x0000),  // 1!
-  USB_KEYMAP(0x07001f, 0x000b, 0x0000, 0x0000),  // 2@
-
-  USB_KEYMAP(0x070020, 0x000c, 0x0000, 0x0000),  // 3#
-  USB_KEYMAP(0x070021, 0x000d, 0x0000, 0x0000),  // 4$
-  USB_KEYMAP(0x070022, 0x000e, 0x0000, 0x0000),  // 5%
-  USB_KEYMAP(0x070023, 0x000f, 0x0000, 0x0000),  // 6^
-  USB_KEYMAP(0x070024, 0x0010, 0x0000, 0x0000),  // 7&
-  USB_KEYMAP(0x070025, 0x0011, 0x0000, 0x0000),  // 8*
-  USB_KEYMAP(0x070026, 0x0012, 0x0000, 0x0000),  // 9(
-  USB_KEYMAP(0x070027, 0x0013, 0x0000, 0x0000),  // 0)
-
-  USB_KEYMAP(0x070028, 0x0024, 0x0000, 0x0000),  // Return
-  USB_KEYMAP(0x070029, 0x0009, 0x0000, 0x0000),  // Escape
-  USB_KEYMAP(0x07002a, 0x0016, 0x0000, 0x0000),  // Backspace
-  USB_KEYMAP(0x07002b, 0x0017, 0x0000, 0x0000),  // Tab
-  USB_KEYMAP(0x07002c, 0x0041, 0x0000, 0x0000),  // Spacebar
-  USB_KEYMAP(0x07002d, 0x0014, 0x0000, 0x0000),  // -_
-  USB_KEYMAP(0x07002e, 0x0015, 0x0000, 0x0000),  // =+
-  USB_KEYMAP(0x07002f, 0x0022, 0x0000, 0x0000),  // [{
-
-  USB_KEYMAP(0x070030, 0x0023, 0x0000, 0x0000),  // }]
-  USB_KEYMAP(0x070031, 0x0033, 0x0000, 0x0000),  // \| (US keyboard only)
+  USB_KEYMAP(0x070005, 0x0038, 0x0000, 0x000b),  // bB
+  USB_KEYMAP(0x070006, 0x0036, 0x0000, 0x0008),  // cC
+  USB_KEYMAP(0x070007, 0x0028, 0x0000, 0x0002),  // dD
+
+  USB_KEYMAP(0x070008, 0x001a, 0x0000, 0x000e),  // eE
+  USB_KEYMAP(0x070009, 0x0029, 0x0000, 0x0003),  // fF
+  USB_KEYMAP(0x07000a, 0x002a, 0x0000, 0x0005),  // gG
+  USB_KEYMAP(0x07000b, 0x002b, 0x0000, 0x0004),  // hH
+  USB_KEYMAP(0x07000c, 0x001f, 0x0000, 0x0022),  // iI
+  USB_KEYMAP(0x07000d, 0x002c, 0x0000, 0x0026),  // jJ
+  USB_KEYMAP(0x07000e, 0x002d, 0x0000, 0x0028),  // kK
+  USB_KEYMAP(0x07000f, 0x002e, 0x0000, 0x0025),  // lL
+
+  USB_KEYMAP(0x070010, 0x003a, 0x0000, 0x002e),  // mM
+  USB_KEYMAP(0x070011, 0x0039, 0x0000, 0x002d),  // nN
+  USB_KEYMAP(0x070012, 0x0020, 0x0000, 0x001f),  // oO
+  USB_KEYMAP(0x070013, 0x0021, 0x0000, 0x0023),  // pP
+  USB_KEYMAP(0x070014, 0x0018, 0x0000, 0x000c),  // qQ
+  USB_KEYMAP(0x070015, 0x001b, 0x0000, 0x000f),  // rR
+  USB_KEYMAP(0x070016, 0x0027, 0x0000, 0x0001),  // sS
+  USB_KEYMAP(0x070017, 0x001c, 0x0000, 0x0011),  // tT
+
+  USB_KEYMAP(0x070018, 0x001e, 0x0000, 0x0020),  // uU
+  USB_KEYMAP(0x070019, 0x0037, 0x0000, 0x0009),  // vV
+  USB_KEYMAP(0x07001a, 0x0019, 0x0000, 0x000d),  // wW
+  USB_KEYMAP(0x07001b, 0x0035, 0x0000, 0x0007),  // xX
+  USB_KEYMAP(0x07001c, 0x001d, 0x0000, 0x0010),  // yY
+  USB_KEYMAP(0x07001d, 0x0034, 0x0000, 0x0006),  // zZ
+  USB_KEYMAP(0x07001e, 0x000a, 0x0000, 0x0012),  // 1!
+  USB_KEYMAP(0x07001f, 0x000b, 0x0000, 0x0013),  // 2@
+
+  USB_KEYMAP(0x070020, 0x000c, 0x0000, 0x0014),  // 3#
+  USB_KEYMAP(0x070021, 0x000d, 0x0000, 0x0015),  // 4$
+  USB_KEYMAP(0x070022, 0x000e, 0x0000, 0x0017),  // 5%
+  USB_KEYMAP(0x070023, 0x000f, 0x0000, 0x0016),  // 6^
+  USB_KEYMAP(0x070024, 0x0010, 0x0000, 0x001a),  // 7&
+  USB_KEYMAP(0x070025, 0x0011, 0x0000, 0x001c),  // 8*
+  USB_KEYMAP(0x070026, 0x0012, 0x0000, 0x0019),  // 9(
+  USB_KEYMAP(0x070027, 0x0013, 0x0000, 0x001d),  // 0)
+
+  USB_KEYMAP(0x070028, 0x0024, 0x0000, 0x0024),  // Return
+  USB_KEYMAP(0x070029, 0x0009, 0x0000, 0x0035),  // Escape
+  USB_KEYMAP(0x07002a, 0x0016, 0x0000, 0x0033),  // Backspace
+  USB_KEYMAP(0x07002b, 0x0017, 0x0000, 0x0030),  // Tab
+  USB_KEYMAP(0x07002c, 0x0041, 0x0000, 0x0031),  // Spacebar
+  USB_KEYMAP(0x07002d, 0x0014, 0x0000, 0x001b),  // -_
+  USB_KEYMAP(0x07002e, 0x0015, 0x0000, 0x0018),  // =+
+  USB_KEYMAP(0x07002f, 0x0022, 0x0000, 0x0021),  // [{
+
+  USB_KEYMAP(0x070030, 0x0023, 0x0000, 0x001e),  // }]
+  USB_KEYMAP(0x070031, 0x0033, 0x0000, 0x002a),  // \| (US keyboard only)
   // USB#070032 is not present on US keyboard.
   // The keycap varies on international keyboards:
   //   Dan: '*  Dutch: <>  Ger: #'  UK: #~
   // For XKB, it uses the same scancode as the US \| key.
-  USB_KEYMAP(0x070032, 0x0033, 0x0000, 0x0000),  // #~ (Non-US)
-  USB_KEYMAP(0x070033, 0x002f, 0x0000, 0x0000),  // ;:
-  USB_KEYMAP(0x070034, 0x0030, 0x0000, 0x0000),  // '"
-  USB_KEYMAP(0x070035, 0x0031, 0x0000, 0x0000),  // `~
-  USB_KEYMAP(0x070036, 0x003b, 0x0000, 0x0000),  // ,<
-  USB_KEYMAP(0x070037, 0x003c, 0x0000, 0x0000),  // .>
-
-  USB_KEYMAP(0x070038, 0x003d, 0x0000, 0x0000),  // /?
-  USB_KEYMAP(0x070039, 0x0042, 0x0000, 0x0000),  // CapsLock
-  USB_KEYMAP(0x07003a, 0x0043, 0x0000, 0x0000),  // F1
-  USB_KEYMAP(0x07003b, 0x0044, 0x0000, 0x0000),  // F2
-  USB_KEYMAP(0x07003c, 0x0045, 0x0000, 0x0000),  // F3
-  USB_KEYMAP(0x07003d, 0x0046, 0x0000, 0x0000),  // F4
-  USB_KEYMAP(0x07003e, 0x0047, 0x0000, 0x0000),  // F5
-  USB_KEYMAP(0x07003f, 0x0048, 0x0000, 0x0000),  // F6
-
-  USB_KEYMAP(0x070040, 0x0049, 0x0000, 0x0000),  // F7
-  USB_KEYMAP(0x070041, 0x004a, 0x0000, 0x0000),  // F8
-  USB_KEYMAP(0x070042, 0x004b, 0x0000, 0x0000),  // F9
-  USB_KEYMAP(0x070043, 0x004c, 0x0000, 0x0000),  // F10
-  USB_KEYMAP(0x070044, 0x005f, 0x0000, 0x0000),  // F11
-  USB_KEYMAP(0x070045, 0x0060, 0x0000, 0x0000),  // F12
-  USB_KEYMAP(0x070046, 0x006b, 0x0000, 0x0000),  // PrintScreen
-  USB_KEYMAP(0x070047, 0x004e, 0x0000, 0x0000),  // ScrollLock
-
-  USB_KEYMAP(0x070048, 0x007f, 0x0000, 0x0000),  // Pause
-  USB_KEYMAP(0x070049, 0x0076, 0x0000, 0x0000),  // Insert
-  USB_KEYMAP(0x07004a, 0x006e, 0x0000, 0x0000),  // Home
-  USB_KEYMAP(0x07004b, 0x0070, 0x0000, 0x0000),  // PageUp
-  USB_KEYMAP(0x07004c, 0x0077, 0x0000, 0x0000),  // Delete (Forward Delete)
-  USB_KEYMAP(0x07004d, 0x0073, 0x0000, 0x0000),  // End
-  USB_KEYMAP(0x07004e, 0x0075, 0x0000, 0x0000),  // PageDown
-  USB_KEYMAP(0x07004f, 0x0072, 0x0000, 0x0000),  // RightArrow
-
-  USB_KEYMAP(0x070050, 0x0071, 0x0000, 0x0000),  // LeftArrow
-  USB_KEYMAP(0x070051, 0x0074, 0x0000, 0x0000),  // DownArrow
-  USB_KEYMAP(0x070052, 0x006f, 0x0000, 0x0000),  // UpArrow
-  USB_KEYMAP(0x070053, 0x004d, 0x0000, 0x0000),  // Keypad_NumLock Clear
-  USB_KEYMAP(0x070054, 0x006a, 0x0000, 0x0000),  // Keypad_/
-  USB_KEYMAP(0x070055, 0x003f, 0x0000, 0x0000),  // Keypad_*
-  USB_KEYMAP(0x070056, 0x0052, 0x0000, 0x0000),  // Keypad_-
-  USB_KEYMAP(0x070057, 0x0056, 0x0000, 0x0000),  // Keypad_+
-
-  USB_KEYMAP(0x070058, 0x0068, 0x0000, 0x0000),  // Keypad_Enter
-  USB_KEYMAP(0x070059, 0x0057, 0x0000, 0x0000),  // Keypad_1 End
-  USB_KEYMAP(0x07005a, 0x0058, 0x0000, 0x0000),  // Keypad_2 DownArrow
-  USB_KEYMAP(0x07005b, 0x0059, 0x0000, 0x0000),  // Keypad_3 PageDown
-  USB_KEYMAP(0x07005c, 0x0053, 0x0000, 0x0000),  // Keypad_4 LeftArrow
-  USB_KEYMAP(0x07005d, 0x0054, 0x0000, 0x0000),  // Keypad_5
-  USB_KEYMAP(0x07005e, 0x0055, 0x0000, 0x0000),  // Keypad_6 RightArrow
-  USB_KEYMAP(0x07005f, 0x004f, 0x0000, 0x0000),  // Keypad_7 Home
-
-  USB_KEYMAP(0x070060, 0x0050, 0x0000, 0x0000),  // Keypad_8 UpArrow
-  USB_KEYMAP(0x070061, 0x0051, 0x0000, 0x0000),  // Keypad_9 PageUp
-  USB_KEYMAP(0x070062, 0x005a, 0x0000, 0x0000),  // Keypad_0 Insert
-  USB_KEYMAP(0x070063, 0x005b, 0x0000, 0x0000),  // Keypad_. Delete
+  // TODO(garykac): Verify Mac intl keyboard.
+  USB_KEYMAP(0x070032, 0x0033, 0x0000, 0x002a),  // #~ (Non-US)
+  USB_KEYMAP(0x070033, 0x002f, 0x0000, 0x0029),  // ;:
+  USB_KEYMAP(0x070034, 0x0030, 0x0000, 0x0027),  // '"
+  USB_KEYMAP(0x070035, 0x0031, 0x0000, 0x0032),  // `~
+  USB_KEYMAP(0x070036, 0x003b, 0x0000, 0x002b),  // ,<
+  USB_KEYMAP(0x070037, 0x003c, 0x0000, 0x002f),  // .>
+
+  USB_KEYMAP(0x070038, 0x003d, 0x0000, 0x002c),  // /?
+  USB_KEYMAP(0x070039, 0x0042, 0x0000, 0x0039),  // CapsLock
+  USB_KEYMAP(0x07003a, 0x0043, 0x0000, 0x007a),  // F1
+  USB_KEYMAP(0x07003b, 0x0044, 0x0000, 0x0078),  // F2
+  USB_KEYMAP(0x07003c, 0x0045, 0x0000, 0x0063),  // F3
+  USB_KEYMAP(0x07003d, 0x0046, 0x0000, 0x0076),  // F4
+  USB_KEYMAP(0x07003e, 0x0047, 0x0000, 0x0060),  // F5
+  USB_KEYMAP(0x07003f, 0x0048, 0x0000, 0x0061),  // F6
+
+  USB_KEYMAP(0x070040, 0x0049, 0x0000, 0x0062),  // F7
+  USB_KEYMAP(0x070041, 0x004a, 0x0000, 0x0064),  // F8
+  USB_KEYMAP(0x070042, 0x004b, 0x0000, 0x0065),  // F9
+  USB_KEYMAP(0x070043, 0x004c, 0x0000, 0x006d),  // F10
+  USB_KEYMAP(0x070044, 0x005f, 0x0000, 0x0067),  // F11
+  USB_KEYMAP(0x070045, 0x0060, 0x0000, 0x006f),  // F12
+  USB_KEYMAP(0x070046, 0x006b, 0x0000, 0xffff),  // PrintScreen
+  USB_KEYMAP(0x070047, 0x004e, 0x0000, 0xffff),  // ScrollLock
+
+  USB_KEYMAP(0x070048, 0x007f, 0x0000, 0xffff),  // Pause
+  // Labeled "Help/Insert" on Mac.
+  USB_KEYMAP(0x070049, 0x0076, 0x0000, 0x0072),  // Insert
+  USB_KEYMAP(0x07004a, 0x006e, 0x0000, 0x0073),  // Home
+  USB_KEYMAP(0x07004b, 0x0070, 0x0000, 0x0074),  // PageUp
+  USB_KEYMAP(0x07004c, 0x0077, 0x0000, 0x0075),  // Delete (Forward Delete)
+  USB_KEYMAP(0x07004d, 0x0073, 0x0000, 0x0077),  // End
+  USB_KEYMAP(0x07004e, 0x0075, 0x0000, 0x0079),  // PageDown
+  USB_KEYMAP(0x07004f, 0x0072, 0x0000, 0x007c),  // RightArrow
+
+  USB_KEYMAP(0x070050, 0x0071, 0x0000, 0x007b),  // LeftArrow
+  USB_KEYMAP(0x070051, 0x0074, 0x0000, 0x007d),  // DownArrow
+  USB_KEYMAP(0x070052, 0x006f, 0x0000, 0x007e),  // UpArrow
+  USB_KEYMAP(0x070053, 0x004d, 0x0000, 0x0047),  // Keypad_NumLock Clear
+  USB_KEYMAP(0x070054, 0x006a, 0x0000, 0x004b),  // Keypad_/
+  USB_KEYMAP(0x070055, 0x003f, 0x0000, 0x0043),  // Keypad_*
+  USB_KEYMAP(0x070056, 0x0052, 0x0000, 0x004e),  // Keypad_-
+  USB_KEYMAP(0x070057, 0x0056, 0x0000, 0x0045),  // Keypad_+
+
+  USB_KEYMAP(0x070058, 0x0068, 0x0000, 0x004c),  // Keypad_Enter
+  USB_KEYMAP(0x070059, 0x0057, 0x0000, 0x0053),  // Keypad_1 End
+  USB_KEYMAP(0x07005a, 0x0058, 0x0000, 0x0054),  // Keypad_2 DownArrow
+  USB_KEYMAP(0x07005b, 0x0059, 0x0000, 0x0055),  // Keypad_3 PageDown
+  USB_KEYMAP(0x07005c, 0x0053, 0x0000, 0x0056),  // Keypad_4 LeftArrow
+  USB_KEYMAP(0x07005d, 0x0054, 0x0000, 0x0057),  // Keypad_5
+  USB_KEYMAP(0x07005e, 0x0055, 0x0000, 0x0058),  // Keypad_6 RightArrow
+  USB_KEYMAP(0x07005f, 0x004f, 0x0000, 0x0059),  // Keypad_7 Home
+
+  USB_KEYMAP(0x070060, 0x0050, 0x0000, 0x005b),  // Keypad_8 UpArrow
+  USB_KEYMAP(0x070061, 0x0051, 0x0000, 0x005c),  // Keypad_9 PageUp
+  USB_KEYMAP(0x070062, 0x005a, 0x0000, 0x0052),  // Keypad_0 Insert
+  USB_KEYMAP(0x070063, 0x005b, 0x0000, 0x0041),  // Keypad_. Delete
   // USB#070064 is not present on US keyboard.
   // This key is typically located near LeftShift key.
   // The keycap varies on international keyboards:
   //   Dan: <> Dutch: ][ Ger: <> UK: \|
   // TODO(garykac) Determine correct XKB scancode.
-  USB_KEYMAP(0x070064, 0x0000, 0x0000, 0x0000),  // Non-US \|
-  USB_KEYMAP(0x070065, 0x0087, 0x0000, 0x0000),  // AppMenu (next to RWin key)
-  USB_KEYMAP(0x070066, 0x007c, 0x0000, 0x0000),  // Power
-  USB_KEYMAP(0x070067, 0x007d, 0x0000, 0x0000),  // Keypad_=
-
-  USB_KEYMAP(0x070068, 0x0000, 0x0000, 0x0000),  // F13
-  USB_KEYMAP(0x070069, 0x0000, 0x0000, 0x0000),  // F14
-  USB_KEYMAP(0x07006a, 0x0000, 0x0000, 0x0000),  // F15
-  USB_KEYMAP(0x07006b, 0x0000, 0x0000, 0x0000),  // F16
-  USB_KEYMAP(0x07006c, 0x0000, 0x0000, 0x0000),  // F17
-  USB_KEYMAP(0x07006d, 0x0000, 0x0000, 0x0000),  // F18
-  USB_KEYMAP(0x07006e, 0x0000, 0x0000, 0x0000),  // F19
-  USB_KEYMAP(0x07006f, 0x0000, 0x0000, 0x0000),  // F20
-
-  USB_KEYMAP(0x070070, 0x0000, 0x0000, 0x0000),  // F21
-  USB_KEYMAP(0x070071, 0x0000, 0x0000, 0x0000),  // F22
-  USB_KEYMAP(0x070072, 0x0000, 0x0000, 0x0000),  // F23
-  USB_KEYMAP(0x070073, 0x0000, 0x0000, 0x0000),  // F24
-  USB_KEYMAP(0x070074, 0x0000, 0x0000, 0x0000),  // Execute
-  USB_KEYMAP(0x070075, 0x0092, 0x0000, 0x0000),  // Help
-  USB_KEYMAP(0x070076, 0x0093, 0x0000, 0x0000),  // Menu
-  USB_KEYMAP(0x070077, 0x0000, 0x0000, 0x0000),  // Select
-
-  USB_KEYMAP(0x070078, 0x0000, 0x0000, 0x0000),  // Stop
-  USB_KEYMAP(0x070079, 0x0089, 0x0000, 0x0000),  // Again (Redo)
-  USB_KEYMAP(0x07007a, 0x008b, 0x0000, 0x0000),  // Undo
-  USB_KEYMAP(0x07007b, 0x0091, 0x0000, 0x0000),  // Cut
-  USB_KEYMAP(0x07007c, 0x008d, 0x0000, 0x0000),  // Copy
-  USB_KEYMAP(0x07007d, 0x008f, 0x0000, 0x0000),  // Paste
-  USB_KEYMAP(0x07007e, 0x0090, 0x0000, 0x0000),  // Find
-  USB_KEYMAP(0x07007f, 0x0079, 0xe020, 0x0000),  // Mute
-
-  USB_KEYMAP(0x070080, 0x007b, 0xe030, 0x0000),  // VolumeUp
-  USB_KEYMAP(0x070081, 0x007a, 0xe02e, 0x0000),  // VolumeDown
-  USB_KEYMAP(0x070082, 0x0000, 0x0000, 0x0000),  // LockingCapsLock
-  USB_KEYMAP(0x070083, 0x0000, 0x0000, 0x0000),  // LockingNumLock
-  USB_KEYMAP(0x070084, 0x0000, 0x0000, 0x0000),  // LockingScrollLock
+  USB_KEYMAP(0x070064, 0x0000, 0x0000, 0xffff),  // Non-US \|
+  USB_KEYMAP(0x070065, 0x0087, 0x0000, 0xffff),  // AppMenu (next to RWin key)
+  USB_KEYMAP(0x070066, 0x007c, 0x0000, 0xffff),  // Power
+  USB_KEYMAP(0x070067, 0x007d, 0x0000, 0x0051),  // Keypad_=
+
+  USB_KEYMAP(0x070068, 0x0000, 0x0000, 0x0069),  // F13
+  USB_KEYMAP(0x070069, 0x0000, 0x0000, 0x006b),  // F14
+  USB_KEYMAP(0x07006a, 0x0000, 0x0000, 0x0071),  // F15
+  USB_KEYMAP(0x07006b, 0x0000, 0x0000, 0x006a),  // F16
+  USB_KEYMAP(0x07006c, 0x0000, 0x0000, 0x0040),  // F17
+  USB_KEYMAP(0x07006d, 0x0000, 0x0000, 0x004f),  // F18
+  USB_KEYMAP(0x07006e, 0x0000, 0x0000, 0x0050),  // F19
+  USB_KEYMAP(0x07006f, 0x0000, 0x0000, 0x005a),  // F20
+
+  USB_KEYMAP(0x070070, 0x0000, 0x0000, 0xffff),  // F21
+  USB_KEYMAP(0x070071, 0x0000, 0x0000, 0xffff),  // F22
+  USB_KEYMAP(0x070072, 0x0000, 0x0000, 0xffff),  // F23
+  USB_KEYMAP(0x070073, 0x0000, 0x0000, 0xffff),  // F24
+  USB_KEYMAP(0x070074, 0x0000, 0x0000, 0xffff),  // Execute
+  USB_KEYMAP(0x070075, 0x0092, 0x0000, 0xffff),  // Help
+  USB_KEYMAP(0x070076, 0x0093, 0x0000, 0xffff),  // Menu
+  USB_KEYMAP(0x070077, 0x0000, 0x0000, 0xffff),  // Select
+
+  USB_KEYMAP(0x070078, 0x0000, 0x0000, 0xffff),  // Stop
+  USB_KEYMAP(0x070079, 0x0089, 0x0000, 0xffff),  // Again (Redo)
+  USB_KEYMAP(0x07007a, 0x008b, 0x0000, 0xffff),  // Undo
+  USB_KEYMAP(0x07007b, 0x0091, 0x0000, 0xffff),  // Cut
+  USB_KEYMAP(0x07007c, 0x008d, 0x0000, 0xffff),  // Copy
+  USB_KEYMAP(0x07007d, 0x008f, 0x0000, 0xffff),  // Paste
+  USB_KEYMAP(0x07007e, 0x0090, 0x0000, 0xffff),  // Find
+  USB_KEYMAP(0x07007f, 0x0079, 0xe020, 0x004a),  // Mute
+
+  USB_KEYMAP(0x070080, 0x007b, 0xe030, 0x0048),  // VolumeUp
+  USB_KEYMAP(0x070081, 0x007a, 0xe02e, 0x0049),  // VolumeDown
+  USB_KEYMAP(0x070082, 0x0000, 0x0000, 0xffff),  // LockingCapsLock
+  USB_KEYMAP(0x070083, 0x0000, 0x0000, 0xffff),  // LockingNumLock
+  USB_KEYMAP(0x070084, 0x0000, 0x0000, 0xffff),  // LockingScrollLock
   // USB#070085 is used as Brazilian Keypad_.
-  USB_KEYMAP(0x070085, 0x0000, 0x0000, 0x0000),  // Keypad_Comma
+  USB_KEYMAP(0x070085, 0x0000, 0x0000, 0x005f),  // Keypad_Comma
   // USB#070086 is used on AS/400 keyboards. Standard Keypad_= is USB#070067.
-  //USB_KEYMAP(0x070086, 0x0000, 0x0000, 0x0000),  // Keypad_=
+  //USB_KEYMAP(0x070086, 0x0000, 0x0000, 0xffff),  // Keypad_=
   // USB#070087 is used for Brazilian /? and Japanese _ 'ro'.
-  USB_KEYMAP(0x070087, 0x0000, 0x0000, 0x0000),  // International1
+  USB_KEYMAP(0x070087, 0x0000, 0x0000, 0x005e),  // International1
 
   // USB#070088 is used as Japanese Hiragana/Katakana key.
-  USB_KEYMAP(0x070088, 0x0065, 0x0000, 0x0000),  // International2
+  USB_KEYMAP(0x070088, 0x0065, 0x0000, 0x0068),  // International2
   // USB#070089 is used as Japanese Yen key.
-  USB_KEYMAP(0x070089, 0x0000, 0x007d, 0x0000),  // International3
+  USB_KEYMAP(0x070089, 0x0000, 0x007d, 0x005d),  // International3
   // USB#07008a is used as Japanese Henkan (Convert) key.
-  USB_KEYMAP(0x07008a, 0x0064, 0x0000, 0x0000),  // International4
+  USB_KEYMAP(0x07008a, 0x0064, 0x0000, 0xffff),  // International4
   // USB#07008b is used as Japanese Muhenkan (No-convert) key.
-  USB_KEYMAP(0x07008b, 0x0066, 0x0000, 0x0000),  // International5
-  USB_KEYMAP(0x07008c, 0x0000, 0x0000, 0x0000),  // International6
-  USB_KEYMAP(0x07008d, 0x0000, 0x0000, 0x0000),  // International7
-  USB_KEYMAP(0x07008e, 0x0000, 0x0000, 0x0000),  // International8
-  USB_KEYMAP(0x07008f, 0x0000, 0x0000, 0x0000),  // International9
+  USB_KEYMAP(0x07008b, 0x0066, 0x0000, 0xffff),  // International5
+  USB_KEYMAP(0x07008c, 0x0000, 0x0000, 0xffff),  // International6
+  USB_KEYMAP(0x07008d, 0x0000, 0x0000, 0xffff),  // International7
+  USB_KEYMAP(0x07008e, 0x0000, 0x0000, 0xffff),  // International8
+  USB_KEYMAP(0x07008f, 0x0000, 0x0000, 0xffff),  // International9
 
   // USB#070090 is used as Korean Hangul/English toggle key.
-  USB_KEYMAP(0x070090, 0x0082, 0x0000, 0x0000),  // LANG1
+  USB_KEYMAP(0x070090, 0x0082, 0x0000, 0xffff),  // LANG1
   // USB#070091 is used as Korean Hanja conversion key.
-  USB_KEYMAP(0x070091, 0x0083, 0x0000, 0x0000),  // LANG2
+  USB_KEYMAP(0x070091, 0x0083, 0x0000, 0xffff),  // LANG2
   // USB#070092 is used as Japanese Katakana key.
-  USB_KEYMAP(0x070092, 0x0062, 0x0000, 0x0000),  // LANG3
+  USB_KEYMAP(0x070092, 0x0062, 0x0000, 0xffff),  // LANG3
   // USB#070093 is used as Japanese Hiragana key.
-  USB_KEYMAP(0x070093, 0x0063, 0x0000, 0x0000),  // LANG4
+  USB_KEYMAP(0x070093, 0x0063, 0x0000, 0xffff),  // LANG4
   // USB#070094 is used as Japanese Zenkaku/Hankaku (Fullwidth/halfwidth) key.
-  USB_KEYMAP(0x070094, 0x0000, 0x0000, 0x0000),  // LANG5
-  USB_KEYMAP(0x070095, 0x0000, 0x0000, 0x0000),  // LANG6
-  USB_KEYMAP(0x070096, 0x0000, 0x0000, 0x0000),  // LANG7
-  USB_KEYMAP(0x070097, 0x0000, 0x0000, 0x0000),  // LANG8
-
-  USB_KEYMAP(0x070098, 0x0000, 0x0000, 0x0000),  // LANG9
-  USB_KEYMAP(0x070099, 0x0000, 0x0000, 0x0000),  // AlternateErase
-  USB_KEYMAP(0x07009a, 0x0000, 0x0000, 0x0000),  // SysReq/Attention
-  USB_KEYMAP(0x07009b, 0x0088, 0x0000, 0x0000),  // Cancel
-  USB_KEYMAP(0x07009c, 0x0000, 0x0000, 0x0000),  // Clear
-  USB_KEYMAP(0x07009d, 0x0000, 0x0000, 0x0000),  // Prior
-  USB_KEYMAP(0x07009e, 0x0000, 0x0000, 0x0000),  // Return
-  USB_KEYMAP(0x07009f, 0x0000, 0x0000, 0x0000),  // Separator
-
-  USB_KEYMAP(0x0700a0, 0x0000, 0x0000, 0x0000),  // Out
-  USB_KEYMAP(0x0700a1, 0x0000, 0x0000, 0x0000),  // Oper
-  USB_KEYMAP(0x0700a2, 0x0000, 0x0000, 0x0000),  // Clear/Again
-  USB_KEYMAP(0x0700a3, 0x0000, 0x0000, 0x0000),  // CrSel/Props
-  USB_KEYMAP(0x0700a4, 0x0000, 0x0000, 0x0000),  // ExSel
-
-  //USB_KEYMAP(0x0700b0, 0x0000, 0x0000, 0x0000),  // Keypad_00
-  //USB_KEYMAP(0x0700b1, 0x0000, 0x0000, 0x0000),  // Keypad_000
-  //USB_KEYMAP(0x0700b2, 0x0000, 0x0000, 0x0000),  // ThousandsSeparator
-  //USB_KEYMAP(0x0700b3, 0x0000, 0x0000, 0x0000),  // DecimalSeparator
-  //USB_KEYMAP(0x0700b4, 0x0000, 0x0000, 0x0000),  // CurrencyUnit
-  //USB_KEYMAP(0x0700b5, 0x0000, 0x0000, 0x0000),  // CurrencySubunit
-  USB_KEYMAP(0x0700b6, 0x00bb, 0x0000, 0x0000),  // Keypad_(
-  USB_KEYMAP(0x0700b7, 0x00bc, 0x0000, 0x0000),  // Keypad_)
-
-  //USB_KEYMAP(0x0700b8, 0x0000, 0x0000, 0x0000),  // Keypad_{
-  //USB_KEYMAP(0x0700b9, 0x0000, 0x0000, 0x0000),  // Keypad_}
-  //USB_KEYMAP(0x0700ba, 0x0000, 0x0000, 0x0000),  // Keypad_Tab
-  //USB_KEYMAP(0x0700bb, 0x0000, 0x0000, 0x0000),  // Keypad_Backspace
-  //USB_KEYMAP(0x0700bc, 0x0000, 0x0000, 0x0000),  // Keypad_A
-  //USB_KEYMAP(0x0700bd, 0x0000, 0x0000, 0x0000),  // Keypad_B
-  //USB_KEYMAP(0x0700be, 0x0000, 0x0000, 0x0000),  // Keypad_C
-  //USB_KEYMAP(0x0700bf, 0x0000, 0x0000, 0x0000),  // Keypad_D
-
-  //USB_KEYMAP(0x0700c0, 0x0000, 0x0000, 0x0000),  // Keypad_E
-  //USB_KEYMAP(0x0700c1, 0x0000, 0x0000, 0x0000),  // Keypad_F
-  //USB_KEYMAP(0x0700c2, 0x0000, 0x0000, 0x0000),  // Keypad_Xor
-  //USB_KEYMAP(0x0700c3, 0x0000, 0x0000, 0x0000),  // Keypad_^
-  //USB_KEYMAP(0x0700c4, 0x0000, 0x0000, 0x0000),  // Keypad_%
-  //USB_KEYMAP(0x0700c5, 0x0000, 0x0000, 0x0000),  // Keypad_<
-  //USB_KEYMAP(0x0700c6, 0x0000, 0x0000, 0x0000),  // Keypad_>
-  //USB_KEYMAP(0x0700c7, 0x0000, 0x0000, 0x0000),  // Keypad_&
-
-  //USB_KEYMAP(0x0700c8, 0x0000, 0x0000, 0x0000),  // Keypad_&&
-  //USB_KEYMAP(0x0700c9, 0x0000, 0x0000, 0x0000),  // Keypad_|
-  //USB_KEYMAP(0x0700ca, 0x0000, 0x0000, 0x0000),  // Keypad_||
-  //USB_KEYMAP(0x0700cb, 0x0000, 0x0000, 0x0000),  // Keypad_:
-  //USB_KEYMAP(0x0700cc, 0x0000, 0x0000, 0x0000),  // Keypad_#
-  //USB_KEYMAP(0x0700cd, 0x0000, 0x0000, 0x0000),  // Keypad_Space
-  //USB_KEYMAP(0x0700ce, 0x0000, 0x0000, 0x0000),  // Keypad_@
-  //USB_KEYMAP(0x0700cf, 0x0000, 0x0000, 0x0000),  // Keypad_!
-
-  //USB_KEYMAP(0x0700d0, 0x0000, 0x0000, 0x0000),  // Keypad_MemoryStore
-  //USB_KEYMAP(0x0700d1, 0x0000, 0x0000, 0x0000),  // Keypad_MemoryRecall
-  //USB_KEYMAP(0x0700d2, 0x0000, 0x0000, 0x0000),  // Keypad_MemoryClear
-  //USB_KEYMAP(0x0700d3, 0x0000, 0x0000, 0x0000),  // Keypad_MemoryAdd
-  //USB_KEYMAP(0x0700d4, 0x0000, 0x0000, 0x0000),  // Keypad_MemorySubtract
-  //USB_KEYMAP(0x0700d5, 0x0000, 0x0000, 0x0000),  // Keypad_MemoryMultiply
-  //USB_KEYMAP(0x0700d6, 0x0000, 0x0000, 0x0000),  // Keypad_MemoryDivide
-  USB_KEYMAP(0x0700d7, 0x007e, 0x0000, 0x0000),  // Keypad_+/-
-
-  //USB_KEYMAP(0x0700d8, 0x0000, 0x0000, 0x0000),  // Keypad_Clear
-  //USB_KEYMAP(0x0700d9, 0x0000, 0x0000, 0x0000),  // Keypad_ClearEntry
-  //USB_KEYMAP(0x0700da, 0x0000, 0x0000, 0x0000),  // Keypad_Binary
-  //USB_KEYMAP(0x0700db, 0x0000, 0x0000, 0x0000),  // Keypad_Octal
-  USB_KEYMAP(0x0700dc, 0x0081, 0x0000, 0x0000),  // Keypad_Decimal
-  //USB_KEYMAP(0x0700dd, 0x0000, 0x0000, 0x0000),  // Keypad_Hexadecimal
+  USB_KEYMAP(0x070094, 0x0000, 0x0000, 0xffff),  // LANG5
+  USB_KEYMAP(0x070095, 0x0000, 0x0000, 0xffff),  // LANG6
+  USB_KEYMAP(0x070096, 0x0000, 0x0000, 0xffff),  // LANG7
+  USB_KEYMAP(0x070097, 0x0000, 0x0000, 0xffff),  // LANG8
+
+  USB_KEYMAP(0x070098, 0x0000, 0x0000, 0xffff),  // LANG9
+  USB_KEYMAP(0x070099, 0x0000, 0x0000, 0xffff),  // AlternateErase
+  USB_KEYMAP(0x07009a, 0x0000, 0x0000, 0xffff),  // SysReq/Attention
+  USB_KEYMAP(0x07009b, 0x0088, 0x0000, 0xffff),  // Cancel
+  USB_KEYMAP(0x07009c, 0x0000, 0x0000, 0xffff),  // Clear
+  USB_KEYMAP(0x07009d, 0x0000, 0x0000, 0xffff),  // Prior
+  USB_KEYMAP(0x07009e, 0x0000, 0x0000, 0xffff),  // Return
+  USB_KEYMAP(0x07009f, 0x0000, 0x0000, 0xffff),  // Separator
+
+  USB_KEYMAP(0x0700a0, 0x0000, 0x0000, 0xffff),  // Out
+  USB_KEYMAP(0x0700a1, 0x0000, 0x0000, 0xffff),  // Oper
+  USB_KEYMAP(0x0700a2, 0x0000, 0x0000, 0xffff),  // Clear/Again
+  USB_KEYMAP(0x0700a3, 0x0000, 0x0000, 0xffff),  // CrSel/Props
+  USB_KEYMAP(0x0700a4, 0x0000, 0x0000, 0xffff),  // ExSel
+
+  //USB_KEYMAP(0x0700b0, 0x0000, 0x0000, 0xffff),  // Keypad_00
+  //USB_KEYMAP(0x0700b1, 0x0000, 0x0000, 0xffff),  // Keypad_000
+  //USB_KEYMAP(0x0700b2, 0x0000, 0x0000, 0xffff),  // ThousandsSeparator
+  //USB_KEYMAP(0x0700b3, 0x0000, 0x0000, 0xffff),  // DecimalSeparator
+  //USB_KEYMAP(0x0700b4, 0x0000, 0x0000, 0xffff),  // CurrencyUnit
+  //USB_KEYMAP(0x0700b5, 0x0000, 0x0000, 0xffff),  // CurrencySubunit
+  USB_KEYMAP(0x0700b6, 0x00bb, 0x0000, 0xffff),  // Keypad_(
+  USB_KEYMAP(0x0700b7, 0x00bc, 0x0000, 0xffff),  // Keypad_)
+
+  //USB_KEYMAP(0x0700b8, 0x0000, 0x0000, 0xffff),  // Keypad_{
+  //USB_KEYMAP(0x0700b9, 0x0000, 0x0000, 0xffff),  // Keypad_}
+  //USB_KEYMAP(0x0700ba, 0x0000, 0x0000, 0xffff),  // Keypad_Tab
+  //USB_KEYMAP(0x0700bb, 0x0000, 0x0000, 0xffff),  // Keypad_Backspace
+  //USB_KEYMAP(0x0700bc, 0x0000, 0x0000, 0xffff),  // Keypad_A
+  //USB_KEYMAP(0x0700bd, 0x0000, 0x0000, 0xffff),  // Keypad_B
+  //USB_KEYMAP(0x0700be, 0x0000, 0x0000, 0xffff),  // Keypad_C
+  //USB_KEYMAP(0x0700bf, 0x0000, 0x0000, 0xffff),  // Keypad_D
+
+  //USB_KEYMAP(0x0700c0, 0x0000, 0x0000, 0xffff),  // Keypad_E
+  //USB_KEYMAP(0x0700c1, 0x0000, 0x0000, 0xffff),  // Keypad_F
+  //USB_KEYMAP(0x0700c2, 0x0000, 0x0000, 0xffff),  // Keypad_Xor
+  //USB_KEYMAP(0x0700c3, 0x0000, 0x0000, 0xffff),  // Keypad_^
+  //USB_KEYMAP(0x0700c4, 0x0000, 0x0000, 0xffff),  // Keypad_%
+  //USB_KEYMAP(0x0700c5, 0x0000, 0x0000, 0xffff),  // Keypad_<
+  //USB_KEYMAP(0x0700c6, 0x0000, 0x0000, 0xffff),  // Keypad_>
+  //USB_KEYMAP(0x0700c7, 0x0000, 0x0000, 0xffff),  // Keypad_&
+
+  //USB_KEYMAP(0x0700c8, 0x0000, 0x0000, 0xffff),  // Keypad_&&
+  //USB_KEYMAP(0x0700c9, 0x0000, 0x0000, 0xffff),  // Keypad_|
+  //USB_KEYMAP(0x0700ca, 0x0000, 0x0000, 0xffff),  // Keypad_||
+  //USB_KEYMAP(0x0700cb, 0x0000, 0x0000, 0xffff),  // Keypad_:
+  //USB_KEYMAP(0x0700cc, 0x0000, 0x0000, 0xffff),  // Keypad_#
+  //USB_KEYMAP(0x0700cd, 0x0000, 0x0000, 0xffff),  // Keypad_Space
+  //USB_KEYMAP(0x0700ce, 0x0000, 0x0000, 0xffff),  // Keypad_@
+  //USB_KEYMAP(0x0700cf, 0x0000, 0x0000, 0xffff),  // Keypad_!
+
+  //USB_KEYMAP(0x0700d0, 0x0000, 0x0000, 0xffff),  // Keypad_MemoryStore
+  //USB_KEYMAP(0x0700d1, 0x0000, 0x0000, 0xffff),  // Keypad_MemoryRecall
+  //USB_KEYMAP(0x0700d2, 0x0000, 0x0000, 0xffff),  // Keypad_MemoryClear
+  //USB_KEYMAP(0x0700d3, 0x0000, 0x0000, 0xffff),  // Keypad_MemoryAdd
+  //USB_KEYMAP(0x0700d4, 0x0000, 0x0000, 0xffff),  // Keypad_MemorySubtract
+  //USB_KEYMAP(0x0700d5, 0x0000, 0x0000, 0xffff),  // Keypad_MemoryMultiply
+  //USB_KEYMAP(0x0700d6, 0x0000, 0x0000, 0xffff),  // Keypad_MemoryDivide
+  USB_KEYMAP(0x0700d7, 0x007e, 0x0000, 0xffff),  // Keypad_+/-
+
+  //USB_KEYMAP(0x0700d8, 0x0000, 0x0000, 0xffff),  // Keypad_Clear
+  //USB_KEYMAP(0x0700d9, 0x0000, 0x0000, 0xffff),  // Keypad_ClearEntry
+  //USB_KEYMAP(0x0700da, 0x0000, 0x0000, 0xffff),  // Keypad_Binary
+  //USB_KEYMAP(0x0700db, 0x0000, 0x0000, 0xffff),  // Keypad_Octal
+  USB_KEYMAP(0x0700dc, 0x0081, 0x0000, 0xffff),  // Keypad_Decimal
+  //USB_KEYMAP(0x0700dd, 0x0000, 0x0000, 0xffff),  // Keypad_Hexadecimal
   // USB#0700de - #0700df are reserved.
 
-  USB_KEYMAP(0x0700e0, 0x0025, 0x0000, 0x0000),  // LeftControl
-  USB_KEYMAP(0x0700e1, 0x0032, 0x0000, 0x0000),  // LeftShift
-  USB_KEYMAP(0x0700e2, 0x0040, 0x0000, 0x0000),  // LeftAlt
-  USB_KEYMAP(0x0700e3, 0x0085, 0x0000, 0x0000),  // LeftGUI/Super/Win
-  USB_KEYMAP(0x0700e4, 0x0069, 0x0000, 0x0000),  // RightControl
-  USB_KEYMAP(0x0700e5, 0x003e, 0x0000, 0x0000),  // RightShift
-  USB_KEYMAP(0x0700e6, 0x006c, 0x0000, 0x0000),  // RightAlt
-  USB_KEYMAP(0x0700e7, 0x0086, 0x0000, 0x0000),  // RightGUI/Super/Win
+  USB_KEYMAP(0x0700e0, 0x0025, 0x0000, 0x003b),  // LeftControl
+  USB_KEYMAP(0x0700e1, 0x0032, 0x0000, 0x0038),  // LeftShift
+  USB_KEYMAP(0x0700e2, 0x0040, 0x0000, 0x003a),  // LeftAlt/Option
+  USB_KEYMAP(0x0700e3, 0x0085, 0x0000, 0x0037),  // LeftGUI/Super/Win/Cmd
+  USB_KEYMAP(0x0700e4, 0x0069, 0x0000, 0x003e),  // RightControl
+  USB_KEYMAP(0x0700e5, 0x003e, 0x0000, 0x003c),  // RightShift
+  USB_KEYMAP(0x0700e6, 0x006c, 0x0000, 0x003d),  // RightAlt/Option
+  USB_KEYMAP(0x0700e7, 0x0086, 0x0000, 0x0036),  // RightGUI/Super/Win/Cmd
 
   // USB#0700e8 - #07ffff are reserved
 
@@ -337,26 +346,26 @@ const usb_keymap usb_keycode_map[] = {
   // XKB... remaining XF86 keys
 
   //            USB      XKB     Win     Mac
-  USB_KEYMAP(0x0c00b5, 0x0000, 0xe019, 0x0000),  // ScanNextTrack
-  USB_KEYMAP(0x0c00b6, 0x0000, 0xe010, 0x0000),  // ScanPreviousTrack
-  USB_KEYMAP(0x0c00b7, 0x0000, 0xe024, 0x0000),  // Stop
-  USB_KEYMAP(0x0c00b8, 0x0000, 0xe02c, 0x0000),  // Eject
-  USB_KEYMAP(0x0c00cd, 0x0000, 0xe022, 0x0000),  // Play/Pause
-  USB_KEYMAP(0x0c018a, 0x0000, 0xe01e, 0x0000),  // AL_EmailReader
-  USB_KEYMAP(0x0c0192, 0x0094, 0x0000, 0x0000),  // AL_Calculator
+  USB_KEYMAP(0x0c00b5, 0x0000, 0xe019, 0xffff),  // ScanNextTrack
+  USB_KEYMAP(0x0c00b6, 0x0000, 0xe010, 0xffff),  // ScanPreviousTrack
+  USB_KEYMAP(0x0c00b7, 0x0000, 0xe024, 0xffff),  // Stop
+  USB_KEYMAP(0x0c00b8, 0x0000, 0xe02c, 0xffff),  // Eject
+  USB_KEYMAP(0x0c00cd, 0x0000, 0xe022, 0xffff),  // Play/Pause
+  USB_KEYMAP(0x0c018a, 0x0000, 0xe01e, 0xffff),  // AL_EmailReader
+  USB_KEYMAP(0x0c0192, 0x0094, 0x0000, 0xffff),  // AL_Calculator
   // USB#0c0194: My Computer
-  USB_KEYMAP(0x0c0194, 0x00a5, 0x0000, 0x0000),  // AL_LocalMachineBrowser
-  USB_KEYMAP(0x0c01a7, 0x00f3, 0x0000, 0x0000),  // AL_Documents
+  USB_KEYMAP(0x0c0194, 0x00a5, 0x0000, 0xffff),  // AL_LocalMachineBrowser
+  USB_KEYMAP(0x0c01a7, 0x00f3, 0x0000, 0xffff),  // AL_Documents
   // USB#0c01b4: Home Directory
-  USB_KEYMAP(0x0c01b4, 0x0098, 0x0000, 0x0000),  // AL_FileBrowser (Explorer)
-  USB_KEYMAP(0x0c0221, 0x0000, 0xe065, 0x0000),  // AC_Search
-  USB_KEYMAP(0x0c0223, 0x0000, 0xe032, 0x0000),  // AC_Home
-  USB_KEYMAP(0x0c0224, 0x00a6, 0xe06a, 0x0000),  // AC_Back
-  USB_KEYMAP(0x0c0225, 0x00a7, 0xe069, 0x0000),  // AC_Forward
-  USB_KEYMAP(0x0c0226, 0x0000, 0xe068, 0x0000),  // AC_Stop
-  USB_KEYMAP(0x0c0227, 0x00b5, 0xe067, 0x0000),  // AC_Refresh (Reload)
-  USB_KEYMAP(0x0c022a, 0x00a4, 0xe066, 0x0000),  // AC_Bookmarks (Favorites)
-  USB_KEYMAP(0x0c0289, 0x00f0, 0xe000, 0x0000),  // AC_Reply
-  USB_KEYMAP(0x0c028b, 0x00f1, 0xe000, 0x0000),  // AC_ForwardMsg (MailForward)
-  USB_KEYMAP(0x0c028c, 0x00ef, 0xe000, 0x0000),  // AC_Send
+  USB_KEYMAP(0x0c01b4, 0x0098, 0x0000, 0xffff),  // AL_FileBrowser (Explorer)
+  USB_KEYMAP(0x0c0221, 0x0000, 0xe065, 0xffff),  // AC_Search
+  USB_KEYMAP(0x0c0223, 0x0000, 0xe032, 0xffff),  // AC_Home
+  USB_KEYMAP(0x0c0224, 0x00a6, 0xe06a, 0xffff),  // AC_Back
+  USB_KEYMAP(0x0c0225, 0x00a7, 0xe069, 0xffff),  // AC_Forward
+  USB_KEYMAP(0x0c0226, 0x0000, 0xe068, 0xffff),  // AC_Stop
+  USB_KEYMAP(0x0c0227, 0x00b5, 0xe067, 0xffff),  // AC_Refresh (Reload)
+  USB_KEYMAP(0x0c022a, 0x00a4, 0xe066, 0xffff),  // AC_Bookmarks (Favorites)
+  USB_KEYMAP(0x0c0289, 0x00f0, 0xe000, 0xffff),  // AC_Reply
+  USB_KEYMAP(0x0c028b, 0x00f1, 0xe000, 0xffff),  // AC_ForwardMsg (MailForward)
+  USB_KEYMAP(0x0c028c, 0x00ef, 0xe000, 0xffff),  // AC_Send
 };