From e34d4abfee443d3c679e72bac630a169662f3ffe Mon Sep 17 00:00:00 2001
From: Sonicadvance1 <sonicadvance1@gmail.com>
Date: Fri, 8 Aug 2008 08:08:12 +0000
Subject: [PATCH] GL plugin now Updates it's title bar in Linux. No gui also
 works, change it in SConscript in Linux if you want to use that one instead

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@148 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 SConstruct                                    |  2 +
 Source/Core/DolphinWX/src/BootManager.cpp     |  4 +-
 Source/Core/DolphinWX/src/MainNoGUI.cpp       | 57 ++++++++++++++++---
 Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp | 10 +++-
 4 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/SConstruct b/SConstruct
index bce187fa12..d5234126e1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -47,8 +47,10 @@ else:
         "Source/Core/DebuggerWX/src",
         "Source/Core/VideoCommon/Src",
         "Source/Plugins/Plugin_VideoOGL/Src",
+#        "Source/Plugins/Plugin_VideoDX9/Src",
 		"Source/Plugins/Plugin_DSP_NULL/Src",
 #		"Source/Plugins/Plugin_DSP_LLE/Src",
+        "Source/Plugins/PluginDiscIO_ZIP/Src",
 		"Source/Plugins/Plugin_PadSimple/Src",
 		"Source/Plugins/Plugin_nJoy_SDL/Src",
         "Source/Core/DolphinWX/src",
diff --git a/Source/Core/DolphinWX/src/BootManager.cpp b/Source/Core/DolphinWX/src/BootManager.cpp
index fcd25ae564..727f053321 100644
--- a/Source/Core/DolphinWX/src/BootManager.cpp
+++ b/Source/Core/DolphinWX/src/BootManager.cpp
@@ -77,8 +77,8 @@ bool BootCore(const std::string& _rFilename)
 		ini.Get("Core", "UseDualCore", &StartUp.bUseDualCore, StartUp.bUseDualCore);
 		ini.Get("Core", "OptimizeQuantizers", &StartUp.bOptimizeQuantizers, StartUp.bOptimizeQuantizers);
 	}
-
-	StartUp.hMainWindow = main_frame->GetRenderHandle();
+	if(main_frame)
+		StartUp.hMainWindow = main_frame->GetRenderHandle();
 
 	// init the core
 	if (!Core::Init(StartUp))
diff --git a/Source/Core/DolphinWX/src/MainNoGUI.cpp b/Source/Core/DolphinWX/src/MainNoGUI.cpp
index e6c971d630..3822785fb6 100644
--- a/Source/Core/DolphinWX/src/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/src/MainNoGUI.cpp
@@ -10,6 +10,51 @@
 #include "ISOFile.h"
 
 #include "BootManager.h"
+void* g_pCodeWindow = NULL;
+void* main_frame = NULL;
+bool wxPanicAlert(const char* text, bool /*yes_no*/)
+{
+	return(true);
+}
+
+
+void Host_BootingStarted(){}
+
+
+void Host_BootingEnded(){}
+
+
+// OK, this thread boundary is DANGEROUS on linux
+// wxPostEvent / wxAddPendingEvent is the solution.
+void Host_NotifyMapLoaded(){}
+
+
+void Host_UpdateLogDisplay(){}
+
+
+void Host_UpdateDisasmDialog(){}
+
+
+void Host_UpdateMainFrame(){}
+
+void Host_UpdateBreakPointView(){}
+
+
+void Host_UpdateMemoryView(){}
+
+
+void Host_SetDebugMode(bool){}
+
+
+void Host_SetWaitCursor(bool enable){}
+
+
+void Host_CreateDisplay(){}
+
+
+void Host_CloseDisplay(){}
+
+void Host_UpdateStatusBar(const char* _pText){}
 
 int main(int argc, const char* argv[])
 {
@@ -18,16 +63,10 @@ int main(int argc, const char* argv[])
 		puts("Please supply at least one argument - the ISO to boot.\n");
 		return(1);
 	}
+	std::string temp;
+	temp.insert(0, argv[1]); //Need to convert to C++ style string first
 
-	CISOFile iso(argv[1]);
-
-	if (!iso.IsValid())
-	{
-		printf("The ISO %s is not a valid Gamecube or Wii ISO.", argv[1]);
-		return(1);
-	}
-
-	BootManager::BootCore(iso);
+	BootManager::BootCore(temp);
 	usleep(2000 * 1000 * 1000);
 //	while (!getch()) {
 	//	usleep(20);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
index 3cb1e8b74f..1a76157fd0 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
@@ -55,7 +55,11 @@ void OpenGL_SetWindowText(const char *text)
 #ifdef _WIN32
     SetWindowText(EmuWindow::GetWnd(), text);
 #else
-	// TODO
+    /**
+    * Tell X to ask the window manager to set the window title. (X
+    * itself doesn't provide window title functionality.)
+    */
+    XStoreName(GLWin.dpy, GLWin.win, text); 
 #endif
 }
 
@@ -89,7 +93,9 @@ void UpdateFPSDisplay(const char *text)
     SetWindowText(EmuWindow::GetWnd(), temp);
     OpenGL_SetWindowText(temp);
 #else
-    //TODO
+    char temp[512];
+    sprintf(temp, "SVN %s: %s", "Linux", text); //TODO: Set to svn rev //
+    OpenGL_SetWindowText(temp);
 #endif
 }