Merge pull request #14686 from JoshuaVandaele/sdl-touchpads

SDLGamepad: Support multiple touchpads

1 files changed, 14 insertions, 8 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.cpp
index 09457598c6..682e24c28a 100644
--- a/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.cpp
@@ -104,15 +104,21 @@ Gamepad::Gamepad(SDL_Gamepad* const gamepad, SDL_Joystick* const joystick)
     }
 
     // Touchpad
-    if (SDL_GetNumGamepadTouchpads(m_gamepad) > 0)
+    const int num_touchpads = SDL_GetNumGamepadTouchpads(m_gamepad);
+    if (num_touchpads > 0)
     {
-      const char* const name_x = "Touchpad X";
-      AddInput(new NonDetectableDirectionalInput<-1>(name_x, &m_touchpad_x));
-      AddInput(new NonDetectableDirectionalInput<+1>(name_x, &m_touchpad_x));
-      const char* const name_y = "Touchpad Y";
-      AddInput(new NonDetectableDirectionalInput<-1>(name_y, &m_touchpad_y));
-      AddInput(new NonDetectableDirectionalInput<+1>(name_y, &m_touchpad_y));
-      AddInput(new NormalizedInput("Touchpad Pressure", &m_touchpad_pressure));
+      m_touchpads.resize(num_touchpads);
+      for (int t = 0; t < num_touchpads; ++t)
+      {
+        // We do not number the first touchpad to keep backwards compatibility with existing configs
+        // that use "Touchpad X" and "Touchpad Y" as input names.
+        const std::string prefix = t > 0 ? fmt::format("Touchpad {} ", t) : "Touchpad ";
+        AddInput(new NonDetectableDirectionalInput<-1>(prefix + "X", &m_touchpads[t].x));
+        AddInput(new NonDetectableDirectionalInput<+1>(prefix + "X", &m_touchpads[t].x));
+        AddInput(new NonDetectableDirectionalInput<-1>(prefix + "Y", &m_touchpads[t].y));
+        AddInput(new NonDetectableDirectionalInput<+1>(prefix + "Y", &m_touchpads[t].y));
+        AddInput(new NormalizedInput(prefix + "Pressure", &m_touchpads[t].pressure));
+      }
     }
 
     // Motion