Convert chromeos::EventRewriter to a ui::EventRewriter

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 119 matching lines @@
 int GetEventFlagsFromXState(unsigned int state) {
   int flags = 0;
   if (state & ControlMask)
     flags |= ui::EF_CONTROL_DOWN;
   if (state & ShiftMask)
     flags |= ui::EF_SHIFT_DOWN;
   if (state & Mod1Mask)
     flags |= ui::EF_ALT_DOWN;
   if (state & LockMask)
     flags |= ui::EF_CAPS_LOCK_DOWN;
+  if (state & Mod4Mask)
+    flags |= ui::EF_COMMAND_DOWN;

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

If we are going to use it here, we should update the doc for EF_COMMAND_DOWN to
explain what it means in X11 (the doc currently says only useful on OSX)

   if (state & Mod5Mask)
     flags |= ui::EF_ALTGR_DOWN;
   if (state & Button1Mask)
     flags |= ui::EF_LEFT_MOUSE_BUTTON;
   if (state & Button2Mask)
     flags |= ui::EF_MIDDLE_MOUSE_BUTTON;
   if (state & Button3Mask)
     flags |= ui::EF_RIGHT_MOUSE_BUTTON;
   return flags;
 }
 
+int GetEventFlagsFromXKeyEvent(XEvent* xevent)

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

{ in this line

+{
+  return GetEventFlagsFromXState(xevent->xkey.state) |
+         ui::EventFlagsFromXKeysym(XLookupKeysym(&xevent->xkey, 0));

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

If we use the macro from Xutil.h, then perhaps we don't need to have
EventFlagsFromXKeysym at all, and just add the flag from here?

+}
+
 // Get the event flag for the button in XButtonEvent. During a ButtonPress
 // event, |state| in XButtonEvent does not include the button that has just been
 // pressed. Instead |state| contains flags for the buttons (if any) that had
 // already been pressed before the current button, and |button| stores the most
 // current pressed button. So, if you press down left mouse button, and while
 // pressing it down, press down the right mouse button, then for the latter
 // event, |state| would have Button1Mask set but not Button3Mask, and |button|
 // would be 3.
 int GetEventFlagsForButton(int button) {
   switch (button) {
@@ skipping 160 matching lines @@
       break;
   }
   return ET_UNKNOWN;
 }
 
 int EventFlagsFromNative(const base::NativeEvent& native_event) {
   switch (native_event->type) {
     case KeyPress:
     case KeyRelease: {
       XModifierStateWatcher::GetInstance()->UpdateStateFromEvent(native_event);
-      return GetEventFlagsFromXState(native_event->xkey.state);
+      return GetEventFlagsFromXKeyEvent(native_event);
     }
     case ButtonPress:
     case ButtonRelease: {
       int flags = GetEventFlagsFromXState(native_event->xbutton.state);
       const EventType type = EventTypeFromNative(native_event);
       if (type == ET_MOUSE_PRESSED || type == ET_MOUSE_RELEASED)
         flags |= GetEventFlagsForButton(native_event->xbutton.button);
       return flags;
     }
     case EnterNotify:
@@ skipping 323 matching lines @@
   DeviceDataManager::GetInstance()->GetGestureTimes(
       native_event, start_time, end_time);
   return true;
 }
 
 bool IsTouchpadEvent(const base::NativeEvent& event) {
   return DeviceDataManager::GetInstance()->IsTouchpadXInputEvent(event);
 }
 
 }  // namespace ui