Honor device type properties in gesture_property_provider

ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.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/ozone/evdev/libgestures_glue/gesture_property_provider.h"
 
 #include <gestures/gestures.h>
 #include <libevdev/libevdev.h>
 
 #include <fnmatch.h>
@@ skipping 413 matching lines @@
                                         "MatchIsKeyboard",
                                         "MatchIsJoystick",
                                         "MatchIsTablet"};
 
 // Special keywords for boolean values.
 const char* kTrue[] = {"on", "true", "yes"};
 const char* kFalse[] = {"off", "false", "no"};
 
 // Check if a device falls into one device type category.
 bool IsDeviceOfType(const ui::GesturePropertyProvider::DevicePtr device,
-                    const ui::EventDeviceType type) {
+                    const ui::EventDeviceType type,
+                    const GesturesProp* device_mouse,

[spang, 2015/02/04 17:47:10]

device_mouse_property

[Shecky Lin, 2015/02/06 04:51:14]

Done.

+                    const GesturesProp* device_touchpad) {

[spang, 2015/02/04 17:47:10]

device_touchpad_property

[Shecky Lin, 2015/02/06 04:51:14]

Done.

+  // Get the device type info from gesture properties if they are available.
+  bool is_mouse = false, is_touchpad = false;
+  if (device_mouse)
+    is_mouse = device_mouse->GetBoolValue()[0];

[spang, 2015/02/04 17:47:10]

else
  is_mouse = (evdev_class == EvdevClassMouse || evdev_class ==
EvdevClassMultitouchMouse);

[Shecky Lin, 2015/02/06 04:51:14]

Done.

+  if (device_touchpad)
+    is_touchpad = device_touchpad->GetBoolValue()[0];

[spang, 2015/02/04 17:47:10]

else
  is_touchpad = (evdev_class == EvdevClassTouchpad);

[Shecky Lin, 2015/02/06 04:51:14]

Done.

+
+  // If the device type properties are unavailable, fallback to the libevdev
+  // device info.
   EvdevClass evdev_class = device->info.evdev_class;
   switch (type) {
     case ui::DT_KEYBOARD:
       return (evdev_class == EvdevClassKeyboard);
       break;
     case ui::DT_MOUSE:
+      if (device_mouse)
+        return is_mouse;
       return (evdev_class == EvdevClassMouse ||
               evdev_class == EvdevClassMultitouchMouse);
       break;
     case ui::DT_TOUCHPAD:
-      // Note that the behavior here is different from the inputcontrol script
-      // which actually returns touchscreen devices as well.
+      if (device_mouse && device_mouse)
+        return (!is_mouse) && is_touchpad;
       return (evdev_class == EvdevClassTouchpad);
       break;
     case ui::DT_TOUCHSCREEN:
       return (evdev_class == EvdevClassTouchscreen);
       break;
     case ui::DT_MULTITOUCH:
+      if (device_touchpad)
+        return is_touchpad;
       return (evdev_class == EvdevClassTouchpad ||
               evdev_class == EvdevClassTouchscreen ||
               evdev_class == EvdevClassMultitouchMouse);
       break;
     case ui::DT_MULTITOUCH_MOUSE:
+      if (device_mouse && device_mouse)
+        return is_mouse && is_touchpad;
       return (evdev_class == EvdevClassMultitouchMouse);
       break;
     case ui::DT_ALL:
       return true;
       break;
     default:
       break;
   }
   return false;
 }
@@ skipping 380 matching lines @@
 
 GesturePropertyProvider::~GesturePropertyProvider() {
 }
 
 bool GesturePropertyProvider::GetDeviceIdsByType(
     const EventDeviceType type,
     std::vector<DeviceId>* device_ids) {
   bool exists = false;
   DeviceMap::const_iterator it = device_map_.begin();
   for (; it != device_map_.end(); ++it) {
-    if (IsDeviceOfType(it->second, type)) {
+    if (IsDeviceIdOfType(it->first, type)) {
       exists = true;
       if (device_ids)
         device_ids->push_back(it->first);
     }
   }
   return exists;
 }
 
 bool GesturePropertyProvider::IsDeviceIdOfType(const DeviceId device_id,
                                                const EventDeviceType type) {
   DeviceMap::const_iterator it = device_map_.find(device_id);
   if (it == device_map_.end())
     return false;
-  return IsDeviceOfType(it->second, type);
+  return IsDeviceOfType(it->second, type,
+                        GetProperty(device_id, "Device Mouse"),
+                        GetProperty(device_id, "Device Touchpad"));
 }
 
 GesturesProp* GesturePropertyProvider::GetProperty(const DeviceId device_id,
                                                    const std::string& name) {
   return FindProperty(device_id, name);
 }
 
 std::vector<std::string> GesturePropertyProvider::GetPropertyNamesById(
     const DeviceId device_id) {
   internal::GestureDevicePropertyData* device_data =
@@ skipping 641 matching lines @@
 const GesturesPropProvider kGesturePropProvider = {
     GesturesPropFunctionsWrapper::CreateInt,
     GesturesPropFunctionsWrapper::CreateShort,
     GesturesPropFunctionsWrapper::CreateBool,
     GesturesPropFunctionsWrapper::CreateString,
     GesturesPropFunctionsWrapper::CreateReal,
     GesturesPropFunctionsWrapper::RegisterHandlers,
     GesturesPropFunctionsWrapper::Free};
 
 }  // namespace ui