Commit 7a51ad6a501f8b6a4af59fcc73d65aade045cb4a
2019-12-06T13:48:10
Fixed the game controller menu button on tvOS 13.2 (thanks Romain Tisserand)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
diff --git a/src/joystick/iphoneos/SDL_sysjoystick.m b/src/joystick/iphoneos/SDL_sysjoystick.m
index c50b629..913b354 100644
--- a/src/joystick/iphoneos/SDL_sysjoystick.m
+++ b/src/joystick/iphoneos/SDL_sysjoystick.m
@@ -129,6 +129,9 @@ IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCController *controlle
if (controller.extendedGamepad) {
GCExtendedGamepad *gamepad = controller.extendedGamepad;
+ BOOL is_xbox = [controller.vendorName containsString: @"Xbox"];
+ BOOL is_ps4 = [controller.vendorName containsString: @"DUALSHOCK"];
+ BOOL is_MFi = (!is_xbox && !is_ps4);
int nbuttons = 0;
/* These buttons are part of the original MFi spec */
@@ -155,20 +158,24 @@ IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCController *controlle
device->button_mask |= (1 << SDL_CONTROLLER_BUTTON_BACK);
++nbuttons;
}
- if ([gamepad respondsToSelector:@selector(buttonMenu)] && gamepad.buttonMenu) {
- device->button_mask |= (1 << SDL_CONTROLLER_BUTTON_START);
- ++nbuttons;
- } else {
- device->button_mask |= (1 << SDL_CONTROLLER_BUTTON_START);
- ++nbuttons;
+ BOOL has_direct_menu = [gamepad respondsToSelector:@selector(buttonMenu)] && gamepad.buttonMenu;
+#if TARGET_OS_TV
+ /* On tvOS MFi controller menu button brings you to the home screen */
+ if (is_MFi) {
+ has_direct_menu = FALSE;
+ }
+#endif
+ device->button_mask |= (1 << SDL_CONTROLLER_BUTTON_START);
+ ++nbuttons;
+ if (!has_direct_menu) {
device->uses_pause_handler = SDL_TRUE;
}
#pragma clang diagnostic pop
- if ([controller.vendorName containsString: @"Xbox"]) {
+ if (is_xbox) {
vendor = VENDOR_MICROSOFT;
product = 0x02E0; /* Assume Xbox One S BLE Controller unless/until GCController flows VID/PID */
- } else if ([controller.vendorName containsString: @"DUALSHOCK"]) {
+ } else if (is_ps4) {
vendor = VENDOR_SONY;
product = 0x09CC; /* Assume DS4 Slim unless/until GCController flows VID/PID */
} else {