From e01257376659f75562108e4948e13135fc3108e6 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Tue, 25 Feb 2025 18:59:40 -0800
Subject: [PATCH] Don't fixup mappings for Joy-Con controllers
They don't have a D-pad mapping, so look at the paddles instead to see whether we need to fix up the mapping.
Fixes https://github.com/libsdl-org/SDL/issues/12232
---
src/joystick/SDL_gamepad.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/joystick/SDL_gamepad.c b/src/joystick/SDL_gamepad.c
index bd28c90e3dc9f..8486865bffc15 100644
--- a/src/joystick/SDL_gamepad.c
+++ b/src/joystick/SDL_gamepad.c
@@ -1394,17 +1394,22 @@ static void SDL_UpdateGamepadFaceStyle(SDL_Gamepad *gamepad)
static void SDL_FixupHIDAPIMapping(SDL_Gamepad *gamepad)
{
// Check to see if we need fixup
+ bool need_fixup = false;
for (int i = 0; i < gamepad->num_bindings; ++i) {
SDL_GamepadBinding *binding = &gamepad->bindings[i];
if (binding->output_type == SDL_GAMEPAD_BINDTYPE_BUTTON &&
- binding->output.button == SDL_GAMEPAD_BUTTON_DPAD_UP) {
- if (binding->input_type != SDL_GAMEPAD_BINDTYPE_BUTTON ||
- binding->input.button != SDL_GAMEPAD_BUTTON_DPAD_UP) {
- // New style binding
- return;
+ binding->output.button >= SDL_GAMEPAD_BUTTON_DPAD_UP) {
+ if (binding->input_type == SDL_GAMEPAD_BINDTYPE_BUTTON &&
+ binding->input.button == binding->output.button) {
+ // Old style binding
+ need_fixup = true;
}
+ break;
}
}
+ if (!need_fixup) {
+ return;
+ }
for (int i = 0; i < gamepad->num_bindings; ++i) {
SDL_GamepadBinding *binding = &gamepad->bindings[i];