This commit is contained in:
Steve Checkoway
2006-09-15 22:04:29 +00:00
parent eff3e0d91c
commit 7ca6b10016
2 changed files with 11 additions and 10 deletions
+6 -6
View File
@@ -3,9 +3,9 @@
#include "RageLog.h" #include "RageLog.h"
#include "RageThreads.h" #include "RageThreads.h"
bool ArchHooks::s_bQuitting = false; bool ArchHooks::g_bQuitting = false;
bool ArchHooks::s_bToggleWindowed = false; bool ArchHooks::g_bToggleWindowed = false;
static bool g_bHasFocus = true; bool ArchHooks::g_bHasFocus = true;
// Keep from pulling RageThreads.h into ArchHooks.h // Keep from pulling RageThreads.h into ArchHooks.h
static RageMutex g_Mutex( "ArchHooks" ); static RageMutex g_Mutex( "ArchHooks" );
ArchHooks *HOOKS = NULL; ArchHooks *HOOKS = NULL;
@@ -13,16 +13,16 @@ ArchHooks *HOOKS = NULL;
bool ArchHooks::GetAndClearToggleWindowed() bool ArchHooks::GetAndClearToggleWindowed()
{ {
LockMut( g_Mutex ); LockMut( g_Mutex );
bool bToggle = s_bToggleWindowed; bool bToggle = g_bToggleWindowed;
s_bToggleWindowed = false; g_bToggleWindowed = false;
return bToggle; return bToggle;
} }
void ArchHooks::SetToggleWindowed() void ArchHooks::SetToggleWindowed()
{ {
LockMut( g_Mutex ); LockMut( g_Mutex );
s_bToggleWindowed = true; g_bToggleWindowed = true;
} }
#include "Selector_ArchHooks.h" #include "Selector_ArchHooks.h"
+5 -4
View File
@@ -57,8 +57,8 @@ public:
/* /*
* Returns true if the user wants to quit (eg. ^C, or clicked a "close window" button). * Returns true if the user wants to quit (eg. ^C, or clicked a "close window" button).
*/ */
static bool UserQuit() { return s_bQuitting; } static bool UserQuit() { return g_bQuitting; }
static void SetUserQuit() { s_bQuitting = true; } static void SetUserQuit() { g_bQuitting = true; }
/* /*
* Returns true if the user wants to toggle windowed mode and atomically clears * Returns true if the user wants to toggle windowed mode and atomically clears
@@ -119,8 +119,9 @@ private:
static int64_t FixupTimeIfLooped( int64_t usecs ); static int64_t FixupTimeIfLooped( int64_t usecs );
static int64_t FixupTimeIfBackwards( int64_t usecs ); static int64_t FixupTimeIfBackwards( int64_t usecs );
static bool s_bQuitting; static bool g_bQuitting;
static bool s_bToggleWindowed; static bool g_bToggleWindowed;
static bool g_bHasFocus;
}; };
#endif #endif