actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

HandleSDLEvents is too small to be worth splitting

Browse Source 
all code that handles SDL events is also responsible for enabling and
disabling those events
This commit is contained in:
Glenn Maynard
2004-06-14 03:53:41 +00:00
parent b3470b32ed
commit aa7ad967ae
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_D3D.cpp
+13 -6
View File
@@ -262,7 +262,6 @@ RageDisplay_D3D::RageDisplay_D3D( VideoModeParams p )
* actually initialize the window. Do this after as many error conditions * actually initialize the window. Do this after as many error conditions
* as possible, because if we have to shut it down again we'll flash a window * as possible, because if we have to shut it down again we'll flash a window
* briefly. */ * briefly. */
//#if defined _WINDOWS
if(!SDL_WasInit(SDL_INIT_VIDEO)) if(!SDL_WasInit(SDL_INIT_VIDEO))
{ {
if( SDL_InitSubSystem(SDL_INIT_VIDEO) == -1 ) if( SDL_InitSubSystem(SDL_INIT_VIDEO) == -1 )
@@ -276,8 +275,9 @@ RageDisplay_D3D::RageDisplay_D3D( VideoModeParams p )
* This needs to be done after we initialize video, since it's really part * This needs to be done after we initialize video, since it's really part
* of the SDL video system--it'll be reinitialized on us if we do this first. */ * of the SDL video system--it'll be reinitialized on us if we do this first. */
SDL_EventState(0xFF /*SDL_ALLEVENTS*/, SDL_IGNORE); SDL_EventState(0xFF /*SDL_ALLEVENTS*/, SDL_IGNORE);
SDL_EventState(SDL_VIDEORESIZE, SDL_ENABLE); SDL_EventState( SDL_VIDEORESIZE, SDL_ENABLE );
//#endif SDL_EventState( SDL_ACTIVEEVENT, SDL_ENABLE );
SDL_EventState( SDL_QUIT, SDL_ENABLE );
g_PaletteIndex.clear(); g_PaletteIndex.clear();
for( int i = 0; i < 256; ++i ) for( int i = 0; i < 256; ++i )
@@ -321,11 +321,12 @@ RageDisplay_D3D::RageDisplay_D3D( VideoModeParams p )
void RageDisplay_D3D::Update(float fDeltaTime) void RageDisplay_D3D::Update(float fDeltaTime)
{ {
HandleSDLEvents(); /* This needs to be called before anything that handles SDL events. */
SDL_PumpEvents();
#if defined _WINDOWS #if defined _WINDOWS
SDL_Event event; SDL_Event event;
while(SDL_GetEvent(event, SDL_VIDEORESIZEMASK|SDL_ACTIVEEVENTMASK)) while(SDL_GetEvent(event, SDL_VIDEORESIZEMASK|SDL_ACTIVEEVENTMASK|SDL_QUITMASK))
{ {
switch(event.type) switch(event.type)
{ {
@@ -346,6 +347,10 @@ void RageDisplay_D3D::Update(float fDeltaTime)
FocusChanged( i&SDL_APPINPUTFOCUS && i&SDL_APPACTIVE ); FocusChanged( i&SDL_APPINPUTFOCUS && i&SDL_APPACTIVE );
} }
break; break;
case SDL_QUIT:
LOG->Trace("SDL_QUIT: shutting down");
ExitGame();
break;
} }
} }
#endif #endif
@@ -355,8 +360,10 @@ RageDisplay_D3D::~RageDisplay_D3D()
{ {
LOG->Trace( "RageDisplay_D3D::~RageDisplay()" ); LOG->Trace( "RageDisplay_D3D::~RageDisplay()" );
SDL_EventState( SDL_VIDEORESIZE, SDL_IGNORE );
SDL_EventState( SDL_ACTIVEEVENT, SDL_IGNORE );
SDL_EventState( SDL_QUIT, SDL_IGNORE );
#if defined _WINDOWS #if defined _WINDOWS
SDL_EventState(SDL_VIDEORESIZE, SDL_IGNORE);
SDL_QuitSubSystem(SDL_INIT_VIDEO); SDL_QuitSubSystem(SDL_INIT_VIDEO);
#endif #endif