TeamHepta/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-03 23:00:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Xbox controller names in MFI joystick backend (#15499)

Browse Source 
controller.vendorName returns a generic name for Xbox controllers ("Controller"), so we have to give them proper names.
This commit is contained in:
Nintorch
2026-05-03 21:26:15 +05:00
committed by GitHub
parent 7629a5cf9a
commit c805a4d632
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/joystick/apple/SDL_mfijoystick.m
View File

@@ -340,8 +340,6 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
name = "MFi Gamepad";
}
device->name = SDL_CreateJoystickName(0, 0, NULL, name);
#ifdef DEBUG_CONTROLLER_PROFILE
NSLog(@"Product name: %@\n", controller.vendorName);
NSLog(@"Product category: %@\n", controller.productCategory);
@@ -428,12 +426,19 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
if (device->has_xbox_paddles) {
// Assume Xbox One Elite Series 2 Controller unless/until GCController flows VID/PID
product = USB_PRODUCT_XBOX_ONE_ELITE_SERIES_2_BLUETOOTH;
// controller.vendorName returns a generic name for Xbox controllers ("Controller"),
// and controller.productCategory only returns "Xbox One" for those controllers,
// so we give them proper names based on the ones from SDL_gamepad_db.h
name = "Xbox One Elite 2 Controller";
} else if (device->has_xbox_share_button) {
// Assume Xbox Series X Controller unless/until GCController flows VID/PID
product = USB_PRODUCT_XBOX_SERIES_X_BLE;
name = "Xbox Series X Controller";
} else {
// Assume Xbox One S Bluetooth Controller unless/until GCController flows VID/PID
product = USB_PRODUCT_XBOX_ONE_S_REV1_BLUETOOTH;
name = "Xbox One Wireless Controller";
}
} else if (device->is_ps4) {
// Assume DS4 Slim unless/until GCController flows VID/PID
@@ -611,6 +616,8 @@ static bool IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
// We don't know how to get input events from this device
return false;
}
device->name = SDL_CreateJoystickName(0, 0, NULL, name);
Uint16 signature;
if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {