libretro/libretro-tyrquake
1
0
Fork 0
mirror of https://github.com/libretro/libretro-tyrquake.git synced 2025-02-12 03:31:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sdl: release the mouse pointer when not in game

Browse Source 
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2012-12-20 09:33:04 +10:30
parent e154c566f3
commit 7604ea5fd0
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
common/in_sdl.c
View File

@ -562,8 +562,10 @@ IN_ProcessEvents(void)
break;
case SDL_MOUSEMOTION:
mouse_x += event.motion.xrel;
mouse_y += event.motion.yrel;
if (SDL_GetWindowGrab(sdl_window)) {
mouse_x += event.motion.xrel;
mouse_y += event.motion.yrel;
}
break;
case SDL_QUIT:
@ -586,11 +588,15 @@ IN_GrabMouse(int grab)
if ((mouse_grabbed && !grab) || (!mouse_grabbed && grab))
Con_Printf("%s: grab failed? (%s)\n", __func__, SDL_GetError());
SDL_SetRelativeMouseMode(mouse_grabbed);
err = SDL_ShowCursor(mouse_grabbed ? 0 : 1);
err = SDL_ShowCursor(mouse_grabbed ? SDL_DISABLE : SDL_ENABLE);
if (err < 0)
Con_Printf("Unable to %s the mouse cursor (%s)\n",
Con_Printf("WARNING: Unable to %s the mouse cursor (%s)\n",
mouse_grabbed ? "hide" : "unhide", SDL_GetError());
if (!mouse_grabbed)
SDL_WarpMouseInWindow(sdl_window, vid.width / 2, vid.height / 2);
SDL_SetRelativeMouseMode(mouse_grabbed);
}
static void
@ -618,6 +624,9 @@ IN_MouseMove(usercmd_t *cmd)
if (!mouse_available)
return;
if (!SDL_GetWindowGrab(sdl_window))
return;
if (m_filter.value) {
mouse_x = (mouse_x + old_mouse_x) * 0.5;
mouse_y = (mouse_y + old_mouse_y) * 0.5;
@ -687,5 +696,19 @@ void IN_Move(usercmd_t *cmd)
}
void IN_Commands(void)
{
if (mouse_available) {
SDL_bool mouse_grabbed = SDL_GetWindowGrab(sdl_window);
// If we have the mouse, but are not in the game...
if (mouse_grabbed && key_dest != key_game && !VID_IsFullScreen())
IN_GrabMouse(false);
// If we don't have the mouse, but we're in the game and we want it...
if (!mouse_grabbed && key_dest == key_game &&
(_windowed_mouse.value || VID_IsFullScreen()))
IN_GrabMouse(true);
}
IN_ProcessEvents();
}