preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-19 09:19:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

iOS: Make the emu thread's UIKit and Core Location calls on the main thread

Browse Source 
System requests and System_Vibrate come from the emu thread. Camera,
GPS, share and keyboard requests called sharedViewController directly
from there, which the main thread can nil out during a restart, and the
share sheet, the location manager and the feedback generator were used
off the main thread. Dispatch them all to the main thread.

The share sheet also had no popover anchor, which iPad requires.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 committed 2026-10-10 16:28:27 +02:00
1 parent 69d33ef8e9
commit 895d54eb45
2 files changed
+66 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ios/ViewControllerCommon.mm
+6 -4
View File
@@ -407,10 +407,12 @@ extern float g_safeInsetBottom;
- (void)shareText:(NSString *)text {
NSArray *items = @[text];
UIActivityViewController * viewController = [[UIActivityViewController alloc] initWithActivityItems:items applicationActivities:nil];
dispatch_async(dispatch_get_main_queue(), ^{
[self presentViewController:viewController animated:YES completion:nil];
});
UIActivityViewController *viewController = [[UIActivityViewController alloc] initWithActivityItems:items applicationActivities:nil];
// On iPad, the share sheet is a popover and needs an anchor.
viewController.popoverPresentationController.sourceView = self.view;
viewController.popoverPresentationController.sourceRect = CGRectMake(CGRectGetMidX(self.view.bounds), CGRectGetMidY(self.view.bounds), 0, 0);
viewController.popoverPresentationController.permittedArrowDirections = 0;
[self presentViewController:viewController animated:YES completion:nil];
}
- (void)appSwitchModeChanged {
ios/main.mm
+60 -42
View File
@@ -528,43 +528,58 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string
return true;
}
case SystemRequestType::CAMERA_COMMAND:
if (!strncmp(param1.c_str(), "startVideo", 10)) {
int width = 0, height = 0;
sscanf(param1.c_str(), "startVideo_%dx%d", &width, &height);
[sharedViewController startVideo:width height:height];
} else if (!strcmp(param1.c_str(), "stopVideo")) {
[sharedViewController stopVideo];
}
{
// These come from the emu thread. UIKit and Core Location want the main thread, and that's
// also the only thread that changes sharedViewController.
std::string command = param1;
dispatch_async(dispatch_get_main_queue(), ^{
if (!strncmp(command.c_str(), "startVideo", 10)) {
int width = 0, height = 0;
sscanf(command.c_str(), "startVideo_%dx%d", &width, &height);
[sharedViewController startVideo:width height:height];
} else if (command == "stopVideo") {
[sharedViewController stopVideo];
}
});
return true;
}
case SystemRequestType::GPS_COMMAND:
if (param1 == "open") {
[sharedViewController startLocation];
} else if (param1 == "close") {
[sharedViewController stopLocation];
}
{
std::string command = param1;
dispatch_async(dispatch_get_main_queue(), ^{
if (command == "open") {
[sharedViewController startLocation];
} else if (command == "close") {
[sharedViewController stopLocation];
}
});
return true;
}
case SystemRequestType::SHARE_TEXT:
{
NSString *text = [NSString stringWithUTF8String:param1.c_str()];
[sharedViewController shareText:text];
dispatch_async(dispatch_get_main_queue(), ^{
[sharedViewController shareText:text];
});
return true;
}
case SystemRequestType::NOTIFY_UI_EVENT:
{
switch ((UIEventNotification)param3) {
case UIEventNotification::POPUP_CLOSED:
case UIEventNotification::DIALOG_CLOSED:
[sharedViewController hideKeyboard];
break;
case UIEventNotification::TEXT_GOTFOCUS:
[sharedViewController showKeyboard];
break;
case UIEventNotification::TEXT_LOSTFOCUS:
[sharedViewController hideKeyboard];
break;
default:
break;
}
const UIEventNotification event = (UIEventNotification)param3;
dispatch_async(dispatch_get_main_queue(), ^{
switch (event) {
case UIEventNotification::POPUP_CLOSED:
case UIEventNotification::DIALOG_CLOSED:
case UIEventNotification::TEXT_LOSTFOCUS:
[sharedViewController hideKeyboard];
break;
case UIEventNotification::TEXT_GOTFOCUS:
[sharedViewController showKeyboard];
break;
default:
break;
}
});
return true;
}
#if PPSSPP_PLATFORM(IOS_APP_STORE)
@@ -640,25 +655,28 @@ BOOL SupportsTaptic() {
}
void System_Vibrate(int mode) {
if (SupportsTaptic()) {
PPSSPPUIApplication* app = (PPSSPPUIApplication*)[UIApplication sharedApplication];
if(app.feedbackGenerator == nil)
{
app.feedbackGenerator = [[UISelectionFeedbackGenerator alloc] init];
[app.feedbackGenerator prepare];
}
[app.feedbackGenerator selectionChanged];
} else {
// Comes from the UI code on the emu thread, and UIKit wants the main thread.
dispatch_async(dispatch_get_main_queue(), ^{
if (SupportsTaptic()) {
PPSSPPUIApplication* app = (PPSSPPUIApplication*)[UIApplication sharedApplication];
if(app.feedbackGenerator == nil)
{
app.feedbackGenerator = [[UISelectionFeedbackGenerator alloc] init];
[app.feedbackGenerator prepare];
}
[app.feedbackGenerator selectionChanged];
} else {
#if !PPSSPP_PLATFORM(IOS_APP_STORE)
NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
NSArray *pattern = @[@YES, @30, @NO, @2];
NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
NSArray *pattern = @[@YES, @30, @NO, @2];
dictionary[@"VibePattern"] = pattern;
dictionary[@"Intensity"] = @2;
dictionary[@"VibePattern"] = pattern;
dictionary[@"Intensity"] = @2;
AudioServicesPlaySystemSoundWithVibration(kSystemSoundID_Vibrate, nil, dictionary);
AudioServicesPlaySystemSoundWithVibration(kSystemSoundID_Vibrate, nil, dictionary);
#endif
}
}
});
}
AudioBackend *System_CreateAudioBackend() {