From 7828dd60adc77af25e15b900d9429903f4142164 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 13 Nov 2005 19:09:13 +0000
Subject: [PATCH] g_X11Display is unused

---
 stepmania/src/RageDisplay_OGL.cpp               | 10 ----------
 .../arch/LowLevelWindow/LowLevelWindow_SDL.cpp  | 17 -----------------
 .../arch/LowLevelWindow/LowLevelWindow_X11.cpp  |  6 ------
 3 files changed, 33 deletions(-)

diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp
index bc59076080..5502392350 100644
--- a/stepmania/src/RageDisplay_OGL.cpp
+++ b/stepmania/src/RageDisplay_OGL.cpp
@@ -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()
 {
 	LOG->Trace( "RageDisplay_OGL::RageDisplay_OGL()" );
diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp
index 13cf582829..b71e3920c7 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp
@@ -6,11 +6,6 @@
 #include "StepMania.h"
 #include "GameLoop.h"
 
-#if defined(UNIX)
-#include <X11/Xlib.h>
-
-extern Display *g_X11Display;
-#endif
 #if defined(MACOSX)
 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 );
 	}
 
-#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 (p.windowed)
 		SetupWindow();
diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
index cd9102cabf..b4caa043bd 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
@@ -15,17 +15,11 @@
 #include <X11/extensions/XTest.h>
 #endif
 
-extern Display *g_X11Display;
-
 LowLevelWindow_X11::LowLevelWindow_X11()
 {
 	m_bWindowIsOpen = false;
-	g_X11Display = NULL;
 	if( !X11Helper::Go() )
-	{
 		RageException::Throw( "Failed to establish a connection with the X server." );
-	}
-	g_X11Display = X11Helper::Dpy;
 
 	const int iScreen = DefaultScreen( X11Helper::Dpy );