ozone: evdev: Add absolute axis information to DeviceCapabilities

ui/events/ozone/evdev/event_device_test_util.cc

 // Copyright 2015 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/event_device_test_util.h"
 
 #include "base/format_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 58 matching lines @@
 
   // Require canonically formatted input.
   if (bitfield != SerializeBitfield(out->data(), max_bits))
     return false;
 
   return true;
 }
 
 }  // namespace
 
-// # Script to generate DeviceCapabilities literal.
-// cd /sys/class/input/input?
-//
-// test "$(uname -m)" = x86_64 && cat <<EOF
-// const DeviceCapabilities device = {
-//     /* path */ "$(readlink -f .)",
-//     /* name */ "$(cat device/name)",
-//     /* phys */ "$(cat device/phys)",
-//     /* uniq */ "$(cat device/uniq)",
-//     /* bustype */ "$(cat device/id/bustype)",
-//     /* vendor */ "$(cat device/id/vendor)",
-//     /* product */ "$(cat device/id/product)",
-//     /* version */ "$(cat device/id/version)",
-//     /* prop */ "$(cat device/properties)",
-//     /* ev */ "$(cat device/capabilities/ev)",
-//     /* key */ "$(cat device/capabilities/key)",
-//     /* rel */ "$(cat device/capabilities/rel)",
-//     /* abs */ "$(cat device/capabilities/abs)",
-//     /* msc */ "$(cat device/capabilities/msc)",
-//     /* led */ "$(cat device/capabilities/led)",
-//     /* ff */ "$(cat device/capabilities/ff)",
-// };
-// EOF
-
 // Captured from Chromebook Pixel.
 const DeviceCapabilities kLinkKeyboard = {
     /* path */ "/sys/devices/platform/i8042/serio0/input/input6/event6",
     /* name */ "AT Translated Set 2 keyboard",
     /* phys */ "isa0060/serio0/input0",
     /* uniq */ "",
     /* bustype */ "0011",
     /* vendor */ "0001",
     /* product */ "0001",
     /* version */ "ab83",
     /* prop */ "0",
     /* ev */ "120013",
     /* key */ "400402000000 3803078f800d001 feffffdfffefffff fffffffffffffffe",
     /* rel */ "0",
     /* abs */ "0",
     /* msc */ "10",
+    /* sw */ "0",
     /* led */ "7",
     /* ff */ "0",
 };
 
 // Captured from Chromebook Pixel.
+const DeviceAbsoluteAxis kLinkTouchscreenAbsAxes[] = {
+    {ABS_X, {0, 0, 2559, 0, 0, 20}},
+    {ABS_Y, {0, 0, 1699, 0, 0, 20}},
+    {ABS_PRESSURE, {0, 0, 255, 0, 0, 0}},
+    {ABS_MT_SLOT, {0, 0, 15, 0, 0, 0}},
+    {ABS_MT_TOUCH_MAJOR, {0, 0, 938, 0, 0, 0}},
+    {ABS_MT_ORIENTATION, {0, -3, 4, 0, 0, 0}},
+    {ABS_MT_POSITION_X, {0, 0, 2559, 0, 0, 20}},
+    {ABS_MT_POSITION_Y, {0, 0, 1699, 0, 0, 20}},
+    {ABS_MT_TRACKING_ID, {0, 0, 65535, 0, 0, 0}},
+    {ABS_MT_PRESSURE, {0, 0, 255, 0, 0, 0}},
+};
 const DeviceCapabilities kLinkTouchscreen = {
     /* path */ "/sys/devices/pci0000:00/0000:00:02.0/i2c-2/2-004a/"
                "input/input7/event7",
     /* name */ "Atmel maXTouch Touchscreen",
     /* phys */ "i2c-2-004a/input0",
     /* uniq */ "",
     /* bustype */ "0018",
     /* vendor */ "0000",
     /* product */ "0000",
     /* version */ "0000",
     /* prop */ "0",
     /* ev */ "b",
     /* key */ "400 0 0 0 0 0",
     /* rel */ "0",
     /* abs */ "671800001000003",
     /* msc */ "0",
+    /* sw */ "0",
     /* led */ "0",
     /* ff */ "0",
+    kLinkTouchscreenAbsAxes,
+    arraysize(kLinkTouchscreenAbsAxes),
 };
 
 // Captured from Chromebook Pixel.
+const DeviceAbsoluteAxis kLinkTouchpadAbsAxes[] = {
+    {ABS_X, {0, 0, 2040, 0, 0, 20}},
+    {ABS_Y, {0, 0, 1360, 0, 0, 20}},
+    {ABS_PRESSURE, {0, 0, 255, 0, 0, 0}},
+    {ABS_MT_SLOT, {0, 0, 9, 0, 0, 0}},
+    {ABS_MT_TOUCH_MAJOR, {0, 0, 1878, 0, 0, 0}},
+    {ABS_MT_ORIENTATION, {0, -3, 4, 0, 0, 0}},
+    {ABS_MT_POSITION_X, {0, 0, 2040, 0, 0, 20}},
+    {ABS_MT_POSITION_Y, {0, 0, 1360, 0, 0, 20}},
+    {ABS_MT_TRACKING_ID, {0, 0, 65535, 0, 0, 0}},
+    {ABS_MT_PRESSURE, {0, 0, 255, 0, 0, 0}},
+};
 const DeviceCapabilities kLinkTouchpad = {
     /* path */ "/sys/devices/pci0000:00/0000:00:02.0/i2c-1/1-004b/"
                "input/input8/event8",
     /* name */ "Atmel maXTouch Touchpad",
     /* phys */ "i2c-1-004b/input0",
     /* uniq */ "",
     /* bustype */ "0018",
     /* vendor */ "0000",
     /* product */ "0000",
     /* version */ "0000",
     /* prop */ "5",
     /* ev */ "b",
     /* key */ "e520 10000 0 0 0 0",
     /* rel */ "0",
     /* abs */ "671800001000003",
     /* msc */ "0",
+    /* sw */ "0",
     /* led */ "0",
     /* ff */ "0",
+    kLinkTouchpadAbsAxes,
+    arraysize(kLinkTouchpadAbsAxes),
 };
 
 // Captured from generic HP KU-1156 USB keyboard.
 const DeviceCapabilities kHpUsbKeyboard = {
     /* path */ "/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.3/2-1.3:1.0/"
                "input/input17/event10",
     /* name */ "Chicony HP Elite USB Keyboard",
     /* phys */ "usb-0000:00:1d.0-1.3/input0",
     /* uniq */ "",
     /* bustype */ "0003",
     /* vendor */ "03f0",
     /* product */ "034a",
     /* version */ "0110",
     /* prop */ "0",
     /* ev */ "120013",
     /* key */ "1000000000007 ff9f207ac14057ff febeffdfffefffff "
               "fffffffffffffffe",
     /* rel */ "0",
     /* abs */ "0",
     /* msc */ "10",
+    /* sw */ "0",
     /* led */ "7",
     /* ff */ "0",
 };
 
 // Captured from generic HP KU-1156 USB keyboard (2nd device with media keys).
+const DeviceAbsoluteAxis kHpUsbKeyboard_ExtraAbsAxes[] = {
+    {ABS_VOLUME, {0, 0, 767, 0, 0, 0}},
+};
 const DeviceCapabilities kHpUsbKeyboard_Extra = {
     /* path */ "/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.3/2-1.3:1.1/"
                "input/input18/event16",
     /* name */ "Chicony HP Elite USB Keyboard",
     /* phys */ "usb-0000:00:1d.0-1.3/input1",
     /* uniq */ "",
     /* bustype */ "0003",
     /* vendor */ "03f0",
     /* product */ "034a",
     /* version */ "0110",
     /* prop */ "0",
     /* ev */ "1f",
     /* key */ "3007f 0 0 483ffff17aff32d bf54444600000000 1 120f938b17c000 "
               "677bfad941dfed 9ed68000004400 10000002",
     /* rel */ "40",
     /* abs */ "100000000",
     /* msc */ "10",
+    /* sw */ "0",
     /* led */ "0",
     /* ff */ "0",
+    kHpUsbKeyboard_ExtraAbsAxes,
+    arraysize(kHpUsbKeyboard_ExtraAbsAxes),
 };
 
 // Captured from Dell MS111-L 3-Button Optical USB Mouse.
 const DeviceCapabilities kLogitechUsbMouse = {
     /* path */ "/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2.4/"
                "2-1.2.4:1.0/input/input16/event9",
     /* name */ "Logitech USB Optical Mouse",
     /* phys */ "usb-0000:00:1d.0-1.2.4/input0",
     /* uniq */ "",
     /* bustype */ "0003",
     /* vendor */ "046d",
     /* product */ "c05a",
     /* version */ "0111",
     /* prop */ "0",
     /* ev */ "17",
     /* key */ "ff0000 0 0 0 0",
     /* rel */ "143",
     /* abs */ "0",
     /* msc */ "10",
+    /* sw */ "0",
     /* led */ "0",
     /* ff */ "0",
 };
 
 // Captured from "Mimo Touch 2" Universal DisplayLink monitor.
+const DeviceAbsoluteAxis kMimoTouch2TouchscreenAbsAxes[] = {
+    {ABS_X, {0, 0, 2047, 0, 0, 0}},
+    {ABS_Y, {0, 0, 2047, 0, 0, 0}},
+};
 const DeviceCapabilities kMimoTouch2Touchscreen = {
     /* path */ "/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.3/2-1.3.2/"
                "2-1.3.2:1.0/input/input15/event14",
     /* name */ "eGalax Inc. USB TouchController",
     /* phys */ "usb-0000:00:1d.0-1.3.2/input0",
     /* uniq */ "",
     /* bustype */ "0003",
     /* vendor */ "0eef",
     /* product */ "0001",
     /* version */ "0100",
     /* prop */ "0",
     /* ev */ "b",
     /* key */ "400 0 0 0 0 0",
     /* rel */ "0",
     /* abs */ "3",
     /* msc */ "0",
+    /* sw */ "0",
     /* led */ "0",
     /* ff */ "0",
+    kMimoTouch2TouchscreenAbsAxes,
+    arraysize(kMimoTouch2TouchscreenAbsAxes),
 };
 
 // Captured from Wacom Intuos Pen and Touch Small Tablet.
+const DeviceAbsoluteAxis kWacomIntuosPtS_PenAbsAxes[] = {
+    {ABS_X, {0, 0, 15200, 4, 0, 100}},
+    {ABS_Y, {0, 0, 9500, 4, 0, 100}},
+    {ABS_PRESSURE, {0, 0, 1023, 0, 0, 0}},
+    {ABS_DISTANCE, {0, 0, 31, 0, 0, 0}},
+};
 const DeviceCapabilities kWacomIntuosPtS_Pen = {
     /* path */ "/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2.3/"
                "2-1.2.3:1.0/input/input9/event9",
     /* name */ "Wacom Intuos PT S Pen",
     /* phys */ "",
     /* uniq */ "",
     /* bustype */ "0003",
     /* vendor */ "056a",
     /* product */ "0302",
     /* version */ "0100",
     /* prop */ "1",
     /* ev */ "b",
     /* key */ "1c03 0 0 0 0 0",
     /* rel */ "0",
     /* abs */ "3000003",
     /* msc */ "0",
+    /* sw */ "0",
     /* led */ "0",
     /* ff */ "0",
+    kWacomIntuosPtS_PenAbsAxes,
+    arraysize(kWacomIntuosPtS_PenAbsAxes),
 };
 
 // Captured from Wacom Intuos Pen and Touch Small Tablet.
+const DeviceAbsoluteAxis kWacomIntuosPtS_FingerAbsAxes[] = {
+    {ABS_X, {0, 0, 4096, 4, 0, 26}},
+    {ABS_Y, {0, 0, 4096, 4, 0, 43}},
+    {ABS_MT_SLOT, {0, 0, 15, 0, 0, 0}},
+    {ABS_MT_TOUCH_MAJOR, {0, 0, 4096, 0, 0, 0}},
+    {ABS_MT_TOUCH_MINOR, {0, 0, 4096, 0, 0, 0}},
+    {ABS_MT_POSITION_X, {0, 0, 4096, 4, 0, 26}},
+    {ABS_MT_POSITION_Y, {0, 0, 4096, 4, 0, 43}},
+    {ABS_MT_TRACKING_ID, {0, 0, 65535, 0, 0, 0}},
+};
 const DeviceCapabilities kWacomIntuosPtS_Finger = {
     /* path */ "/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2.3/"
                "2-1.2.3:1.1/input/input10/event10",
     /* name */ "Wacom Intuos PT S Finger",
     /* phys */ "",
     /* uniq */ "",
     /* bustype */ "0003",
     /* vendor */ "056a",
     /* product */ "0302",
     /* version */ "0100",
     /* prop */ "1",
     /* ev */ "2b",
     /* key */ "e520 630000 0 0 0 0",
     /* rel */ "0",
     /* abs */ "263800000000003",
     /* msc */ "0",
+    /* sw */ "4000",
     /* led */ "0",
     /* ff */ "0",
+    kWacomIntuosPtS_FingerAbsAxes,
+    arraysize(kWacomIntuosPtS_FingerAbsAxes),
 };
 
 // Captured from Logitech Wireless Touch Keyboard K400.
+const DeviceAbsoluteAxis kLogitechTouchKeyboardK400AbsAxes[] = {
+    {ABS_VOLUME, {0, 1, 652, 0, 0, 0}},
+};
 const DeviceCapabilities kLogitechTouchKeyboardK400 = {
     /* path */ "/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2.3/"
                "2-1.2.3:1.2/0003:046D:C52B.0006/input/input19/event17",
     /* name */ "Logitech Unifying Device. Wireless PID:4024",
     /* phys */ "usb-0000:00:1d.0-1.2.3:1",
     /* uniq */ "",
     /* bustype */ "001d",
     /* vendor */ "046d",
     /* product */ "4024",
     /* version */ "0111",
     /* prop */ "0",
     /* ev */ "12001f",
     /* key */ "3007f 0 0 483ffff17aff32d bf54444600000000 ffff0001 "
               "130f938b17c007 ffff7bfad9415fff febeffdfffefffff "
               "fffffffffffffffe",
     /* rel */ "1c3",
     /* abs */ "100000000",
     /* msc */ "10",
+    /* sw */ "0",
     /* led */ "1f",
     /* ff */ "0",
+    kLogitechTouchKeyboardK400AbsAxes,
+    arraysize(kLogitechTouchKeyboardK400AbsAxes),
 };
 
 bool CapabilitiesToDeviceInfo(const DeviceCapabilities& capabilities,
                               EventDeviceInfo* devinfo) {
   std::vector<unsigned long> ev_bits;
   if (!ParseBitfield(capabilities.ev, EV_CNT, &ev_bits))
     return false;
   devinfo->SetEventTypes(&ev_bits[0], ev_bits.size());
 
   std::vector<unsigned long> key_bits;
@@ skipping 19 matching lines @@
   std::vector<unsigned long> led_bits;
   if (!ParseBitfield(capabilities.led, LED_CNT, &led_bits))
     return false;
   devinfo->SetLedEvents(&led_bits[0], led_bits.size());
 
   std::vector<unsigned long> prop_bits;
   if (!ParseBitfield(capabilities.prop, INPUT_PROP_CNT, &prop_bits))
     return false;
   devinfo->SetProps(&prop_bits[0], prop_bits.size());
 
+  for (size_t i = 0; i < capabilities.abs_axis_count; ++i) {
+    const DeviceAbsoluteAxis& axis = capabilities.abs_axis[i];
+    devinfo->SetAbsInfo(axis.code, axis.absinfo);
+  }
+
   return true;
 }
 
 }  // namespace ui