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

Provide a workaround if SDL_GetRelativeMouseState() is disfunctional

Browse source 
On some systems SDL_SetRelativeMouseMode() can fail under several
circumstances. For example:
 - Security software is blocking acces to raw input.
 - XInput 2 is unavailable.
 - SDL2s configure script has messed up.
Detect those situations and reposition the mouse manually to the
window center after having read it's current state. This fixes
issue #34 an #35.
This commit is contained in:
Yamagi Burmeister 2014-01-25 11:45:08 +01:00
parent 68d3da29e8
commit 825a53009a
2 changed files with 57 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,6 +74,10 @@ static int old_mouse_x, old_mouse_y;
static qboolean have_grab; static qboolean have_grab;
static qboolean mlooking; static qboolean mlooking;
#if SDL_VERSION_ATLEAST(2, 0, 0)
qboolean in_relativemode;
#endif
/* CVars */ /* CVars */
cvar_t *vid_fullscreen; cvar_t *vid_fullscreen;
static cvar_t *in_grab; static cvar_t *in_grab;
@ -429,9 +433,40 @@ IN_Update(void)
/* Get new mouse coordinates */ /* Get new mouse coordinates */
if (!mouse_x && !mouse_y) if (!mouse_x && !mouse_y)
{
#if SDL_VERSION_ATLEAST(2, 0, 0)
if (in_relativemode)
{ {
SDL_GetRelativeMouseState(&mouse_x, &mouse_y); SDL_GetRelativeMouseState(&mouse_x, &mouse_y);
} }
else
{
/* This is a hack to work around an unsuccessfull
* SDL_SetRelativeMouseMode(). This can happen if
* some broken security software is blocking raw
* input (to prevent keyloggers accessing the input
* queue), or if - on Linux / Unix - XInput2 is not
* available.
* Since SDL_WarpMouseInWindow() injects a movement
* event into the queue, we need to pump the queue
* and remove the event by reading it. There are
* other ways to accomplish this, but this arguable
* ugly solution seems to have the lowest chance to
* fu** thinks up. */
SDL_GetRelativeMouseState(&mouse_x, &mouse_y);
if (have_grab)
{
SDL_WarpMouseInWindow(NULL, vid.width / 2, vid.height / 2);
}
SDL_PumpEvents();
SDL_GetRelativeMouseState(NULL, NULL);
}
#else
SDL_GetRelativeMouseState(&mouse_x, &mouse_y);
#endif
}
/* 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 */
@ -572,7 +607,16 @@ IN_KeyboardInit(Key_Event_fp_t fp)
have_grab = GLimp_InputIsGrabbed(); have_grab = GLimp_InputIsGrabbed();
#if SDL_VERSION_ATLEAST(2, 0, 0) #if SDL_VERSION_ATLEAST(2, 0, 0)
if (have_grab) if (have_grab)
SDL_SetRelativeMouseMode(SDL_TRUE); {
if (SDL_SetRelativeMouseMode(SDL_TRUE) < 0)
{
in_relativemode = false;
}
else
{
in_relativemode = true;
}
}
#else #else
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);

13
src/backends/sdl/refresh.c
View file

@ -66,6 +66,7 @@
#endif #endif
#if SDL_VERSION_ATLEAST(2, 0, 0) #if SDL_VERSION_ATLEAST(2, 0, 0)
extern qboolean in_relativemode;
SDL_Window* window = NULL; SDL_Window* window = NULL;
SDL_GLContext context = NULL; SDL_GLContext context = NULL;
#else #else
@ -696,8 +697,18 @@ void GLimp_GrabInput(qboolean grab)
{ {
#if SDL_VERSION_ATLEAST(2, 0, 0) #if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_SetWindowGrab(window, grab ? SDL_TRUE : SDL_FALSE); SDL_SetWindowGrab(window, grab ? SDL_TRUE : SDL_FALSE);
if (grab) if (grab)
SDL_SetRelativeMouseMode(SDL_TRUE); {
if (SDL_SetRelativeMouseMode(SDL_TRUE) < 0)
{
in_relativemode = false;
}
else
{
in_relativemode = true;
}
}
#else #else
SDL_WM_GrabInput(grab ? SDL_GRAB_ON : SDL_GRAB_OFF); SDL_WM_GrabInput(grab ? SDL_GRAB_ON : SDL_GRAB_OFF);