From 657759c3f41bc321bff7fac586abd51dbbe4562f Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Sat, 23 Jul 2011 09:17:58 +0000
Subject: [PATCH] win32: newer console title format, somewhat more useful. now
 %EXENAME% %ARGS% to show you how you launched it. let me know what you think.
 also let me know if it crashes while trying to parse something!

---
 desmume/src/windows/console.cpp | 66 +++++++++++++++++++++++----------
 1 file changed, 47 insertions(+), 19 deletions(-)

diff --git a/desmume/src/windows/console.cpp b/desmume/src/windows/console.cpp
index e8e9774b9..005dfaf4e 100644
--- a/desmume/src/windows/console.cpp
+++ b/desmume/src/windows/console.cpp
@@ -29,13 +29,45 @@
 HANDLE hConsole = NULL;
 void printlog(const char *fmt, ...);
 
+std::wstring SkipEverythingButProgramInCommandLine(wchar_t* cmdLine)
+{
+	//skip past the program name. can anyone think of a better way to do this?
+	//we could use CommandLineToArgvW (commented out below) but then we would just have to re-assemble and potentially re-quote it
+	//NOTE - this objection predates this use of the code. its not such a bad objection now...
+	wchar_t* childCmdLine = cmdLine;
+	wchar_t* lastSlash = cmdLine;
+	wchar_t* lastGood = cmdLine;
+	bool quote = false;
+	for(;;)
+	{
+		wchar_t cur = *childCmdLine;
+		if(cur == 0) break;
+		childCmdLine++;
+		bool thisIsQuote = (cur == '\"');
+		if(cur == '\\' || cur == '/')
+			lastSlash = childCmdLine;
+		if(quote)
+		{
+			if(thisIsQuote)
+				quote = false;
+			else lastGood = childCmdLine;
+		}
+		else
+		{
+			if(cur == ' ' || cur == '\t')
+				break;
+			if(thisIsQuote)
+				quote = true;
+			lastGood = childCmdLine;
+		}
+	}
+	std::wstring remainder = ((std::wstring)cmdLine).substr(childCmdLine-cmdLine);
+	std::wstring path = ((std::wstring)cmdLine).substr(lastSlash-cmdLine,(lastGood-cmdLine)-(lastSlash-cmdLine));
+	return path + L" " + remainder;
+}
+
 void OpenConsole() 
 {
-	COORD csize = {0};
-	CONSOLE_SCREEN_BUFFER_INFO csbiInfo = {0}; 
-	SMALL_RECT srect = {0};
-	char buf[256] = {0};
-
 	//dont do anything if we're already analyzed
 	if (hConsole) return;
 
@@ -75,9 +107,18 @@ void OpenConsole()
 	if(!attached)
 	{
 		if (!AllocConsole()) return;
+
+		SetConsoleCP(GetACP());
+		SetConsoleOutputCP(GetACP());
 	}
 
-	if (hConsole == INVALID_HANDLE_VALUE) return;
+	//old console title:
+	//char buf[256] = {0};
+	//sprintf(buf,"CONSOLE - %s", EMU_DESMUME_NAME_AND_VERSION());
+	//SetConsoleTitle(TEXT(buf));
+
+	//newer and improved console title:
+	SetConsoleTitleW(SkipEverythingButProgramInCommandLine(GetCommandLineW()).c_str());
 
 	if(shouldRedirectStdout)
 	{
@@ -86,19 +127,6 @@ void OpenConsole()
 		freopen("CONIN$", "r", stdin);
 	}
 
-	sprintf(buf,"%s OUTPUT", EMU_DESMUME_NAME_AND_VERSION());
-	SetConsoleTitle(TEXT(buf));
-	csize.X = 60;
-	csize.Y = 800;
-	SetConsoleScreenBufferSize(hConsole, csize);
-	GetConsoleScreenBufferInfo(hConsole, &csbiInfo);
-	srect = csbiInfo.srWindow;
-	srect.Right = srect.Left + 99;
-	srect.Bottom = srect.Top + 64;
-	SetConsoleWindowInfo(hConsole, TRUE, &srect);
-	SetConsoleCP(GetACP());
-	SetConsoleOutputCP(GetACP());
-	//if(attached) printlog("\n");
 	printlog("%s\n",EMU_DESMUME_NAME_AND_VERSION());
 	printlog("- compiled: %s %s\n",__DATE__,__TIME__);
 	if(attached) printf("\nuse cmd /c desmume.exe to get more sensible console behaviour\n");