libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #8921 from yoshisuga/ios13-controllers

Browse Source 
iOS: Improved controller support (L3/R3, PS4/Xbox One Controllers in iOS 13 beta)
This commit is contained in:
Twinaphex 2019-06-05 20:39:35 +02:00 committed by GitHub
commit 27e5c7e63c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 93 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
input/drivers_joypad/mfi_joypad.m
View File

@ -65,12 +65,18 @@ static void apple_gamecontroller_joypad_poll_internal(GCController *controller)
buttons = &mfi_buttons[slot]; buttons = &mfi_buttons[slot];
/* retain the values from the paused controller handler and pass them through */ /* retain the values from the paused controller handler and pass them through */
pause = *buttons & (1 << RETRO_DEVICE_ID_JOYPAD_START); if (@available(iOS 13, *)) {
select = *buttons & (1 << RETRO_DEVICE_ID_JOYPAD_SELECT); // The menu button can be pressed/unpressed like any other button in iOS 13
l3 = *buttons & ( 1 << RETRO_DEVICE_ID_JOYPAD_L3 ); // so no need to passthrough anything
r3 = *buttons & ( 1 << RETRO_DEVICE_ID_JOYPAD_R3 ); *buttons = 0;
*buttons = 0 | pause | select | l3 | r3; } else {
// Use the paused controller handler for iOS versions below 13
pause = *buttons & (1 << RETRO_DEVICE_ID_JOYPAD_START);
select = *buttons & (1 << RETRO_DEVICE_ID_JOYPAD_SELECT);
l3 = *buttons & ( 1 << RETRO_DEVICE_ID_JOYPAD_L3 );
r3 = *buttons & ( 1 << RETRO_DEVICE_ID_JOYPAD_R3 );
*buttons = 0 | pause | select | l3 | r3;
}
memset(mfi_axes[slot], 0, sizeof(mfi_axes[0])); memset(mfi_axes[slot], 0, sizeof(mfi_axes[0]));
if (controller.extendedGamepad) if (controller.extendedGamepad)
@ -89,6 +95,37 @@ static void apple_gamecontroller_joypad_poll_internal(GCController *controller)
*buttons |= gp.rightShoulder.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_R) : 0; *buttons |= gp.rightShoulder.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_R) : 0;
*buttons |= gp.leftTrigger.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_L2) : 0; *buttons |= gp.leftTrigger.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_L2) : 0;
*buttons |= gp.rightTrigger.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_R2) : 0; *buttons |= gp.rightTrigger.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_R2) : 0;
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 120100 || __TV_OS_VERSION_MAX_ALLOWED >= 120100
if (@available(iOS 12.1, *)) {
*buttons |= gp.leftThumbstickButton.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_L3) : 0;
*buttons |= gp.rightThumbstickButton.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_R3) : 0;
}
#endif
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __TV_OS_VERSION_MAX_ALLOWED >= 130000
if (@available(iOS 13, *)) {
// Support "Options" button present in PS4 / XBox One controllers
*buttons |= gp.buttonOptions.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_SELECT) : 0;
// Support buttons that aren't supported by older mFi controller via "hotkey" combinations:
//
// LS + Menu => Select
// LT + Menu => L3
// RT + Menu => R3
if ( gp.buttonMenu.pressed ) {
if ( gp.leftShoulder.pressed ) {
*buttons |= 1 << RETRO_DEVICE_ID_JOYPAD_SELECT;
} else if ( gp.leftTrigger.pressed ) {
*buttons |= 1 << RETRO_DEVICE_ID_JOYPAD_L3;
} else if ( gp.rightTrigger.pressed ) {
*buttons |= 1 << RETRO_DEVICE_ID_JOYPAD_R3;
} else {
*buttons |= 1 << RETRO_DEVICE_ID_JOYPAD_START;
}
}
}
#endif
mfi_axes[slot][0] = gp.leftThumbstick.xAxis.value * 32767.0f; mfi_axes[slot][0] = gp.leftThumbstick.xAxis.value * 32767.0f;
mfi_axes[slot][1] = gp.leftThumbstick.yAxis.value * 32767.0f; mfi_axes[slot][1] = gp.leftThumbstick.yAxis.value * 32767.0f;
mfi_axes[slot][2] = gp.rightThumbstick.xAxis.value * 32767.0f; mfi_axes[slot][2] = gp.rightThumbstick.xAxis.value * 32767.0f;
@ -128,51 +165,57 @@ static void apple_gamecontroller_joypad_register(GCGamepad *gamepad)
apple_gamecontroller_joypad_poll_internal(updateGamepad.controller); apple_gamecontroller_joypad_poll_internal(updateGamepad.controller);
}; };
gamepad.controller.controllerPausedHandler = ^(GCController *controller) if (@available(iOS 13, *)) {
{ // controllerPausedHandler is deprecated in favor of being able to deal with the menu
uint32_t slot = (uint32_t)controller.playerIndex; // button as any other button
return;
// Support buttons that aren't supported by the mFi controller via "hotkey" combinations: } else {
// gamepad.controller.controllerPausedHandler = ^(GCController *controller)
// LS + Menu => Select {
// LT + Menu => L3 uint32_t slot = (uint32_t)controller.playerIndex;
// RT + Menu => R3
// Note that these are just button presses, and it does not simulate holding down the button // Support buttons that aren't supported by the mFi controller via "hotkey" combinations:
if ( controller.gamepad.leftShoulder.pressed || controller.extendedGamepad.leftShoulder.pressed ) { //
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_START); // LS + Menu => Select
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_L); // LT + Menu => L3
mfi_buttons[slot] |= (1 << RETRO_DEVICE_ID_JOYPAD_SELECT); // RT + Menu => R3
// Note that these are just button presses, and it does not simulate holding down the button
if ( controller.gamepad.leftShoulder.pressed || controller.extendedGamepad.leftShoulder.pressed ) {
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_START);
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_L);
mfi_buttons[slot] |= (1 << RETRO_DEVICE_ID_JOYPAD_SELECT);
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_SELECT);
});
return;
}
if ( controller.extendedGamepad.leftTrigger.pressed ) {
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_L2);
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_START);
mfi_buttons[slot] |= (1 << RETRO_DEVICE_ID_JOYPAD_L3);
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_L3);
});
return;
}
if ( controller.extendedGamepad.rightTrigger.pressed ) {
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_R2);
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_START);
mfi_buttons[slot] |= (1 << RETRO_DEVICE_ID_JOYPAD_R3);
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_R3);
});
return;
}
mfi_buttons[slot] |= (1 << RETRO_DEVICE_ID_JOYPAD_START);
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_SELECT); mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_START);
}); });
return;
} };
if ( controller.extendedGamepad.leftTrigger.pressed ) { }
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_L2);
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_START);
mfi_buttons[slot] |= (1 << RETRO_DEVICE_ID_JOYPAD_L3);
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_L3);
});
return;
}
if ( controller.extendedGamepad.rightTrigger.pressed ) {
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_R2);
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_START);
mfi_buttons[slot] |= (1 << RETRO_DEVICE_ID_JOYPAD_R3);
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_R3);
});
return;
}
mfi_buttons[slot] |= (1 << RETRO_DEVICE_ID_JOYPAD_START);
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
mfi_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_START);
});
};
} }
static void apple_gamecontroller_joypad_connect(GCController *controller) static void apple_gamecontroller_joypad_connect(GCController *controller)

1
pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj
View File

@ -418,6 +418,7 @@
developmentRegion = English; developmentRegion = English;
hasScannedForEncodings = 0; hasScannedForEncodings = 0;
knownRegions = ( knownRegions = (
English,
en, en,
Base, Base,
); );