Merge pull request #5152 from unknownbrackets/ui-tweaks

Show the Windows open dialog on a separate thread

Windows/W32Util/ShellUtil.cpp

@@ -3,6 +3,8 @@
 #include "stdafx.h"
 #include "shlobj.h"
 
+#include "base/functional.h"
+#include "thread/thread.h"
 #include "util/text/utf8.h"
 #include "ShellUtil.h"
 #include "CommDlg.h"
@@ -15,11 +17,15 @@ namespace W32Util
 	std::string BrowseForFolder(HWND parent, const char *title)
 	{
 		std::wstring titleString = ConvertUTF8ToWString(title);
+		return BrowseForFolder(parent, titleString.c_str());
+	}
 
+	std::string BrowseForFolder(HWND parent, const wchar_t *title)
+	{
 		BROWSEINFO info;
 		memset(&info,0,sizeof(info));
 		info.hwndOwner = parent;
-		info.lpszTitle = titleString.c_str();
+		info.lpszTitle = title;
 		info.ulFlags = BIF_EDITBOX | BIF_RETURNONLYFSDIRS | BIF_USENEWUI;
 
 		//info.pszDisplayName
@@ -119,4 +125,39 @@ namespace W32Util
 		else
 			return std::vector<std::string>(); // empty vector;
 	}
+
+	AsyncBrowseDialog::AsyncBrowseDialog(HWND parent, UINT completeMsg, std::wstring title)
+		: type_(DIR), parent_(parent), completeMsg_(completeMsg), title_(title), complete_(false) {
+		thread_ = new std::thread(std::bind(&AsyncBrowseDialog::Execute, this));
+		thread_->detach();
+	}
+
+	AsyncBrowseDialog::AsyncBrowseDialog(Type type, HWND parent, UINT completeMsg, std::wstring title, std::wstring initialFolder, std::wstring filter, std::wstring extension)
+		: type_(type), parent_(parent), completeMsg_(completeMsg), title_(title), initialFolder_(initialFolder), filter_(filter), extension_(extension), complete_(false) {
+		thread_ = new std::thread(std::bind(&AsyncBrowseDialog::Execute, this));
+		thread_->detach();
+	}
+
+	bool AsyncBrowseDialog::GetResult(std::string &filename) {
+		filename = filename_;
+		return result_;
+	}
+
+	void AsyncBrowseDialog::Execute() {
+		switch (type_) {
+		case DIR:
+			filename_ = BrowseForFolder(parent_, title_.c_str());
+			result_ = filename_ != "";
+			complete_ = true;
+			break;
+
+		case OPEN:
+		case SAVE:
+			result_ = BrowseForFileName(type_ == OPEN, parent_, title_.c_str(), initialFolder_.size() ? initialFolder_.c_str() : 0, filter_.c_str(), extension_.c_str(), filename_);
+			complete_ = true;
+			break;
+		}
+
+		PostMessage(parent_, completeMsg_, 0, 0);
+	}
 }

Windows/W32Util/ShellUtil.h

@@ -2,14 +2,50 @@
 
 #include <string>
 #include <vector>
+#include "thread/thread.h"
 
 
 namespace W32Util
 {
 	std::string BrowseForFolder(HWND parent, const char *title);
+	std::string BrowseForFolder(HWND parent, const wchar_t *title);
 	bool BrowseForFileName (bool _bLoad, HWND _hParent, const wchar_t*_pTitle,
 		const wchar_t *_pInitialFolder,const wchar_t *_pFilter,const wchar_t*_pExtension, 
 		std::string& _strFileName);
 	std::vector<std::string> BrowseForFileNameMultiSelect(bool _bLoad, HWND _hParent, const wchar_t*_pTitle,
 		const wchar_t*_pInitialFolder,const wchar_t*_pFilter,const wchar_t*_pExtension);
+
+	struct AsyncBrowseDialog {
+	public:
+		enum Type {
+			OPEN,
+			SAVE,
+			DIR,
+		};
+
+		// For a directory.
+		AsyncBrowseDialog(HWND parent, UINT completeMsg, std::wstring title);
+		// For a file (OPEN or SAVE.)
+		AsyncBrowseDialog(Type type, HWND parent, UINT completeMsg, std::wstring title, std::wstring initialFolder, std::wstring filter, std::wstring extension);
+
+		bool GetResult(std::string &filename);
+		Type GetType() {
+			return type_;
+		}
+
+	private:
+		void Execute();
+
+		std::thread *thread_;
+		Type type_;
+		HWND parent_;
+		UINT completeMsg_;
+		std::wstring title_;
+		std::wstring initialFolder_;
+		std::wstring filter_;
+		std::wstring extension_;
+		bool complete_;
+		bool result_;
+		std::string filename_;
+	};
 }

Windows/WndMainWindow.cpp

@@ -126,6 +126,8 @@ namespace MainWindow
 	static std::map<int, std::string> initialMenuKeys;
 	static std::vector<std::string> countryCodes;
 	static std::vector<std::string> availableShaders;
+	static W32Util::AsyncBrowseDialog *browseDialog;
+	static bool browsePauseAfter;
 #define MAX_LOADSTRING 100
 	const TCHAR *szTitle = TEXT("PPSSPP");
 	const TCHAR *szWindowClass = TEXT("PPSSPPWnd");
@@ -809,59 +811,58 @@ namespace MainWindow
 	}
 
 	void BrowseAndBoot(std::string defaultPath, bool browseDirectory) {
-		std::string fn;
-		std::string filter = "All supported file types (*.iso *.cso *.pbp *.elf *.prx *.zip)|*.pbp;*.elf;*.iso;*.cso;*.prx;*.zip|PSP ROMs (*.iso *.cso *.pbp *.elf *.prx)|*.pbp;*.elf;*.iso;*.cso;*.prx|Homebrew/Demos installers (*.zip)|*.zip|All files (*.*)|*.*||";
-		
-		for (int i=0; i<(int)filter.length(); i++) {
+		static std::wstring filter = L"All supported file types (*.iso *.cso *.pbp *.elf *.prx *.zip)|*.pbp;*.elf;*.iso;*.cso;*.prx;*.zip|PSP ROMs (*.iso *.cso *.pbp *.elf *.prx)|*.pbp;*.elf;*.iso;*.cso;*.prx|Homebrew/Demos installers (*.zip)|*.zip|All files (*.*)|*.*||";
+		for (int i = 0; i < (int)filter.length(); i++) {
 			if (filter[i] == '|')
 				filter[i] = '\0';
 		}
 
-		// Pause if a game is being played.
-		bool isPaused = false;
+		browsePauseAfter = false;
 		if (globalUIState == UISTATE_INGAME) {
-			isPaused = Core_IsStepping();
-			if (!isPaused)
+			browsePauseAfter = Core_IsStepping();
+			if (!browsePauseAfter)
 				Core_EnableStepping(true);
 		}
 
+		W32Util::MakeTopMost(GetHWND(), false);
 		if (browseDirectory) {
-			std::string dir = W32Util::BrowseForFolder(GetHWND(), "Choose directory");
-			if (dir == "") {
-				if (!isPaused)
-					Core_EnableStepping(false);
-			}
-			else {
-				if (globalUIState == UISTATE_INGAME || globalUIState == UISTATE_PAUSEMENU) {
-					Core_EnableStepping(false);
-				}
-				
-				dir = ReplaceAll(dir, "\\", "/");
-				NativeMessageReceived("boot", dir.c_str());
-			}
+			browseDialog = new W32Util::AsyncBrowseDialog(GetHWND(), WM_USER_BROWSE_BOOT_DONE, L"Choose directory");
+		} else {
+			browseDialog = new W32Util::AsyncBrowseDialog(W32Util::AsyncBrowseDialog::OPEN, GetHWND(), WM_USER_BROWSE_BOOT_DONE, L"LoadFile", ConvertUTF8ToWString(defaultPath), filter, L"*.pbp;*.elf;*.iso;*.cso;");
 		}
-		else if (W32Util::BrowseForFileName(true, GetHWND(), L"Load File", defaultPath.size() ? ConvertUTF8ToWString(defaultPath).c_str() : 0, ConvertUTF8ToWString(filter).c_str(), L"*.pbp;*.elf;*.iso;*.cso;",fn))
-		{
+	}
+
+	void BrowseAndBootDone() {
+		std::string filename;
+		if (!browseDialog->GetResult(filename)) {
+			if (!browsePauseAfter) {
+				Core_EnableStepping(false);
+			}
+		} else {
 			if (globalUIState == UISTATE_INGAME || globalUIState == UISTATE_PAUSEMENU) {
 				Core_EnableStepping(false);
 			}
 
-			// Decode the filename with fullpath.
-			std::string fullpath = fn;
-			char drive[MAX_PATH];
-			char dir[MAX_PATH];
-			char fname[MAX_PATH];
-			char ext[MAX_PATH];
-			_splitpath(fullpath.c_str(), drive, dir, fname, ext);
+			// TODO: What is this for / what does it fix?
+			if (browseDialog->GetType() != W32Util::AsyncBrowseDialog::DIR) {
+				// Decode the filename with fullpath.
+				char drive[MAX_PATH];
+				char dir[MAX_PATH];
+				char fname[MAX_PATH];
+				char ext[MAX_PATH];
+				_splitpath(filename.c_str(), drive, dir, fname, ext);
 
-			std::string executable = std::string(drive) + std::string(dir) + std::string(fname) + std::string(ext);
-			executable = ReplaceAll(executable, "\\", "/");
-			NativeMessageReceived("boot", executable.c_str());
-		}
-		else {
-			if (!isPaused)
-				Core_EnableStepping(false);
+				filename = std::string(drive) + std::string(dir) + std::string(fname) + std::string(ext);
+			}
+
+			filename = ReplaceAll(filename, "\\", "/");
+			NativeMessageReceived("boot", filename.c_str());
 		}
+
+		W32Util::MakeTopMost(GetHWND(), g_Config.bTopMost);
+
+		delete browseDialog;
+		browseDialog = 0;
 	}
 
 	void UmdSwitchAction() {
@@ -1574,6 +1575,10 @@ namespace MainWindow
 			UpdateWindowTitle();
 			break;
 
+		case WM_USER_BROWSE_BOOT_DONE:
+			BrowseAndBootDone();
+			break;
+
 		case WM_MENUSELECT:
 			// Unfortunately, accelerate keys (hotkeys) shares the same enabled/disabled states
 			// with corresponding menu items.

Windows/WndMainWindow.h

@@ -12,6 +12,7 @@ namespace MainWindow
 		WM_USER_UPDATE_UI = WM_USER + 101,
 		WM_USER_UPDATE_SCREEN = WM_USER + 102,
 		WM_USER_WINDOW_TITLE_CHANGED = WM_USER + 103,
+		WM_USER_BROWSE_BOOT_DONE = WM_USER + 104,
 	};
 
 	enum {