yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-22 20:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

simplify the input grabbing code

Browse source
This commit is contained in:
svdijk 2013-07-30 20:13:49 +02:00
parent 005fea6c94
commit ee03e7f03a
1 changed files with 8 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/backends/sdl/input.c
View file

@ -40,7 +40,7 @@
#define MOUSE_MAX 3000 #define MOUSE_MAX 3000
#define MOUSE_MIN 40 #define MOUSE_MIN 40
static qboolean mouse_grabbed; static qboolean have_grab;
static cvar_t *windowed_mouse; static cvar_t *windowed_mouse;
static cvar_t *in_grab; static cvar_t *in_grab;
static int mouse_x, mouse_y; static int mouse_x, mouse_y;
@ -430,6 +430,7 @@ IN_Update(void)
SDL_Event event; SDL_Event event;
static int IN_Update_Flag; static int IN_Update_Flag;
int bstate; int bstate;
qboolean want_grab;
/* Protection against multiple calls */ /* Protection against multiple calls */
if (IN_Update_Flag == 1) if (IN_Update_Flag == 1)
@ -482,48 +483,12 @@ IN_Update(void)
/* Grab and ungrab the mouse if the /* Grab and ungrab the mouse if the
* console or the menu is opened */ * console or the menu is opened */
if (vid_fullscreen->value) want_grab = (vid_fullscreen->value || in_grab->value == 1 ||
(in_grab->value == 2 && windowed_mouse->value));
if (have_grab != want_grab)
{ {
if (!mouse_grabbed) SDL_WM_GrabInput((want_grab ? SDL_GRAB_ON : SDL_GRAB_OFF));
{ have_grab = want_grab;
SDL_WM_GrabInput(SDL_GRAB_ON);
mouse_grabbed = true;
}
}
if (in_grab->value == 0)
{
if (mouse_grabbed)
{
SDL_WM_GrabInput(SDL_GRAB_OFF);
mouse_grabbed = false;
}
}
else if (in_grab->value == 1)
{
if (!mouse_grabbed)
{
SDL_WM_GrabInput(SDL_GRAB_ON);
mouse_grabbed = true;
}
}
else
{
if (windowed_mouse->value)
{
if (!mouse_grabbed)
{
SDL_WM_GrabInput(SDL_GRAB_ON);
mouse_grabbed = true;
}
}
else
{
if (mouse_grabbed)
{
SDL_WM_GrabInput(SDL_GRAB_OFF);
mouse_grabbed = false;
}
}
} }
/* Process the key events */ /* Process the key events */
@ -609,14 +574,7 @@ IN_KeyboardInit(Key_Event_fp_t fp)
* this must be done after video is initialized. */ * this must be done after video is initialized. */
SDL_EnableUNICODE(0); SDL_EnableUNICODE(0);
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
if (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_ON) have_grab = (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_ON);
{
mouse_grabbed = true;
}
else
{
mouse_grabbed = false;
}
} }
/* /*