dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-02-20 19:12:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sys_GetEvent(): Don't return res_none when more events are available

Browse source 
If res_none (event with .evType == EV_NONE) is returned,
idEventLoop::RunEventLoop() will assume there are no more events this
frame => pending events will be delayed til next frame (or later if
again res_none is returned in the meantime).
So res_none shouldn't be returned just because there was an SDL event
we didn't care about or we did care about but don't generate a doom3
event for (but toggle fullscreen or something).
Instead we should just fetch and handle the next SDL event.
This commit is contained in:
Daniel Gibson 2015-09-30 15:58:50 +02:00
parent 66f7b6aa87
commit 412dad6758
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
neo/sys/events.cpp
View file

@ -422,7 +422,8 @@ sysEvent_t Sys_GetEvent() {
return res;
}
if (SDL_PollEvent(&ev)) {
// loop until there is an event we care about (will return then) or no more events
while(SDL_PollEvent(&ev)) {
switch (ev.type) {
#if SDL_VERSION_ATLEAST(2, 0, 0)
case SDL_WINDOWEVENT:
@ -446,7 +447,7 @@ sysEvent_t Sys_GetEvent() {
break;
}
return res_none;
continue; // handle next event
#else
case SDL_ACTIVEEVENT:
{
@ -468,10 +469,10 @@ sysEvent_t Sys_GetEvent() {
GLimp_GrabInput(flags);
}
return res_none;
continue; // handle next event
case SDL_VIDEOEXPOSE:
return res_none;
continue; // handle next event
#endif
case SDL_KEYDOWN:
@ -495,19 +496,18 @@ sysEvent_t Sys_GetEvent() {
} else {
if (ev.type == SDL_KEYDOWN)
common->Warning("unmapped SDL key %d (0x%x)", ev.key.keysym.sym, ev.key.keysym.unicode);
return res_none;
continue; // handle next event
}
}
#else
if(!key) {
if (ev.key.keysym.scancode == SDL_SCANCODE_GRAVE) {
if (ev.key.keysym.scancode == SDL_SCANCODE_GRAVE) { // TODO: always do this check?
key = Sys_GetConsoleKey(true);
} else {
if (ev.type == SDL_KEYDOWN) {
common->Warning("unmapped SDL key %d", ev.key.keysym.sym);
return res_none;
}
continue; // handle next event
}
}
@ -543,7 +543,7 @@ sysEvent_t Sys_GetEvent() {
return res;
}
return res_none;
continue; // handle next event
#endif
case SDL_MOUSEMOTION:
@ -622,11 +622,11 @@ sysEvent_t Sys_GetEvent() {
return res;
default:
common->Warning("unknown user event %u", ev.user.code);
return res_none;
continue; // handle next event
}
default:
common->Warning("unknown event %u", ev.type);
return res_none;
continue; // handle next event
}
}