g_X11Display is unused

This commit is contained in:
Glenn Maynard
2005-11-13 19:09:13 +00:00
parent 0ab285b40a
commit 7828dd60ad
3 changed files with 0 additions and 33 deletions
-10
View File
@@ -286,16 +286,6 @@ static void TurnOffHardwareVBO()
} }
} }
#if defined(UNIX)
#define Font X11___Font
#define Screen X11___Screen
#include "GL/glx.h"
#undef Font
#undef Screen
Display *g_X11Display = NULL;
#endif
RageDisplay_OGL::RageDisplay_OGL() RageDisplay_OGL::RageDisplay_OGL()
{ {
LOG->Trace( "RageDisplay_OGL::RageDisplay_OGL()" ); LOG->Trace( "RageDisplay_OGL::RageDisplay_OGL()" );
@@ -6,11 +6,6 @@
#include "StepMania.h" #include "StepMania.h"
#include "GameLoop.h" #include "GameLoop.h"
#if defined(UNIX)
#include <X11/Xlib.h>
extern Display *g_X11Display;
#endif
#if defined(MACOSX) #if defined(MACOSX)
extern "C" extern "C"
{ {
@@ -154,18 +149,6 @@ CString LowLevelWindow_SDL::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut
LOG->Info( "SDL version: %i.%i.%i", ver->major, ver->minor, ver->patch ); LOG->Info( "SDL version: %i.%i.%i", ver->major, ver->minor, ver->patch );
} }
#if defined(unix)
{
SDL_SysWMinfo info;
SDL_VERSION(&info.version);
g_X11Display = NULL;
if ( SDL_GetWMInfo(&info) < 0 )
LOG->Warn("SDL_GetWMInfo failed: %s", SDL_GetError());
else
g_X11Display = info.info.x11.display;
}
#endif
#if defined(MACOSX) #if defined(MACOSX)
if (p.windowed) if (p.windowed)
SetupWindow(); SetupWindow();
@@ -15,17 +15,11 @@
#include <X11/extensions/XTest.h> #include <X11/extensions/XTest.h>
#endif #endif
extern Display *g_X11Display;
LowLevelWindow_X11::LowLevelWindow_X11() LowLevelWindow_X11::LowLevelWindow_X11()
{ {
m_bWindowIsOpen = false; m_bWindowIsOpen = false;
g_X11Display = NULL;
if( !X11Helper::Go() ) if( !X11Helper::Go() )
{
RageException::Throw( "Failed to establish a connection with the X server." ); RageException::Throw( "Failed to establish a connection with the X server." );
}
g_X11Display = X11Helper::Dpy;
const int iScreen = DefaultScreen( X11Helper::Dpy ); const int iScreen = DefaultScreen( X11Helper::Dpy );