convert to System_SendMessage insanity

SDL/SDLMain.cpp

@@ -58,6 +58,9 @@ SDLJoystick *joystick = NULL;
 #include "SDLGLGraphicsContext.h"
 #include "SDLVulkanGraphicsContext.h"
 
+#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
+#include "UI/DarwinFileSystemServices.h"
+#endif
 
 GlobalUIState lastUIState = UISTATE_MENU;
 GlobalUIState GetUIState();
@@ -185,7 +188,18 @@ void System_SendMessage(const char *command, const char *parameter) {
 	} else if (!strcmp(command, "audio_resetDevice")) {
 		StopSDLAudioDevice();
 		InitSDLAudioDevice();
-	}
+    }
+#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
+    else if (!strcmp(command, "browse_folder")) {
+        DarwinDirectoryPanelCallback callback = [] (Path thePathChosen) {
+            NativeMessageReceived("browse_folder", thePathChosen.c_str());
+        };
+        
+        DarwinFileSystemServices services;
+        services.presentDirectoryPanel(callback, /* allowFiles = */ true, /* allowDirectorites = */ true);
+    }
+#endif
+    
 }
 
 void System_AskForPermission(SystemPermission permission) {}

UI/DarwinFileSystemServices.h

@@ -5,8 +5,7 @@
 //  Created by Serena on 20/01/2023.
 //
 
-#ifndef DarwinFileSystemServices_h
-#define DarwinFileSystemServices_h
+#pragma once
 
 #include "ppsspp_config.h"
 #include "Common/File/Path.h"
@@ -33,5 +32,3 @@ private:
     void *__pickerDelegate = NULL;
 #endif // PPSSPP_PLATFORM(IOS)
 };
-
-#endif /* DarwinFileSystemServices_h */

UI/MainScreen.cpp

@@ -538,23 +538,7 @@ UI::EventReturn GameBrowser::LastClick(UI::EventParams &e) {
 }
 
 UI::EventReturn GameBrowser::BrowseClick(UI::EventParams &e) {
-#if PPSSPP_PLATFORM(IOS) || PPSSPP_PLATFORM(MAC)
-	DarwinDirectoryPanelCallback callback = [this] (Path thePathChosen) {
-		File::FileInfo info;
-		if (!File::GetFileInfo(thePathChosen, &info))
-			return;
-		
-		if (info.isDirectory)
-			SetPath(thePathChosen); // user selected a dir, go there
-		else
-			LaunchFile(screenManager_, thePathChosen); // it's a file, try open it
-	};
-	
-	DarwinFileSystemServices services;
-	services.presentDirectoryPanel(callback, /* allowFiles = */ true, /* allowDirectorites = */ true);
-#else
 	System_SendMessage("browse_folder", "");
-#endif
 	return UI::EVENT_DONE;
 }
 

UI/NativeApp.cpp

@@ -1258,6 +1258,15 @@ void HandleGlobalMessage(const std::string &msg, const std::string &value) {
 	else if (msg == "app_resumed" || msg == "got_focus") {
 		// Assume that the user may have modified things.
 		MemoryStick_NotifyWrite();
+	} else if (msg == "browse_folder") {
+		Path thePath = Path(value);
+		File::FileInfo info;
+		if (!File::GetFileInfo(thePath, &info))
+			return;
+		if (info.isDirectory)
+			NativeMessageReceived("browse_folderSelect", thePath.c_str());
+		else
+			NativeMessageReceived("browse_fileSelect", thePath.c_str());
 	}
 }
 

ios/main.mm

@@ -20,6 +20,7 @@
 #include "Common/System/System.h"
 #include "Common/StringUtils.h"
 #include "Common/Profiler/Profiler.h"
+#include "UI/DarwinFileSystemServices.h"
 
 static int (*csops)(pid_t pid, unsigned int ops, void * useraddr, size_t usersize);
 static boolean_t (*exc_server)(mach_msg_header_t *, mach_msg_header_t *);
@@ -201,6 +202,13 @@ void System_SendMessage(const char *command, const char *parameter) {
 			g_safeInsetTop = top;
 			g_safeInsetBottom = bottom;
 		}
+	} else if (!strcmp(command, "browse_folder")) {
+		DarwinDirectoryPanelCallback callback = [] (Path thePathChosen) {
+				NativeMessageReceived("browse_folder", thePathChosen.c_str());
+		};
+		
+		DarwinFileSystemServices services;
+		services.presentDirectoryPanel(callback, /* allowFiles = */ true, /* allowDirectorites = */ true);
 	}
 }