chromeos: A little more cleanup for EventRewriter.

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 <X11/extensions/XInput2.h>
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
 #include <X11/Xlib.h>
@@ skipping 167 matching lines @@
       return kDeviceAppleKeyboard;
   }
 
   return kDeviceUnknown;
 }
 
 void EventRewriter::RewriteForTesting(XEvent* event) {
   Rewrite(event);
 }
 
+void EventRewriter::DeviceKeyPressedOrReleased(int device_id) {
+  std::map<int, DeviceType>::const_iterator iter =
+      device_id_to_type_.find(device_id);
+  if (iter == device_id_to_type_.end()) {
+    // |device_id| is unknown. This means the device was connected before
+    // booting the OS. Query the name of the device and add it to the map.
+    DeviceAdded(device_id);
+  }
+
+  last_device_id_ = device_id;
+}
+
 base::EventStatus EventRewriter::WillProcessEvent(
     const base::NativeEvent& event) {
   XEvent* xevent = event;
   if (xevent->type == KeyPress || xevent->type == KeyRelease) {
     Rewrite(xevent);
   } else if (xevent->type == GenericEvent) {
-    RewriteLocatedEvent(xevent);
+    XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(xevent->xcookie.data);
+    if (xievent->evtype == XI_KeyPress || xievent->evtype == XI_KeyRelease) {
+      if (xievent->deviceid == xievent->sourceid)
+        DeviceKeyPressedOrReleased(xievent->deviceid);
+    } else {
+      RewriteLocatedEvent(xevent);
+    }
   } else if (xevent->type == MappingNotify) {
     if (xevent->xmapping.request == MappingModifier ||
         xevent->xmapping.request == MappingKeyboard) {
       RefreshKeycodes();
     }
   }
   return base::EVENT_CONTINUE;
 }
 
 void EventRewriter::DidProcessEvent(const base::NativeEvent& event) {
 }
 
+void EventRewriter::DeviceHierarchyChanged() {}
+
 void EventRewriter::DeviceAdded(int device_id) {
   DCHECK_NE(XIAllDevices, device_id);
   DCHECK_NE(XIAllMasterDevices, device_id);
   if (device_id == XIAllDevices || device_id == XIAllMasterDevices) {
     LOG(ERROR) << "Unexpected device_id passed: " << device_id;
     return;
   }
 
   int ndevices_return = 0;
   XIDeviceInfo* device_info = XIQueryDevice(gfx::GetXDisplay(),
@@ skipping 14 matching lines @@
     DeviceAddedInternal(device_info[i].deviceid, device_info[i].name);
   }
 
   XIFreeDeviceInfo(device_info);
 }
 
 void EventRewriter::DeviceRemoved(int device_id) {
   device_id_to_type_.erase(device_id);
 }
 
-void EventRewriter::DeviceKeyPressedOrReleased(int device_id) {
-  std::map<int, DeviceType>::const_iterator iter =
-      device_id_to_type_.find(device_id);
-  if (iter == device_id_to_type_.end()) {
-    // |device_id| is unknown. This means the device was connected before
-    // booting the OS. Query the name of the device and add it to the map.
-    DeviceAdded(device_id);
-  }
-
-  last_device_id_ = device_id;
-}
-
 void EventRewriter::RefreshKeycodes() {
   keysym_to_keycode_map_.clear();
 }
 
 KeyCode EventRewriter::NativeKeySymToNativeKeycode(KeySym keysym) {
   if (keysym_to_keycode_map_.count(keysym))
     return keysym_to_keycode_map_[keysym];
 
   XDisplay* display = gfx::GetXDisplay();
   KeyCode keycode = XKeysymToKeycode(display, keysym);
@@ skipping 626 matching lines @@
     VLOG(1) << "Apple keyboard '" << device_name << "' connected: "
             << "id=" << device_id;
   }
   // Always overwrite the existing device_id since the X server may reuse a
   // device id for an unattached device.
   device_id_to_type_[device_id] = type;
   return type;
 }
 
 }  // namespace chromeos