Bug 1593841 - Using Gamepad axis array index as its index in default remapper on Mac OS. r=baku

We notice for some unknown gamepads, their axes don't follow the kAxisUsageMin rule, so we should choose to
use array index as the axis id.

Differential Revision: https://phabricator.services.mozilla.com/D56058

--HG--
extra : moz-landing-system : lando

Author: daoshengmu

dom/gamepad/GamepadRemapping.cpp

@@ -1548,8 +1548,9 @@ class OUYARemapper final : public GamepadRemapper {
   }
 };
 
-already_AddRefed<GamepadRemapper> GetGamepadRemapper(
-    const uint16_t aVendorId, const uint16_t aProductId) {
+already_AddRefed<GamepadRemapper> GetGamepadRemapper(const uint16_t aVendorId,
+                                                     const uint16_t aProductId,
+                                                     bool& aUsingDefault) {
   const std::vector<GamepadRemappingData> remappingRules = {
       {GamepadId::kAsusTekProduct4500, new ADT1Remapper()},
       {GamepadId::kDragonRiseProduct0011, new TwoAxesEightKeysRemapper()},
@@ -1580,11 +1581,13 @@ already_AddRefed<GamepadRemapper> GetGamepadRemapper(
 
   for (uint32_t i = 0; i < remappingRules.size(); ++i) {
     if (id == remappingRules[i].id) {
+      aUsingDefault = false;
       return do_AddRef(remappingRules[i].remapping.get());
     }
   }
 
   static RefPtr<GamepadRemapper> defaultRemapper = new DefaultRemapper();
+  aUsingDefault = true;
   return do_AddRef(defaultRemapper.get());
 }
 

dom/gamepad/GamepadRemapping.h

@@ -102,7 +102,8 @@ struct GamepadRemappingData {
 };
 
 already_AddRefed<GamepadRemapper> GetGamepadRemapper(const uint16_t aVendorId,
-                                                     const uint16_t aProductId);
+                                                     const uint16_t aProductId,
+                                                     bool& aUsingDefault);
 
 }  // namespace dom
 }  // namespace mozilla

dom/gamepad/cocoa/CocoaGamepad.cpp

@@ -92,7 +92,7 @@ class Gamepad {
     axes.Clear();
     mSuperIndex = -1;
   }
-  void init(IOHIDDeviceRef device);
+  void init(IOHIDDeviceRef device, bool defaultRemapper);
   void ReportChanged(uint8_t* report, CFIndex report_length);
   size_t WriteOutputReport(const std::vector<uint8_t>& aReport) const;
 
@@ -119,12 +119,12 @@ class Gamepad {
   std::vector<uint8_t> mInputReport;
 };
 
-void Gamepad::init(IOHIDDeviceRef device) {
+void Gamepad::init(IOHIDDeviceRef aDevice, bool aDefaultRemapper) {
   clear();
-  mDevice = device;
+  mDevice = aDevice;
 
   CFArrayRef elements =
-      IOHIDDeviceCopyMatchingElements(device, nullptr, kIOHIDOptionsTypeNone);
+      IOHIDDeviceCopyMatchingElements(aDevice, nullptr, kIOHIDOptionsTypeNone);
   CFIndex n = CFArrayGetCount(elements);
   for (CFIndex i = 0; i < n; i++) {
     IOHIDElementRef element =
@@ -134,7 +134,8 @@ void Gamepad::init(IOHIDDeviceRef device) {
 
     if (usagePage == kDesktopUsagePage && usage >= kAxisUsageMin &&
         usage <= kAxisUsageMax) {
-      Axis axis = {static_cast<int>(usage - kAxisUsageMin),
+      Axis axis = {aDefaultRemapper ? int(buttons.Length())
+                                    : static_cast<int>(usage - kAxisUsageMin),
                    element,
                    usagePage,
                    usage,
@@ -146,7 +147,8 @@ void Gamepad::init(IOHIDDeviceRef device) {
                IOHIDElementGetLogicalMax(element) -
                        IOHIDElementGetLogicalMin(element) ==
                    7) {
-      Axis axis = {static_cast<int>(usage - kAxisUsageMin),
+      Axis axis = {aDefaultRemapper ? int(buttons.Length())
+                                    : static_cast<int>(usage - kAxisUsageMin),
                    element,
                    usagePage,
                    usage,
@@ -273,7 +275,6 @@ void DarwinGamepadService::DeviceAdded(IOHIDDeviceRef device) {
     slot = mGamepads.size();
     mGamepads.push_back(Gamepad());
   }
-  mGamepads[slot].init(device);
 
   // Gather some identifying information
   CFNumberRef vendorIdRef =
@@ -291,8 +292,12 @@ void DarwinGamepadService::DeviceAdded(IOHIDDeviceRef device) {
   char buffer[256];
   sprintf(buffer, "%x-%x-%s", vendorId, productId, product_name);
 
-  RefPtr<GamepadRemapper> remapper = GetGamepadRemapper(vendorId, productId);
+  bool defaultRemapper = false;
+  RefPtr<GamepadRemapper> remapper =
+      GetGamepadRemapper(vendorId, productId, defaultRemapper);
   MOZ_ASSERT(remapper);
+  mGamepads[slot].init(device, defaultRemapper);
+
   remapper->SetAxisCount(mGamepads[slot].numAxes());
   remapper->SetButtonCount(mGamepads[slot].numButtons());
 

dom/gamepad/windows/WindowsGamepad.cpp

@@ -694,8 +694,9 @@ bool WindowsGamepadService::GetRawGamepad(HANDLE handle) {
   axes.SetLength(kAxesLengthCap);
 
   // Looking for the exisiting ramapping rule.
-  RefPtr<GamepadRemapper> remapper =
-      GetGamepadRemapper(rdi.hid.dwVendorId, rdi.hid.dwProductId);
+  bool defaultRemapper = false;
+  RefPtr<GamepadRemapper> remapper = GetGamepadRemapper(
+      rdi.hid.dwVendorId, rdi.hid.dwProductId, defaultRemapper);
   MOZ_ASSERT(remapper);
 
   for (size_t i = 0; i < count; i++) {