mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-05 09:26:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore compatibility with older GameCube mappings

Browse Source 
Restore the original button values for GameCube controllers, but swap labeled mappings to positional while loading mappings

Fixes https://github.com/libsdl-org/SDL/issues/12847
This commit is contained in:
Sam Lantinga
2025-04-30 15:21:34 -07:00
parent 3730128e33
commit 21a7bbbf14
6 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/joystick/hidapi/SDL_hidapi_switch.c
View File

@@ -285,7 +285,6 @@ typedef struct
SDL_HIDAPI_Device *device;
SDL_Joystick *joystick;
bool m_bInputOnly;
bool m_bGameCube;
bool m_bUseButtonLabels;
bool m_bPlayerLights;
int m_nPlayerIndex;
@@ -1131,20 +1130,7 @@ static Sint16 ApplySimpleStickCalibration(SDL_DriverSwitch_Context *ctx, int nSt
static Uint8 RemapButton(SDL_DriverSwitch_Context *ctx, Uint8 button)
{
if (ctx->m_bGameCube) {
switch (button) {
case SDL_GAMEPAD_BUTTON_SOUTH:
return SDL_GAMEPAD_BUTTON_WEST;
case SDL_GAMEPAD_BUTTON_EAST:
return SDL_GAMEPAD_BUTTON_SOUTH;
case SDL_GAMEPAD_BUTTON_WEST:
return SDL_GAMEPAD_BUTTON_NORTH;
case SDL_GAMEPAD_BUTTON_NORTH:
return SDL_GAMEPAD_BUTTON_EAST;
default:
break;
}
} else if (ctx->m_bUseButtonLabels) {
if (ctx->m_bUseButtonLabels) {
// Use button labels instead of positions, e.g. Nintendo Online Classic controllers
switch (button) {
case SDL_GAMEPAD_BUTTON_SOUTH:
@@ -1246,6 +1232,9 @@ static bool HasHomeLED(SDL_DriverSwitch_Context *ctx)
static bool AlwaysUsesLabels(Uint16 vendor_id, Uint16 product_id, ESwitchDeviceInfoControllerType eControllerType)
{
// Some controllers don't have a diamond button configuration, so should always use labels
if (SDL_IsJoystickGameCube(vendor_id, product_id)) {
return true;
}
switch (eControllerType) {
case k_eSwitchDeviceInfoControllerType_HVCLeft:
case k_eSwitchDeviceInfoControllerType_HVCRight:
@@ -1601,9 +1590,7 @@ static bool HIDAPI_DriverSwitch_OpenJoystick(SDL_HIDAPI_Device *device, SDL_Joys
}
}
if (SDL_IsJoystickGameCube(device->vendor_id, device->product_id)) {
ctx->m_bGameCube = true;
} else if (AlwaysUsesLabels(device->vendor_id, device->product_id, ctx->m_eControllerType)) {
if (AlwaysUsesLabels(device->vendor_id, device->product_id, ctx->m_eControllerType)) {
ctx->m_bUseButtonLabels = true;
}