Adds special support to the device manager for keyboards devices.

ui/events/x/hotplug_event_handler_x11.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 "ui/events/x/hotplug_event_handler_x11.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 
+#include <algorithm>
 #include <cmath>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/logging.h"
 #include "base/process/launch.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
 #include "ui/events/device_hotplug_event_observer.h"
+#include "ui/events/input_device.h"
+#include "ui/events/keyboard_device.h"
 #include "ui/events/touchscreen_device.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
 namespace {
 
+// The name of the xinput device corresponding to an internal keyboard.
+const char* kInternalKeyboardName = "AT Translated Set 2 keyboard";

[flackr, 2014/10/14 19:34:26]

Let's name these constants to match the modules perhaps?
kThisKeyboardsModuleNameName and kCrosEcKeyboardPrefix?

[rsadam, 2014/10/14 22:24:15]

Done.

+
+// The prefixes of other known xinput devices corresponding to internal
+// keyboards.
+const char* kInternalKeyboardPrefixes[] = {

[flackr, 2014/10/14 19:34:26]

nit: Don't use array for a single item.

[rsadam, 2014/10/14 22:24:15]

Done.

+  "cros-ec"
+};
+
+// Returns true if |name| is the name of a known keyboard device. Note, this may
+// return false negatives.
+bool IsKnownKeyboard(const std::string& name) {
+  std::string lower(name);
+  std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
+  return lower.find("keyboard") != std::string::npos;
+}
+
+// Returns true if |name| is the name of a known internal keyboard device. Note,
+// this may return false negatives.
+bool IsInternalKeyboard(const std::string& name) {
+  // TODO(rsadam@): Come up with a more generic way of identifying internal
+  // keyboards. See crbug.com/420728.
+  if (name == kInternalKeyboardName)
+    return true;
+  for (size_t i = 0; i < arraysize(kInternalKeyboardPrefixes); i++) {
+    if (name.find(kInternalKeyboardPrefixes[i]) == 0)

[flackr, 2014/10/14 19:34:26]

nit: Doesn't this need to be 0u (since string::find returns a size_t)?
Though you should probably use std::string::compare and just look at the first
strlen(kInternalKeyboardPrefixes[i]) characters to avoid searching the rest of
the string since we only care about if it's at the start.

[rsadam, 2014/10/14 22:24:15]

Done.

+      return true;
+  }
+  return false;
+}
+
+// Returns true if |name| is the name of a known XTEST device. Note, this may
+// return false negatives.
+bool IsTestKeyboard(const std::string& name) {
+  return name.find("XTEST") != std::string::npos;
+}
+
 // We consider the touchscreen to be internal if it is an I2c device.
 // With the device id, we can query X to get the device's dev input
 // node eventXXX. Then we search all the dev input nodes registered
 // by I2C devices to see if we can find eventXXX.
 bool IsTouchscreenInternal(XDisplay* dpy, int device_id) {
   using base::FileEnumerator;
   using base::FilePath;
 
 #if !defined(CHROMEOS)
   return false;
@@ skipping 70 matching lines @@
     : delegate_(delegate) {
 }
 
 HotplugEventHandlerX11::~HotplugEventHandlerX11() {
 }
 
 void HotplugEventHandlerX11::OnHotplugEvent() {
   const XIDeviceList& device_list =
       DeviceListCacheX::GetInstance()->GetXI2DeviceList(gfx::GetXDisplay());
   HandleTouchscreenDevices(device_list);
+  HandleKeyboardDevices(device_list);
+}
+
+void HotplugEventHandlerX11::HandleKeyboardDevices(
+    const XIDeviceList& x11_devices) {
+  std::vector<KeyboardDevice> devices;
+
+  for (int i = 0; i < x11_devices.count; i++) {
+    if (!x11_devices[i].enabled || x11_devices[i].use != XISlaveKeyboard)
+      continue;  // Assume all keyboards are keyboard slaves
+    std::string device_name(x11_devices[i].name);
+    base::TrimWhitespaceASCII(device_name, base::TRIM_TRAILING,
+        &device_name);
+    InputDeviceType type;
+    if (IsTestKeyboard(device_name))
+      continue;  // Skip test devices.
+
+    if (IsInternalKeyboard(device_name)) {
+      type = InputDeviceType::INTERNAL;
+    } else if (IsKnownKeyboard(device_name)) {
+      type = InputDeviceType::EXTERNAL;
+    } else {
+      type = InputDeviceType::UNKNOWN;
+    }
+    devices.push_back(KeyboardDevice(x11_devices[i].deviceid,
+        type, device_name));
+  }
+  delegate_->OnKeyboardDevicesUpdated(devices);
 }
 
 void HotplugEventHandlerX11::HandleTouchscreenDevices(
     const XIDeviceList& x11_devices) {
   std::vector<TouchscreenDevice> devices;
   Display* display = gfx::GetXDisplay();
   Atom valuator_x = XInternAtom(display, "Abs MT Position X", False);
   Atom valuator_y = XInternAtom(display, "Abs MT Position Y", False);
   if (valuator_x == None || valuator_y == None)
     return;
@@ skipping 33 matching lines @@
         XITouchClassInfo* touch_info =
             reinterpret_cast<XITouchClassInfo*>(class_info);
         is_direct_touch = touch_info->mode == XIDirectTouch;
       }
 #endif
     }
 
     // Touchscreens should have absolute X and Y axes, and be direct touch
     // devices.
     if (width > 0.0 && height > 0.0 && is_direct_touch) {
-      bool is_internal =
-          IsTouchscreenInternal(display, x11_devices[i].deviceid);
+      InputDeviceType type =
+          IsTouchscreenInternal(display, x11_devices[i].deviceid) ?
+          InputDeviceType::INTERNAL : InputDeviceType::EXTERNAL;
+      std::string name(x11_devices[i].name);
       devices.push_back(TouchscreenDevice(
-          x11_devices[i].deviceid, gfx::Size(width, height), is_internal));
+          x11_devices[i].deviceid, type, name, gfx::Size(width, height)));
     }
   }
 
   delegate_->OnTouchscreenDevicesUpdated(devices);
 }
 
 }  // namespace ui