ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No gui fix in linux. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5201 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-03-16 03:34:27 +00:00
parent 172cc24f32
commit 6723a91664
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/Src/MainNoGUI.cpp
View File

@ -32,6 +32,10 @@
#include <sys/param.h> #include <sys/param.h>
#endif #endif
#if defined HAVE_X11 && HAVE_X11
#include <X11/Xlib.h>
#endif
#if defined(HAVE_COCOA) && HAVE_COCOA #if defined(HAVE_COCOA) && HAVE_COCOA
#import "cocoaApp.h" #import "cocoaApp.h"
#endif #endif
@ -228,6 +232,10 @@ int main(int argc, char* argv[])
CPluginManager::GetInstance().ScanForPlugins(); CPluginManager::GetInstance().ScanForPlugins();
#if defined HAVE_X11 && HAVE_X11
XInitThreads();
#endif
if (BootManager::BootCore(bootFile)) //no use running the loop when booting fails if (BootManager::BootCore(bootFile)) //no use running the loop when booting fails
{ {
while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)

22
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -189,6 +189,18 @@ void CreateXWindow (void)
#if defined(HAVE_GTK2) && HAVE_GTK2 && defined(wxGTK) #if defined(HAVE_GTK2) && HAVE_GTK2 && defined(wxGTK)
wxMutexGuiLeave(); wxMutexGuiLeave();
#endif #endif
if (g_Config.bHideCursor)
{
// make a blank cursor
Pixmap Blank;
XColor DummyColor;
char ZeroData[1] = {0};
Blank = XCreateBitmapFromData (GLWin.dpy, GLWin.win, ZeroData, 1, 1);
GLWin.blankCursor = XCreatePixmapCursor(GLWin.dpy, Blank, Blank, &DummyColor, &DummyColor, 0, 0);
XFreePixmap (GLWin.dpy, Blank);
}
GLWin.xEventThread = new Common::Thread(XEventThread, NULL); GLWin.xEventThread = new Common::Thread(XEventThread, NULL);
} }
@ -659,16 +671,6 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
CreateXWindow(); CreateXWindow();
g_VideoInitialize.pXWindow = (Window *) &GLWin.win; g_VideoInitialize.pXWindow = (Window *) &GLWin.win;
if (g_Config.bHideCursor)
{
// make a blank cursor
Pixmap Blank;
XColor DummyColor;
char ZeroData[1] = {0};
Blank = XCreateBitmapFromData (GLWin.dpy, GLWin.win, ZeroData, 1, 1);
GLWin.blankCursor = XCreatePixmapCursor(GLWin.dpy, Blank, Blank, &DummyColor, &DummyColor, 0, 0);
XFreePixmap (GLWin.dpy, Blank);
}
#endif #endif
return true; return true;
} }