piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@148 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1 2008-08-08 08:08:12 +00:00
parent b370386983
commit e34d4abfee
4 changed files with 60 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -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",

4
Source/Core/DolphinWX/src/BootManager.cpp
View File

@ -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))

57
Source/Core/DolphinWX/src/MainNoGUI.cpp
View File

@ -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);

10
Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
View File

@ -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
}