Convert chromeos::EventRewriter to a ui::EventRewriter

ui/events/keycodes/keyboard_code_conversion_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/keycodes/keyboard_code_conversion_x.h"
 
 #define XK_3270  // for XK_3270_BackTab
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/XF86keysym.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "ui/events/event_constants.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
 
 namespace ui {
 
 // Get an ui::KeyboardCode from an X keyevent
 KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev) {
   // 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);
@@ skipping 392 matching lines @@
       return VKEY_KBD_BRIGHTNESS_DOWN;
     case XF86XK_KbdBrightnessUp:
       return VKEY_KBD_BRIGHTNESS_UP;
 
     // TODO(sad): some keycodes are still missing.
   }
   DLOG(WARNING) << "Unknown keysym: " << base::StringPrintf("0x%x", keysym);
   return VKEY_UNKNOWN;
 }
 
+int EventFlagsFromXKeysym(unsigned int keysym) {
+  static const unsigned int numpad_keysyms[] = {

[sadrul, 2014/04/14 21:51:32]

Does this need to be static?

[kpschoedel, 2014/04/14 22:25:45]

If it's not static, the compiler is expected to treat it as dynamically
initializing the array on each call. On a quick test, gcc is not able or willing
to optimize this away (though clang is).

+    XK_KP_Delete,
+    XK_KP_Tab,
+    XK_KP_Enter,
+    XK_KP_Begin,
+    XK_KP_Space,
+    XK_KP_Home,
+    XK_KP_End,
+    XK_KP_Page_Up,    // aka XK_KP_Prior
+    XK_KP_Page_Down,  // aka XK_KP_Next
+    XK_KP_Left,
+    XK_KP_Right,
+    XK_KP_Down,
+    XK_KP_Up,
+    XK_KP_0,
+    XK_KP_1,
+    XK_KP_2,
+    XK_KP_3,
+    XK_KP_4,
+    XK_KP_5,
+    XK_KP_6,
+    XK_KP_7,
+    XK_KP_8,
+    XK_KP_9,
+    XK_KP_Multiply,
+    XK_KP_Add,
+    XK_KP_Separator,
+    XK_KP_Subtract,
+    XK_KP_Decimal,
+    XK_KP_Divide,
+    XK_KP_Equal,
+    XK_KP_Insert,
+    XK_KP_F1,
+    XK_KP_F2,
+    XK_KP_F3,
+    XK_KP_F4,
+  };
+  for (size_t i = 0; i < arraysize(numpad_keysyms); ++i) {
+    if (numpad_keysyms[i] == keysym)
+      return EF_NUMPAD;

[sadrul, 2014/04/14 21:51:32]

There's an IsKeypadKey macro in X11/Xutil.h. Can we use that here?

[kpschoedel, 2014/04/14 22:25:45]

Yes, thanks for pointing that out.

+  }
+  return EF_NONE;
+}
+
 const char* CodeFromXEvent(XEvent* xev) {
   return KeycodeConverter::GetInstance()->NativeKeycodeToCode(
       xev->xkey.keycode);
 }
 
 uint16 GetCharacterFromXEvent(XEvent* xev) {
   char buf[6];
   int bytes_written = XLookupString(&xev->xkey, buf, 6, NULL, NULL);
   DCHECK_LE(bytes_written, 6);
 
@@ skipping 365 matching lines @@
     case VKEY_KBD_BRIGHTNESS_UP:
       return XF86XK_KbdBrightnessUp;
 
     default:
       LOG(WARNING) << "Unknown keycode:" << keycode;
       return 0;
     }
 }
 
 }  // namespace ui