Support non-US layout for rewriting Numpad key events.

chrome/browser/chromeos/events/event_rewriter.cc

 // Copyright 2014 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 "chrome/browser/chromeos/events/event_rewriter.h"
 
 #include <vector>
 
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/wm/window_state.h"
@@ skipping 194 matching lines @@
   XEvent* xev = key_event.native_event();
   if (xev) {
     XEvent xkeyevent;
     // Convert all XI2-based key events into X11 core-based key events,
     // until consumers no longer depend on receiving X11 core events.
     if (xev->type == GenericEvent)
       ui::InitXKeyEventFromXIDeviceEvent(*xev, &xkeyevent);
     else
       xkeyevent.xkey = xev->xkey;
 
+    unsigned int original_x11_keycode = xkeyevent.xkey.keycode;

[oshima, 2014/08/08 07:06:08]

nit: move this after line 226 (closer to where this is really used)

[Shu Chen, 2014/08/08 07:10:57]

That will result in wrong behavior. Please notice xkeyevent.xkey.keycode will be
changed at line 221.

[oshima, 2014/08/08 09:32:11]

oh, sorry I missed that. please ignore.

     // Update native event to match rewritten |ui::Event|.
     // The X11 keycode represents a physical key position, so it shouldn't
     // change unless we have actually changed keys, not just modifiers.
     // This is one guard against problems like crbug.com/390263.
     if (key_event.key_code() != key_code) {
       xkeyevent.xkey.keycode =
           XKeyCodeForWindowsKeyCode(key_code, flags, gfx::GetXDisplay());
     }
     ui::KeyEvent x11_key_event(&xkeyevent);
     rewritten_key_event = new ui::KeyEvent(x11_key_event);
+
+    // For numpad keys, the key char should always NOT be changed because
+    // XKeyCodeForWindowsKeyCode method cannot handle non-US keyboard layout.
+    // The correct key char can be got from original X11 keycode but not for the
+    // rewritten X11 keycode.
+    // For Shift+NumpadKey cases, use the rewritten X11 keycode (US layout).
+    // Please see crbug.com/335644.
+    if (key_code >= ui::VKEY_NUMPAD0 && key_code <= ui::VKEY_DIVIDE) {
+      XEvent numpad_xevent;
+      numpad_xevent.xkey = xkeyevent.xkey;
+      // Remove the shift state before getting key char.
+      // Because X11/XKB sometimes returns unexpected key char for
+      // Shift+NumpadKey. e.g. Shift+Numpad_4 returns 'D', etc.
+      numpad_xevent.xkey.state &= ~ShiftMask;
+      numpad_xevent.xkey.state |= Mod2Mask; // Always set NumLock mask.

[oshima, 2014/08/08 07:06:08]

nit: two spaces between ; and //

[Shu Chen, 2014/08/08 07:10:57]

Done.

+      if (!(flags & ui::EF_SHIFT_DOWN))
+        numpad_xevent.xkey.keycode = original_x11_keycode;
+      rewritten_key_event->set_character(
+          ui::GetCharacterFromXEvent(&numpad_xevent));
+    }
   }
 #endif
   if (!rewritten_key_event)
     rewritten_key_event = new ui::KeyEvent(key_event);
   rewritten_key_event->set_flags(flags);
   rewritten_key_event->set_key_code(key_code);
 #if defined(USE_X11)
   ui::UpdateX11EventForFlags(rewritten_key_event);
   rewritten_key_event->NormalizeFlags();
 #endif
@@ skipping 605 matching lines @@
     KeyboardDeviceAddedInternal(device_info[i].deviceid, device_info[i].name);
   }
 
   XIFreeDeviceInfo(device_info);
 #else
   KeyboardDeviceAddedInternal(device_id, "keyboard");
 #endif
 }
 
 }  // namespace chromeos