moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2025-07-03 16:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for Start and Select on iOS 13. Fixes #367

Browse Source
This commit is contained in:
Cameron Gutman 2019-06-05 19:54:56 -07:00
parent 636143ee97
commit dd5ecb37c4
1 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Limelight/Input/ControllerSupport.m
View File

@ -211,21 +211,25 @@
-(void) registerControllerCallbacks:(GCController*) controller -(void) registerControllerCallbacks:(GCController*) controller
{ {
if (controller != NULL) { if (controller != NULL) {
controller.controllerPausedHandler = ^(GCController *controller) { // On iOS 13, we want to use the new buttonMenu property which lets users hold down Start.
Controller* limeController = [self->_controllers objectForKey:[NSNumber numberWithInteger:controller.playerIndex]]; // On prior versions, we must use the controllerPausedHandler.
if (![controller.extendedGamepad respondsToSelector:@selector(buttonMenu)]) {
// Get off the main thread controller.controllerPausedHandler = ^(GCController *controller) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ Controller* limeController = [self->_controllers objectForKey:[NSNumber numberWithInteger:controller.playerIndex]];
[self setButtonFlag:limeController flags:PLAY_FLAG];
[self updateFinished:limeController];
// Pause for 100 ms // Get off the main thread
usleep(100 * 1000); dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
[self setButtonFlag:limeController flags:PLAY_FLAG];
[self clearButtonFlag:limeController flags:PLAY_FLAG]; [self updateFinished:limeController];
[self updateFinished:limeController];
}); // Pause for 100 ms
}; usleep(100 * 1000);
[self clearButtonFlag:limeController flags:PLAY_FLAG];
[self updateFinished:limeController];
});
};
}
if (controller.extendedGamepad != NULL) { if (controller.extendedGamepad != NULL) {
controller.extendedGamepad.valueChangedHandler = ^(GCExtendedGamepad *gamepad, GCControllerElement *element) { controller.extendedGamepad.valueChangedHandler = ^(GCExtendedGamepad *gamepad, GCControllerElement *element) {
@ -257,6 +261,25 @@
} }
} }
// Until the iOS 13 SDK is released, we must use performSelector: and respondsToSelector:
// to exercise the new buttonMenu and buttonOptions properties.
if (@available(iOS 13.0, tvOS 13.0, *)) {
if ([gamepad respondsToSelector:@selector(buttonMenu)]) {
GCControllerButtonInput* menuButton = [gamepad performSelector:@selector(buttonMenu)];
// Menu button is mandatory, so no need to check for nil
UPDATE_BUTTON_FLAG(limeController, PLAY_FLAG, menuButton.pressed);
}
if ([gamepad respondsToSelector:@selector(buttonOptions)]) {
GCControllerButtonInput* optionsButton = [gamepad performSelector:@selector(buttonOptions)];
// Options button is optional (only present on Xbox One S and PS4 gamepads)
if (optionsButton != nil) {
UPDATE_BUTTON_FLAG(limeController, BACK_FLAG, optionsButton.pressed);
}
}
}
leftStickX = gamepad.leftThumbstick.xAxis.value * 0x7FFE; leftStickX = gamepad.leftThumbstick.xAxis.value * 0x7FFE;
leftStickY = gamepad.leftThumbstick.yAxis.value * 0x7FFE; leftStickY = gamepad.leftThumbstick.yAxis.value * 0x7FFE;
@ -316,7 +339,23 @@
if (@available(iOS 12.1, tvOS 12.1, *)) { if (@available(iOS 12.1, tvOS 12.1, *)) {
if (controller.extendedGamepad.leftThumbstickButton != nil && if (controller.extendedGamepad.leftThumbstickButton != nil &&
controller.extendedGamepad.rightThumbstickButton != nil) { controller.extendedGamepad.rightThumbstickButton != nil) {
level = OnScreenControlsLevelAutoGCExtendedGamepadWithStickButtons; GCControllerButtonInput* optionsButton = nil;
if (@available(iOS 13.0, tvOS 13.0, *)) {
// TODO: Update when iOS 13 SDK is officially released
if ([controller.extendedGamepad respondsToSelector:@selector(buttonOptions)]) {
optionsButton = [controller.extendedGamepad performSelector:@selector(buttonOptions)];
}
}
if (optionsButton != nil) {
// Has L3/R3 and Select, so we can show nothing :)
level = OnScreenControlsLevelOff;
}
else {
// Has L3/R3 but no Select button
level = OnScreenControlsLevelAutoGCExtendedGamepadWithStickButtons;
}
} }
} }
break; break;