aura: Fix keyevents from the numpad.

ui/base/keycodes/keyboard_code_conversion_x.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 
 namespace ui {
 
 // Get an ui::KeyboardCode from an X keyevent
 KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev) {
-  KeySym keysym = XLookupKeysym(&xev->xkey, 0);
-
+  // XLookupKeysym does not take into consideration the state of the lock/shift
+  // etc. keys. So it is necessary to use XLookupString instead.
+  KeySym keysym;
+  XLookupString(&xev->xkey, NULL, 0, &keysym, NULL);
   KeyboardCode keycode = KeyboardCodeFromXKeysym(keysym);
   if (keycode == VKEY_UNKNOWN) {
     keysym = DefaultXKeysymFromHardwareKeycode(xev->xkey.keycode);
     keycode = KeyboardCodeFromXKeysym(keysym);
   }
 
   return keycode;
 }
 
 KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
@@ skipping 117 matching lines @@
       return VKEY_W;
     case XK_X:
     case XK_x:
       return VKEY_X;
     case XK_Y:
     case XK_y:
       return VKEY_Y;
     case XK_Z:
     case XK_z:
       return VKEY_Z;
+
     case XK_0:
-      return VKEY_0;
     case XK_1:
-      return VKEY_1;
     case XK_2:
-      return VKEY_2;
     case XK_3:
-      return VKEY_3;
     case XK_4:
-      return VKEY_4;
     case XK_5:
-      return VKEY_5;
     case XK_6:
-      return VKEY_6;
     case XK_7:
-      return VKEY_7;
     case XK_8:
-      return VKEY_8;
     case XK_9:
-      return VKEY_9;
+      return static_cast<KeyboardCode>(VKEY_0 + (keysym - XK_0));
+
+    case XK_KP_0:
+    case XK_KP_1:
+    case XK_KP_2:
+    case XK_KP_3:
+    case XK_KP_4:
+    case XK_KP_5:
+    case XK_KP_6:
+    case XK_KP_7:
+    case XK_KP_8:
+    case XK_KP_9:
+      return static_cast<KeyboardCode>(VKEY_NUMPAD0 + (keysym - XK_KP_0));
 
     case XK_multiply:
     case XK_KP_Multiply:
       return VKEY_MULTIPLY;
     case XK_KP_Add:
       return VKEY_ADD;
     case XK_KP_Separator:
       return VKEY_SEPARATOR;
     case XK_KP_Subtract:
       return VKEY_SUBTRACT;
@@ skipping 194 matching lines @@
     XK_F10,           // 0x4C: XK_F10
     XK_Num_Lock,      // 0x4D: XK_Num_Lock
     XK_Scroll_Lock,   // 0x4E: XK_Scroll_Lock
   };
 
   return hardware_code < arraysize(kHardwareKeycodeMap) ?
       kHardwareKeycodeMap[hardware_code] : 0;
 }
 
 }  // namespace ui