Support XI2 in PlatformKeycodeFromNative()

ui/events/x/events_x.cc

 // Copyright (c) 2012 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/events/event_constants.h"
 
 #include <cmath>
 #include <string.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
@@ skipping 561 matching lines @@
 
 KeyboardCode KeyboardCodeFromNative(const base::NativeEvent& native_event) {
   return KeyboardCodeFromXKeyEvent(native_event);
 }
 
 const char* CodeFromNative(const base::NativeEvent& native_event) {
   return CodeFromXEvent(native_event);
 }
 
 uint32 PlatformKeycodeFromNative(const base::NativeEvent& native_event) {
-  KeySym keysym;
-  XLookupString(&native_event->xkey, NULL, 0, &keysym, NULL);
+  XKeyEvent* xkey = NULL;
+  XEvent xkey_from_xi2;
+  switch (native_event->type) {
+    case KeyPress:
+    case KeyRelease:
+      xkey = &native_event->xkey;
+      break;
+    case GenericEvent: {
+      XIDeviceEvent* xievent =
+          static_cast<XIDeviceEvent*>(native_event->xcookie.data);
+      switch (xievent->evtype) {
+        case XI_KeyPress:
+        case XI_KeyRelease:
+          // Build an XKeyEvent corresponding to the XI2 event,
+          // so that we can call XLookupString on it.
+          InitXKeyEventFromXIDeviceEvent(*native_event, &xkey_from_xi2);
+          xkey = &xkey_from_xi2.xkey;
+        default:
+          break;

[sadrul, 2014/07/17 16:14:34]

NOTREACHED()?

[kpschoedel, 2014/07/17 17:01:45]

Done.

+      }
+    }
+    default:
+      break;

[sadrul, 2014/07/17 16:14:34]

NOTREACHED()?

[kpschoedel, 2014/07/17 17:01:45]

Done.

+  }
+  KeySym keysym = XK_VoidSymbol;
+  if (xkey)
+    XLookupString(xkey, NULL, 0, &keysym, NULL);
   return keysym;
 }
 
 int GetChangedMouseButtonFlagsFromNative(
     const base::NativeEvent& native_event) {
   switch (native_event->type) {
     case ButtonPress:
     case ButtonRelease:
       return GetEventFlagsFromXState(native_event->xbutton.state);
     case GenericEvent: {
@@ skipping 181 matching lines @@
   DeviceDataManagerX11::GetInstance()->GetGestureTimes(
       native_event, start_time, end_time);
   return true;
 }
 
 bool IsTouchpadEvent(const base::NativeEvent& event) {
   return DeviceDataManagerX11::GetInstance()->IsTouchpadXInputEvent(event);
 }
 
 }  // namespace ui