Merge pull request #18627 from hrydgard/remote-tab

Remote game streaming: Add an option to put a tab on the main screen
hrydgard · Dec 28, 2023 · 2074ccd · 2074ccd
2 parents acbd32c + 91942af
commit 2074ccd
Show file tree

Hide file tree

Showing 49 changed files with 103 additions and 31 deletions.
diff --git a/Core/Config.cpp b/Core/Config.cpp
@@ -265,6 +265,7 @@ static const ConfigSetting generalSettings[] = {
 	ConfigSetting("RemoteShareOnStartup", &g_Config.bRemoteShareOnStartup, false, CfgFlag::DEFAULT),
 	ConfigSetting("RemoteISOSubdir", &g_Config.sRemoteISOSubdir, "/", CfgFlag::DEFAULT),
 	ConfigSetting("RemoteDebuggerOnStartup", &g_Config.bRemoteDebuggerOnStartup, false, CfgFlag::DEFAULT),
+	ConfigSetting("RemoteTab", &g_Config.bRemoteTab, false, CfgFlag::DEFAULT),
 
 #ifdef __ANDROID__
 	ConfigSetting("ScreenRotation", &g_Config.iScreenRotation, ROTATION_AUTO_HORIZONTAL),

diff --git a/Core/Config.h b/Core/Config.h
@@ -129,6 +129,7 @@ struct Config {
 	bool bRemoteShareOnStartup;
 	std::string sRemoteISOSubdir;
 	bool bRemoteDebuggerOnStartup;
+	bool bRemoteTab;
 	bool bMemStickInserted;
 	int iMemStickSizeGB;
 	bool bLoadPlugins;

diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
@@ -55,6 +55,7 @@
 #include "UI/GameSettingsScreen.h"
 #include "UI/MiscScreens.h"
 #include "UI/ControlMappingScreen.h"
+#include "UI/RemoteISOScreen.h"
 #include "UI/DisplayLayoutScreen.h"
 #include "UI/SavedataScreen.h"
 #include "UI/Store.h"
@@ -645,6 +646,9 @@ UI::EventReturn GameBrowser::OnHomeClick(UI::EventParams &e) {
 // Maybe we should have no home directory in this case. Or it should just navigate to the root
 // of the current folder tree.
 Path GameBrowser::HomePath() {
+	if (!homePath_.empty()) {
+		return homePath_;
+	}
 #if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(SWITCH) || defined(USING_WIN_UI) || PPSSPP_PLATFORM(UWP)
 	return g_Config.memStickDirectory;
 #else
@@ -771,7 +775,7 @@ void GameBrowser::Refresh() {
 			// we show just the image, because we don't need to emphasize the button on Darwin
 			topBar->Add(new Choice(ImageID("I_FOLDER_OPEN"), new LayoutParams(WRAP_CONTENT, 64.0f)))->OnClick.Handle(this, &GameBrowser::BrowseClick);
 #else
-			if (System_GetPropertyBool(SYSPROP_HAS_FOLDER_BROWSER)) {
+			if ((browseFlags_ & BrowseFlags::BROWSE) && System_GetPropertyBool(SYSPROP_HAS_FOLDER_BROWSER)) {
 				topBar->Add(new Choice(mm->T("Browse"), ImageID("I_FOLDER_OPEN"), new LayoutParams(WRAP_CONTENT, 64.0f)))->OnClick.Handle(this, &GameBrowser::BrowseClick);
 			}
 			if (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_TV) {
@@ -932,7 +936,7 @@ void GameBrowser::Refresh() {
 		Add(new TextView(mm->T("UseBrowseOrLoad", "Use Browse to choose a folder, or Load to choose a file.")));
 	}
 
-	if (!lastText_.empty() && gameButtons.empty()) {
+	if (!lastText_.empty()) {
 		Add(new Spacer());
 		Add(new Choice(lastText_, new UI::LinearLayoutParams(UI::WRAP_CONTENT, UI::WRAP_CONTENT)))->OnClick.Handle(this, &GameBrowser::LastClick);
 	}
@@ -1108,6 +1112,7 @@ void MainScreen::CreateViews() {
 		ScrollView *scrollHomebrew = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT));
 		scrollHomebrew->SetTag("MainScreenHomebrew");
 
+
 		GameBrowser *tabAllGames = new GameBrowser(Path(g_Config.currentDirectory), BrowseFlags::STANDARD, &g_Config.bGridView2, screenManager(),
 			mm->T("How to get games"), "https://www.ppsspp.org/getgames",
 			new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
@@ -1133,6 +1138,29 @@ void MainScreen::CreateViews() {
 		tabAllGames->OnHighlight.Handle(this, &MainScreen::OnGameHighlight);
 		tabHomebrew->OnHighlight.Handle(this, &MainScreen::OnGameHighlight);
 
+		if (g_Config.bRemoteTab && !g_Config.sLastRemoteISOServer.empty()) {
+			auto ri = GetI18NCategory(I18NCat::REMOTEISO);
+
+			ScrollView *scrollRemote = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT));
+			scrollRemote->SetTag("MainScreenRemote");
+
+			Path remotePath(FormatRemoteISOUrl(g_Config.sLastRemoteISOServer.c_str(), g_Config.iLastRemoteISOPort, RemoteSubdir().c_str()));
+
+			GameBrowser *tabRemote = new GameBrowser(remotePath, BrowseFlags::NAVIGATE, &g_Config.bGridView3, screenManager(),
+				ri->T("Remote disc streaming"), "https://www.ppsspp.org/docs/reference/disc-streaming",
+				new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
+			tabRemote->SetHomePath(remotePath);
+
+			scrollRemote->Add(tabRemote);
+			gameBrowsers_.push_back(tabRemote);
+
+			tabHolder_->AddTab(ri->T("Remote disc streaming"), scrollRemote);
+
+			tabRemote->OnChoice.Handle(this, &MainScreen::OnGameSelectedInstant);
+			tabRemote->OnHoldChoice.Handle(this, &MainScreen::OnGameSelected);
+			tabRemote->OnHighlight.Handle(this, &MainScreen::OnGameHighlight);
+		}
+
 		if (g_Config.HasRecentIsos()) {
 			tabHolder_->SetCurrentTab(0, true);
 		} else if (g_Config.iMaxRecent > 0) {

diff --git a/UI/MainScreen.h b/UI/MainScreen.h
@@ -32,10 +32,11 @@ enum GameBrowserFlags {
 enum class BrowseFlags {
 	NONE = 0,
 	NAVIGATE = 1,
-	ARCHIVES = 2,
-	PIN = 4,
-	HOMEBREW_STORE = 8,
-	STANDARD = 1 | 2 | 4,
+	BROWSE = 2,
+	ARCHIVES = 4,
+	PIN = 8,
+	HOMEBREW_STORE = 16,
+	STANDARD = 1 | 2 | 4 | 8,
 };
 ENUM_CLASS_BITOPS(BrowseFlags);
 
@@ -55,6 +56,10 @@ class GameBrowser : public UI::LinearLayout {
 	void Draw(UIContext &dc) override;
 	void Update() override;
 
+	void SetHomePath(const Path &path) {
+		homePath_ = path;
+	}
+
 protected:
 	virtual bool DisplayTopBar();
 	virtual bool HasSpecialFiles(std::vector<Path> &filenames);
@@ -63,6 +68,8 @@ class GameBrowser : public UI::LinearLayout {
 
 	void Refresh();
 
+	Path homePath_;
+
 private:
 	bool IsCurrentPathPinned();
 	const std::vector<Path> GetPinnedPaths();

diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp
@@ -96,7 +96,7 @@ static ServerAllowStatus IsServerAllowed(int port) {
 #endif
 }
 
-static std::string RemoteSubdir() {
+std::string RemoteSubdir() {
 	if (g_Config.bRemoteISOManual) {
 		return g_Config.sRemoteISOSubdir;
 	}
@@ -484,9 +484,13 @@ ScanStatus RemoteISOConnectScreen::GetStatus() {
 	return status_;
 }
 
+std::string FormatRemoteISOUrl(const char *host, int port, const char *subdir) {
+	return StringFromFormat("http://%s:%d%s", host, port, subdir);
+}
+
 void RemoteISOConnectScreen::ExecuteLoad() {
 	std::string subdir = RemoteSubdir();
-	url_ = StringFromFormat("http://%s:%d%s", host_.c_str(), port_, subdir.c_str());
+	url_ = FormatRemoteISOUrl(host_.c_str(), port_, subdir.c_str());
 	bool result = LoadGameList(Path(url_), games_);
 	if (scanAborted) {
 		return;
@@ -501,25 +505,6 @@ void RemoteISOConnectScreen::ExecuteLoad() {
 	status_ = result ? ScanStatus::LOADED : ScanStatus::FAILED;
 }
 
-class RemoteGameBrowser : public GameBrowser {
-public:
-	RemoteGameBrowser(const Path &url, BrowseFlags browseFlags, bool *gridStyle, ScreenManager *screenManager, std::string lastText, std::string lastLink, UI::LayoutParams *layoutParams = nullptr)
-		: GameBrowser(url, browseFlags, gridStyle, screenManager, lastText, lastLink, layoutParams) {
-		initialPath_ = url;
-	}
-
-protected:
-	Path HomePath() override {
-		return initialPath_;
-	}
-
-	Path initialPath_;
-};
-
-RemoteISOBrowseScreen::RemoteISOBrowseScreen(const std::string &url, const std::vector<Path> &games)
-	: url_(url), games_(games) {
-}
-
 void RemoteISOBrowseScreen::CreateViews() {
 	auto di = GetI18NCategory(I18NCat::DIALOG);
 	auto ri = GetI18NCategory(I18NCat::REMOTEISO);
@@ -535,9 +520,11 @@ void RemoteISOBrowseScreen::CreateViews() {
 
 	ScrollView *scrollRecentGames = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT));
 	scrollRecentGames->SetTag("RemoteGamesTab");
-	GameBrowser *tabRemoteGames = new RemoteGameBrowser(
-		Path(url_), BrowseFlags::PIN | BrowseFlags::NAVIGATE, &g_Config.bGridView1, screenManager(), "", "",
+	GameBrowser *tabRemoteGames = new GameBrowser(
+		Path(url_), BrowseFlags::NAVIGATE, &g_Config.bGridView1, screenManager(), "", "",
 		new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
+	tabRemoteGames->SetHomePath(Path(url_));
+
 	scrollRecentGames->Add(tabRemoteGames);
 	gameBrowsers_.push_back(tabRemoteGames);
 
@@ -599,13 +586,14 @@ void RemoteISOSettingsScreen::CreateViews() {
 	remoteisoSettings->Add(new ItemHeader(ri->T("Remote disc streaming")));
 	remoteisoSettings->Add(new CheckBox(&g_Config.bRemoteShareOnStartup, ri->T("Share on PPSSPP startup")));
 	remoteisoSettings->Add(new CheckBox(&g_Config.bRemoteISOManual, ri->T("Manual Mode Client", "Manually configure client")));
+	remoteisoSettings->Add(new CheckBox(&g_Config.bRemoteTab, ri->T("Show Remote tab on main screen")));
 
 	UI::Choice *remoteServer;
 	remoteServer = new PopupTextInputChoice(&g_Config.sLastRemoteISOServer, ri->T("Remote Server"), "", 255, screenManager());
 	remoteisoSettings->Add(remoteServer);
 	remoteServer->SetEnabledPtr(&g_Config.bRemoteISOManual);
 
-	PopupSliderChoice *remotePort = remoteisoSettings->Add(new PopupSliderChoice(&g_Config.iLastRemoteISOPort, 0, 65535, 0, ri->T("Remote Port", "Remote Port"), 100, screenManager()));
+	PopupSliderChoice *remotePort = remoteisoSettings->Add(new PopupSliderChoice(&g_Config.iLastRemoteISOPort, 0, 65535, 0, ri->T("Remote Port"), 100, screenManager()));
 	remotePort->SetEnabledPtr(&g_Config.bRemoteISOManual);
 
 	UI::Choice *remoteSubdir;

diff --git a/UI/RemoteISOScreen.h b/UI/RemoteISOScreen.h
@@ -85,7 +85,8 @@ class RemoteISOConnectScreen : public UIDialogScreenWithBackground {
 
 class RemoteISOBrowseScreen : public MainScreen {
 public:
-	RemoteISOBrowseScreen(const std::string &url, const std::vector<Path> &games);
+	RemoteISOBrowseScreen(const std::string &url, const std::vector<Path> &games)
+		: url_(url), games_(games) {}
 
 	const char *tag() const override { return "RemoteISOBrowse"; }
 
@@ -110,3 +111,6 @@ class RemoteISOSettingsScreen : public UIDialogScreenWithBackground {
 
 	bool serverRunning_ = false;
 };
+
+std::string RemoteSubdir();
+std::string FormatRemoteISOUrl(const char *host, int port, const char *subdir);
diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini
@@ -1058,6 +1058,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = ‎إعدادات
 Share Games (Server) = ‎مشاركة الألعاب (السرفر)
 Share on PPSSPP startup = Share on PPSSPP startup
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = ‎توقف عن المشاركة
 Stopping.. = ‎يتوقف...
 

diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Settings
 Share Games (Server) = Share games (server)
 Share on PPSSPP startup = Share on PPSSPP startup
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Stop sharing
 Stopping.. = Stopping...
 

diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Settings
 Share Games (Server) = Share games (server)
 Share on PPSSPP startup = Share on PPSSPP startup
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Stop sharing
 Stopping.. = Stopping...
 

diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Settings
 Share Games (Server) = Share games (server)
 Share on PPSSPP startup = Share on PPSSPP startup
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Stop sharing
 Stopping.. = Stopping...
 

diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Settings
 Share Games (Server) = Share games (server)
 Share on PPSSPP startup = Share on PPSSPP startup
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Stop sharing
 Stopping.. = Stopping...
 

diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Settings
 Share Games (Server) = Share games (server)
 Share on PPSSPP startup = Share on PPSSPP startup
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Stop sharing
 Stopping.. = Stopping...
 

diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Einstellungen
 Share Games (Server) = Spiele freigeben (Server)
 Share on PPSSPP startup = Beim Start von PPSSPP freigeben
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Freigabe stoppen
 Stopping.. = Stoppe...
 

diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Settings
 Share Games (Server) = Share games (server)
 Share on PPSSPP startup = Share on PPSSPP startup
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Stop sharing
 Stopping.. = Stopping...
 

diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini
@@ -1074,6 +1074,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Settings
 Share Games (Server) = Share games (server)
 Share on PPSSPP startup = Share on PPSSPP startup
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Stop sharing
 Stopping.. = Stopping...
 

diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini
@@ -1051,6 +1051,7 @@ RemoteISOWinFirewall = AVISO: Firewall de Windows está bloqueando el acceso
 Settings = Ajustes
 Share Games (Server) = Compartir juegos (servidor)
 Share on PPSSPP startup = Compartir al iniciar PPSSPP
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Parar de compartir
 Stopping.. = Parando...
 

diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini
@@ -1052,6 +1052,7 @@ RemoteISOWinFirewall = ADVERTENCIA: cortafuegos de Windows está bloqueando el a
 Settings = Opciones
 Share Games (Server) = Compartir juegos (servidor)
 Share on PPSSPP startup = Compartir al empezar PSSPP
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Parar
 Stopping.. = Deteniendo...
 

diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Settings
 Share Games (Server) = Share games (server)
 Share on PPSSPP startup = Share on PPSSPP startup
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Stop sharing
 Stopping.. = Stopping...
 

diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = VAROITUS: Windowsin palomuuri estää jakamisen
 Settings = Asetukset
 Share Games (Server) = Jaa pelejä (palvelin)
 Share on PPSSPP startup = Jaa käynnistyksen yhteydessä
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Lopeta jakaminen
 Stopping.. = Lopetetaan...
 

diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini
@@ -1041,6 +1041,7 @@ RemoteISOWinFirewall = AVERTISSEMENT : Le pare-feu Windows bloque le partage.
 Settings = Paramètres
 Share Games (Server) = Partager les jeux (serveur)
 Share on PPSSPP startup = Partager au démarrage de PPSSPP
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Arrêter le partage
 Stopping.. = Arrêt en cours...
 

diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Settings
 Share Games (Server) = Share games (server)
 Share on PPSSPP startup = Share on PPSSPP startup
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Stop sharing
 Stopping.. = Stopping...
 

diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Ρυθμίσεις
 Share Games (Server) = Διαμοιρασμός παιχνιδιών (διακομιστής)
 Share on PPSSPP startup = Διαμοιρασμός κατά την εκκίνηση PPSSPP
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Διακοπή διαμοιρασμού
 Stopping.. = Διακοπή...
 

diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Settings
 Share Games (Server) = Share games (server)
 Share on PPSSPP startup = Share on PPSSPP startup
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Stop sharing
 Stopping.. = Stopping...
 

diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Settings
 Share Games (Server) = Share games (server)
 Share on PPSSPP startup = Share on PPSSPP startup
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Stop sharing
 Stopping.. = Stopping...
 

diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Vatrozid blokira dijeljenje
 Settings = Postavke
 Share Games (Server) = Dijeli igre (server)
 Share on PPSSPP startup = Dijeli kada se PPSSPP upali
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Zaustavi dijeljenje
 Stopping.. = Zaustavljanje...
 

diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = WARNING: Windows Firewall is blocking sharing
 Settings = Beállítások
 Share Games (Server) = Játékok megosztása (szerver)
 Share on PPSSPP startup = Játékok megosztása a PPSSPP indulásakor
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Megosztás leállítása
 Stopping.. = Leállítás alatt...
 

diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini
@@ -1050,6 +1050,7 @@ RemoteISOWinFirewall = Peringatan: Windows firewall memblokir berbagi
 Settings = Pengaturan
 Share Games (Server) = Bagikan permainan (pelayan)
 Share on PPSSPP startup = Bagikan saat memulai PPSSPP
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Hentikan pembagian
 Stopping.. = Menghentikan...
 

diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini
@@ -1051,6 +1051,7 @@ RemoteISOWinFirewall = ATTENZIONE: Il firewall di Windows sta bloccando la condi
 Settings = Impostazioni
 Share Games (Server) = Giochi condivisi (server)
 Share on PPSSPP startup = Condividi all'avvio di PPSSPP
+Show Remote tab on main screen = Show Remote tab on main screen
 Stop Sharing = Interrompi condivisione
 Stopping.. = Interruzione in corso...