be a little more strict with contents of worldstatus and clientstatus fields (skip...

[xonotic/darkplaces.git] / vid_sdl.c

diff --git a/vid_sdl.c b/vid_sdl.c
index 01381a3a3a957cab2eb3f4b2bafdc449fbe775cb..d6123be70d8829eb87be09fc6b8b51536d7d1a82 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -49,7 +49,8 @@ cvar_t joy_sensitivitypitch = {0, "joy_sensitivitypitch", "1", "movement multipl
 cvar_t joy_sensitivityyaw = {0, "joy_sensitivityyaw", "-1", "movement multiplier"};
 cvar_t joy_sensitivityroll = {0, "joy_sensitivityroll", "1", "movement multiplier"};
 
-static qboolean vid_usingmouse;
+static qboolean vid_usingmouse = false;
+static qboolean vid_usinghidecursor = false;
 static qboolean vid_isfullscreen;
 static int vid_numjoysticks = 0;
 #define MAX_JOYSTICKS 8
@@ -232,29 +233,18 @@ static int MapKey( unsigned int sdlkey )
     return tbl_sdltoquake[ sdlkey ];
 }
 
-static void IN_Activate( qboolean grab )
+void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor)
 {
-       //SDL_WM_GrabInput( SDL_GRAB_OFF );
-       //Con_Printf("< Turning off input-grabbing. --blub\n");
-       if (grab)
+       if (vid_usingmouse != relative)
        {
-               if (!vid_usingmouse)
-               {
-                       vid_usingmouse = true;
-                       cl_ignoremousemoves = 2;
-                       SDL_WM_GrabInput( SDL_GRAB_ON );
-                       SDL_ShowCursor( SDL_DISABLE );
-               }
+               vid_usingmouse = relative;
+               cl_ignoremousemoves = 2;
+               SDL_WM_GrabInput( relative ? SDL_GRAB_ON : SDL_GRAB_OFF );
        }
-       else
+       if (vid_usinghidecursor != hidecursor)
        {
-               if (vid_usingmouse)
-               {
-                       vid_usingmouse = false;
-                       cl_ignoremousemoves = 2;
-                       SDL_WM_GrabInput( SDL_GRAB_OFF );
-                       SDL_ShowCursor( SDL_ENABLE );
-               }
+               vid_usinghidecursor = hidecursor;
+               SDL_ShowCursor( hidecursor ? SDL_DISABLE : SDL_ENABLE);
        }
 }
 
@@ -276,7 +266,7 @@ void IN_Move( void )
        static int old_x = 0, old_y = 0;
        static int stuck = 0;
        int x, y;
-       if( vid_usingmouse )
+       if (vid_usingmouse)
        {
                if(vid_stick_mouse.integer)
                {
@@ -305,6 +295,11 @@ void IN_Move( void )
                        in_mouse_y = y;
                }
        }
+
+       SDL_GetMouseState(&x, &y);
+       in_windowmouse_x = x;
+       in_windowmouse_y = y;
+
        if (vid_numjoysticks && joy_enable.integer && joy_index.integer >= 0 && joy_index.integer < vid_numjoysticks)
        {
                SDL_Joystick *joy = vid_joysticks[joy_index.integer];
@@ -758,6 +753,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        vid_hidden = false;
        vid_activewindow = false;
        vid_usingmouse = false;
+       vid_usinghidecursor = false;
 
        SDL_WM_GrabInput(SDL_GRAB_OFF);
        return true;
@@ -765,10 +761,9 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
 
 void VID_Shutdown (void)
 {
-       // this is needed to retry gamma after a vid_restart
+       VID_SetMouse(false, false, false);
        VID_RestoreSystemGamma();
 
-       IN_Activate(false);
        SDL_QuitSubSystem(SDL_INIT_VIDEO);
 
        gl_driver[0] = 0;
@@ -787,10 +782,9 @@ int VID_GetGamma (unsigned short *ramps, int rampsize)
        return !SDL_GetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2);
 }
 
-void VID_Finish (qboolean allowmousegrab)
+void VID_Finish (void)
 {
        Uint8 appstate;
-       qboolean vid_usemouse;
 
        //react on appstate changes
        appstate = SDL_GetAppState();
@@ -802,16 +796,6 @@ void VID_Finish (qboolean allowmousegrab)
        else
                vid_activewindow = true;
 
-       vid_usemouse = false;
-       if( allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback) )
-               vid_usemouse = true;
-       if( vid_isfullscreen )
-               vid_usemouse = true;
-       if( !vid_activewindow )
-               vid_usemouse = false;
-
-       IN_Activate(vid_usemouse);
-
        VID_UpdateGamma(false, 256);
 
        if (r_render.integer && !vid_hidden)