Merge pull request #19996 from hrydgard/confirm-on-exit

Add confirmation on exit

Author: hrydgard

Common/Data/Text/Parsers.cpp

@@ -3,6 +3,7 @@
 #include <string>
 
 #include "Common/Data/Text/Parsers.h"
+#include "Common/Data/Text/I18n.h"
 #include "Common/StringUtils.h"
 
 // Not strictly a parser...
@@ -29,6 +30,19 @@ std::string NiceSizeFormat(uint64_t size) {
 	return std::string(buffer);
 }
 
+std::string NiceTimeFormat(int seconds) {
+	auto di = GetI18NCategory(I18NCat::DIALOG);
+	if (seconds < 60) {
+		return StringFromFormat("%d seconds", seconds);
+	} else if (seconds < 60 * 60) {
+		int minutes = seconds / 60;
+		return StringFromFormat("%d minutes", minutes);
+	} else {
+		int hours = seconds / 3600;
+		return StringFromFormat("%d hours", hours);
+	}
+}
+
 bool Version::ParseVersionString(std::string str) {
 	if (str.empty())
 		return false;

Common/Data/Text/Parsers.h

@@ -74,3 +74,7 @@ static bool TryParse(const std::string &str, N *const output) {
 void NiceSizeFormat(uint64_t size, char *out, size_t bufSize);
 
 std::string NiceSizeFormat(uint64_t size);
+
+// seconds, or minutes, or hours.
+// Uses I18N strings.
+std::string NiceTimeFormat(int seconds);

Core/Config.cpp

@@ -300,6 +300,7 @@ static const ConfigSetting generalSettings[] = {
 	ConfigSetting("RemoteTab", &g_Config.bRemoteTab, false, CfgFlag::DEFAULT),
 	ConfigSetting("RemoteISOSharedDir", &g_Config.sRemoteISOSharedDir, "", CfgFlag::DEFAULT),
 	ConfigSetting("RemoteISOShareType", &g_Config.iRemoteISOShareType, (int)RemoteISOShareType::RECENT, CfgFlag::DEFAULT),
+	ConfigSetting("AskForExitConfirmationAfterSeconds", &g_Config.iAskForExitConfirmationAfterSeconds, 60, CfgFlag::PER_GAME),
 
 #ifdef __ANDROID__
 	ConfigSetting("ScreenRotation", &g_Config.iScreenRotation, ROTATION_AUTO_HORIZONTAL),

Core/Config.h

@@ -137,6 +137,7 @@ struct Config {
 	bool bMemStickInserted;
 	int iMemStickSizeGB;
 	bool bLoadPlugins;
+	int iAskForExitConfirmationAfterSeconds;
 
 	int iScreenRotation;  // The rotation angle of the PPSSPP UI. Only supported on Android and possibly other mobile platforms.
 	int iInternalScreenRotation;  // The internal screen rotation angle. Useful for vertical SHMUPs and similar.

Core/Dialog/PSPSaveDialog.cpp

@@ -29,6 +29,7 @@
 #include "Core/Dialog/PSPSaveDialog.h"
 #include "Core/FileSystems/MetaFileSystem.h"
 #include "Core/Util/PPGeDraw.h"
+#include "Common/TimeUtil.h"
 #include "Core/HLE/sceCtrl.h"
 #include "Core/HLE/sceUtility.h"
 #include "Core/HLE/ErrorCodes.h"
@@ -38,6 +39,20 @@
 #include "Core/Reporting.h"
 #include "Core/SaveState.h"
 
+static double g_lastSaveTime = -1.0;
+
+void ResetSecondsSinceLastGameSave() {
+	g_lastSaveTime = time_now_d();
+}
+
+double SecondsSinceLastGameSave() {
+	if (g_lastSaveTime < 0) {
+		return -1.0;
+	} else {
+		return time_now_d() - g_lastSaveTime;
+	}
+}
+
 const static float FONT_SCALE = 0.55f;
 
 // These are rough, it seems to take at least 100ms or so to init, and shutdown depends on threads.
@@ -85,8 +100,7 @@ PSPSaveDialog::~PSPSaveDialog() {
 	JoinIOThread();
 }
 
-int PSPSaveDialog::Init(int paramAddr)
-{
+int PSPSaveDialog::Init(int paramAddr) {
 	// Ignore if already running
 	if (GetStatus() != SCE_UTILITY_STATUS_NONE) {
 		ERROR_LOG_REPORT(Log::sceUtility, "A save request is already running, not starting a new one");
@@ -1068,6 +1082,7 @@ void PSPSaveDialog::ExecuteIOAction() {
 		result = param.Load(param.GetPspParam(), GetSelectedSaveDirName(), currentSelectedSave);
 		if (result == 0) {
 			display = DS_LOAD_DONE;
+			g_lastSaveTime = time_now_d();
 		} else {
 			display = DS_LOAD_FAILED;
 		}
@@ -1076,6 +1091,7 @@ void PSPSaveDialog::ExecuteIOAction() {
 		SaveState::NotifySaveData();
 		if (param.Save(param.GetPspParam(), GetSelectedSaveDirName()) == 0) {
 			display = DS_SAVE_DONE;
+			g_lastSaveTime = time_now_d();
 		} else {
 			display = DS_SAVE_FAILED;
 		}

Core/Dialog/PSPSaveDialog.h

@@ -104,6 +104,8 @@ class PSPSaveDialog : public PSPDialog {
 
 	std::thread *ioThread = nullptr;
 	std::mutex paramLock;
-	volatile SaveIOStatus ioThreadStatus;
+	volatile SaveIOStatus ioThreadStatus = SAVEIO_NONE;
 };
 
+void ResetSecondsSinceLastGameSave();
+double SecondsSinceLastGameSave();

Core/HLE/sceUtility.cpp

@@ -227,6 +227,8 @@ void __UtilityInit() {
 	SavedataParam::Init();
 	currentlyLoadedModules.clear();
 	volatileUnlockEvent = CoreTiming::RegisterEvent("UtilityVolatileUnlock", UtilityVolatileUnlock);
+
+	ResetSecondsSinceLastGameSave();
 }
 
 void __UtilityDoState(PointerWrap &p) {

Core/SaveState.cpp

@@ -60,8 +60,10 @@
 // Slot number is visual only, -2 will display special message
 constexpr int LOAD_UNDO_SLOT = -2;
 
-namespace SaveState
-{
+namespace SaveState {
+
+double g_lastSaveTime = -1.0;
+
 	struct SaveStart
 	{
 		void DoState(PointerWrap &p);
@@ -76,13 +78,10 @@ namespace SaveState
 		SAVESTATE_SAVE_SCREENSHOT,
 	};
 
-	struct Operation
-	{
+	struct Operation {
 		// The slot number is for visual purposes only. Set to -1 for operations where we don't display a message for example.
 		Operation(OperationType t, const Path &f, int slot_, Callback cb, void *cbUserData_)
-			: type(t), filename(f), callback(cb), slot(slot_), cbUserData(cbUserData_)
-		{
-		}
+			: type(t), filename(f), callback(cb), slot(slot_), cbUserData(cbUserData_) {}
 
 		OperationType type;
 		Path filename;
@@ -1005,6 +1004,7 @@ namespace SaveState
 						}
 					}
 #endif
+					g_lastSaveTime = time_now_d();
 				} else if (result == CChunkFileReader::ERROR_BROKEN_STATE) {
 					HandleLoadFailure(false);
 					callbackMessage = std::string(i18nLoadFailure) + ": " + errorString;
@@ -1040,6 +1040,7 @@ namespace SaveState
 						}
 					}
 #endif
+					g_lastSaveTime = time_now_d();
 				} else if (result == CChunkFileReader::ERROR_BROKEN_STATE) {
 					// TODO: What else might we want to do here? This should be very unusual.
 					callbackMessage = i18nSaveFailure;
@@ -1155,11 +1156,21 @@ namespace SaveState
 		saveDataGeneration = 0;
 		lastSaveDataGeneration = 0;
 		saveStateInitialGitVersion.clear();
+
+		g_lastSaveTime = time_now_d();
 	}
 
 	void Shutdown()
 	{
 		std::lock_guard<std::mutex> guard(mutex);
 		rewindStates.Clear();
 	}
+
+	double SecondsSinceLastSavestate() {
+		if (g_lastSaveTime < 0) {
+			return -1.0;
+		} else {
+			return time_now_d() - g_lastSaveTime;
+		}
+	}
 }

Core/SaveState.h

@@ -25,8 +25,7 @@
 #include "Common/File/Path.h"
 #include "Common/Serialize/Serializer.h"
 
-namespace SaveState
-{
+namespace SaveState {
 	enum class Status {
 		FAILURE,
 		WARNING,
@@ -111,4 +110,7 @@ namespace SaveState
 
 	// Cleanup by triggering a restart if needed.
 	void Cleanup();
-};
+
+	// Returns the time since last save. -1 if N/A.
+	double SecondsSinceLastSavestate();
+}  // namespace SaveState

UI/GameSettingsScreen.cpp

@@ -1300,6 +1300,9 @@ void GameSettingsScreen::CreateSystemSettings(UI::ViewGroup *systemSettings) {
 
 	systemSettings->Add(new ItemHeader(sy->T("General")));
 
+	PopupSliderChoice *exitConfirmation = systemSettings->Add(new PopupSliderChoice(&g_Config.iAskForExitConfirmationAfterSeconds, 0, 1200, 60, sy->T("Ask for exit confirmation after seconds"), screenManager(), "s"));
+	exitConfirmation->SetZeroLabel(sy->T("Off"));
+
 #if PPSSPP_PLATFORM(ANDROID)
 	if (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_MOBILE) {
 		auto co = GetI18NCategory(I18NCat::CONTROLS);