From 1a67cca3451724650bbb97d42c6d1cb4b515ee32 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 25 Feb 2006 21:05:19 +0000 Subject: [PATCH] If we have a window, g_pContext is set; if not, it's NULL. Avoid redundantly tracking state, when it can be clearly derived from other state; it introduces ways that the class might be in an inconsistent state and adds bookkeeping. --- stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp | 5 +---- stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp index 06393b7ea1..d0c2f154a2 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp @@ -27,7 +27,6 @@ static Window g_AltWindow = 0; static LocalizedString FAILED_CONNECTION_XSERVER( "LowLevelWindow_X11", "Failed to establish a connection with the X server'" ); LowLevelWindow_X11::LowLevelWindow_X11() { - m_bWindowIsOpen = false; if( !X11Helper::Go() ) RageException::Throw( FAILED_CONNECTION_XSERVER.GetValue() ); @@ -95,7 +94,7 @@ RString LowLevelWindow_X11::TryVideoMode( const VideoModeParams &p, bool &bNewDe hints.base_width = p.width; hints.base_height = p.height; - if( !m_bWindowIsOpen || p.bpp != CurrentParams.bpp || ( m_bWasWindowed != p.windowed ) ) + if( g_pContext == NULL || p.bpp != CurrentParams.bpp || m_bWasWindowed != p.windowed ) { // Different depth, or we didn't make a window before. New context. bNewDeviceOut = true; @@ -138,8 +137,6 @@ RString LowLevelWindow_X11::TryVideoMode( const VideoModeParams &p, bool &bNewDe g_AltWindow = X11Helper::CreateWindow(xvi->screen, xvi->depth, xvi->visual, p.width, p.height, !p.windowed); ASSERT( g_AltWindow ); - m_bWindowIsOpen = true; - char *szWindowTitle = const_cast( p.sWindowTitle.c_str() ); XChangeProperty( X11Helper::Dpy, X11Helper::Win, XA_WM_NAME, XA_STRING, 8, PropModeReplace, reinterpret_cast(szWindowTitle), strlen(szWindowTitle) ); diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h index afd42622da..18b809ae99 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.h @@ -29,7 +29,6 @@ public: void EndConcurrentRendering(); private: - bool m_bWindowIsOpen; bool m_bWasWindowed; VideoModeParams CurrentParams; };