Disabled padsimple with gltest.

SDL now doesn't crash


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1641 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-23 14:12:44 +00:00
parent 590adfce53
commit e099bbc3ba
5 changed files with 9 additions and 2 deletions
Source/Plugins
Plugin_PadSimple/Src
Plugin_VideoOGL/Src

View File

@ -189,7 +189,6 @@ void PAD_Initialize(SPADInitialize _PADInitialize)
dinput.Init((HWND)g_PADInitialize.hWnd); dinput.Init((HWND)g_PADInitialize.hWnd);
#elif defined(HAVE_X11) && HAVE_X11 #elif defined(HAVE_X11) && HAVE_X11
GXdsp = (Display*)g_PADInitialize.hWnd; GXdsp = (Display*)g_PADInitialize.hWnd;
XkbSetDetectableAutoRepeat(GXdsp, True, NULL);
#endif #endif
LoadConfig(); LoadConfig();

View File

@ -9,6 +9,10 @@ if not env['HAVE_X11']:
print name + " must have X11 to be build" print name + " must have X11 to be build"
Return() Return()
if env['GLTEST']:
print name + " Doesn't work with testgl"
Return()
files = [ files = [
"PadSimple.cpp", "PadSimple.cpp",
] ]

View File

@ -386,7 +386,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
GLX_DEPTH_SIZE, 24, GLX_DEPTH_SIZE, 24,
GLX_SAMPLE_BUFFERS_ARB, g_Config.iMultisampleMode, GLX_SAMPLES_ARB, 1, None }; GLX_SAMPLE_BUFFERS_ARB, g_Config.iMultisampleMode, GLX_SAMPLES_ARB, 1, None };
GLWin.dpy = XOpenDisplay(0); GLWin.dpy = XOpenDisplay(0);
g_VideoInitialize.pWindowHandle = (HWND)GLWin.dpy; g_VideoInitialize.pWindowHandle = (HWND)GLWin.dpy;
GLWin.screen = DefaultScreen(GLWin.dpy); GLWin.screen = DefaultScreen(GLWin.dpy);
GLWin.fs = g_Config.bFullscreen; //Set to setting in Options GLWin.fs = g_Config.bFullscreen; //Set to setting in Options
@ -417,6 +417,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
vi->visual, AllocNone); vi->visual, AllocNone);
GLWin.attr.colormap = cmap; GLWin.attr.colormap = cmap;
GLWin.attr.border_pixel = 0; GLWin.attr.border_pixel = 0;
XkbSetDetectableAutoRepeat(GLWin.dpy, True, NULL);
#if defined(HAVE_XXF86VM) && HAVE_XXF86VM #if defined(HAVE_XXF86VM) && HAVE_XXF86VM
// get a connection // get a connection

View File

@ -92,6 +92,8 @@ X11Window::X11Window(int _iwidth, int _iheight) {
attr.colormap = cmap; attr.colormap = cmap;
attr.border_pixel = 0; attr.border_pixel = 0;
XkbSetDetectableAutoRepeat(dpy, True, NULL);
// get a connection // get a connection
XF86VidModeQueryVersion(dpy, &vidModeMajorVersion, &vidModeMinorVersion); XF86VidModeQueryVersion(dpy, &vidModeMajorVersion, &vidModeMinorVersion);

View File

@ -11,6 +11,7 @@
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/extensions/xf86vmode.h> #include <X11/extensions/xf86vmode.h>
#include <X11/XKBlib.h>
class X11Window : public GLWindow class X11Window : public GLWindow
{ {