dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-02-17 09:42:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup GrabInput()

Browse source 
Convert to bitflags to ease moving it.
This commit is contained in:
dhewg 2012-07-19 21:07:47 +02:00
parent a75387c55e
commit 6dcf07974d
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
neo/sys/events.cpp
View file

@ -256,14 +256,24 @@ static void PushConsoleEvent(const char *s) {
SDL_PushEvent(&event); SDL_PushEvent(&event);
} }
static void GrabInput(bool grab, bool hide_cursor, bool set_state) { const int GRAB_ENABLE = (1 << 0);
const int GRAB_REENABLE = (1 << 1);
const int GRAB_HIDECURSOR = (1 << 2);
const int GRAB_SETSTATE = (1 << 3);
static void GrabInput(int flags) {
#if defined(ID_DEDICATED) #if defined(ID_DEDICATED)
return; return;
#else #else
if (set_state) bool grab = flags & GRAB_ENABLE;
if (grab && (flags & GRAB_REENABLE))
grab = false;
if (flags & GRAB_SETSTATE)
grabbed = grab; grabbed = grab;
if (hide_cursor) if (flags & GRAB_HIDECURSOR)
SDL_ShowCursor(SDL_DISABLE); SDL_ShowCursor(SDL_DISABLE);
else else
SDL_ShowCursor(SDL_ENABLE); SDL_ShowCursor(SDL_ENABLE);
@ -365,7 +375,14 @@ Sys_GrabMouseCursor
=============== ===============
*/ */
void Sys_GrabMouseCursor(bool grabIt) { void Sys_GrabMouseCursor(bool grabIt) {
GrabInput(grabIt, grabIt, true); int flags;
if (grabIt)
flags = GRAB_ENABLE | GRAB_HIDECURSOR | GRAB_SETSTATE;
else
flags = GRAB_SETSTATE;
GrabInput(flags);
} }
/* /*
@ -393,7 +410,15 @@ sysEvent_t Sys_GetEvent() {
if (SDL_PollEvent(&ev)) { if (SDL_PollEvent(&ev)) {
switch (ev.type) { switch (ev.type) {
case SDL_ACTIVEEVENT: case SDL_ACTIVEEVENT:
GrabInput(grabbed && ev.active.gain == 1, ev.active.gain == 1, false); {
int flags = 0;
if (ev.active.gain)
flags = GRAB_ENABLE | GRAB_REENABLE | GRAB_HIDECURSOR;
GrabInput(flags);
}
return res_none; return res_none;
case SDL_VIDEOEXPOSE: case SDL_VIDEOEXPOSE: