]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - vid_sdl.c
added vid_stereobuffer cvar based on patch from syschuck on the alientrap forums
[xonotic/darkplaces.git] / vid_sdl.c
index 86af512877cddc86df2a4152f562e2a45da80e25..8a917822555cd9d84433739569da5f4d6369cb56 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
+#undef WIN32_LEAN_AND_MEAN  //hush a warning, SDL.h redefines this
 #include <SDL.h>
 #include <stdio.h>
 
@@ -23,13 +24,39 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // Tell startup code that we have a client
 int cl_available = true;
-static int vid_usingmouse;
-static int vid_isfullscreen;
 
-static SDL_Surface *screen;
+qboolean vid_supportrefreshrate = false;
+
+cvar_t joy_detected = {CVAR_READONLY, "joy_detected", "0", "number of joysticks detected by engine"};
+cvar_t joy_enable = {0, "joy_enable", "1", "enables joystick support"};
+cvar_t joy_index = {0, "joy_index", "0", "selects which joystick to use if you have multiple"};
+cvar_t joy_axisforward = {0, "joy_axisforward", "1", "which joystick axis to query for forward/backward movement"};
+cvar_t joy_axisside = {0, "joy_axisside", "0", "which joystick axis to query for right/left movement"};
+cvar_t joy_axisup = {0, "joy_axisup", "-1", "which joystick axis to query for up/down movement"};
+cvar_t joy_axispitch = {0, "joy_axispitch", "3", "which joystick axis to query for looking up/down"};
+cvar_t joy_axisyaw = {0, "joy_axisyaw", "2", "which joystick axis to query for looking right/left"};
+cvar_t joy_axisroll = {0, "joy_axisroll", "-1", "which joystick axis to query for tilting head right/left"};
+cvar_t joy_deadzoneforward = {0, "joy_deadzoneforward", "0", "deadzone tolerance, suggested values are in the range 0 to 0.01"};
+cvar_t joy_deadzoneside = {0, "joy_deadzoneside", "0", "deadzone tolerance, suggested values are in the range 0 to 0.01"};
+cvar_t joy_deadzoneup = {0, "joy_deadzoneup", "0", "deadzone tolerance, suggested values are in the range 0 to 0.01"};
+cvar_t joy_deadzonepitch = {0, "joy_deadzonepitch", "0", "deadzone tolerance, suggested values are in the range 0 to 0.01"};
+cvar_t joy_deadzoneyaw = {0, "joy_deadzoneyaw", "0", "deadzone tolerance, suggested values are in the range 0 to 0.01"};
+cvar_t joy_deadzoneroll = {0, "joy_deadzoneroll", "0", "deadzone tolerance, suggested values are in the range 0 to 0.01"};
+cvar_t joy_sensitivityforward = {0, "joy_sensitivityforward", "-1", "movement multiplier"};
+cvar_t joy_sensitivityside = {0, "joy_sensitivityside", "1", "movement multiplier"};
+cvar_t joy_sensitivityup = {0, "joy_sensitivityup", "1", "movement multiplier"};
+cvar_t joy_sensitivitypitch = {0, "joy_sensitivitypitch", "1", "movement multiplier"};
+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_isfullscreen;
+static int vid_numjoysticks = 0;
+#define MAX_JOYSTICKS 8
+static SDL_Joystick *vid_joysticks[MAX_JOYSTICKS];
 
-static void IN_Init( void );
-static void IN_Shutdown( void );
+static SDL_Surface *screen;
 
 /////////////////////////
 // Input handling
@@ -42,7 +69,7 @@ static void IN_Shutdown( void );
 #define tenoh  0,0,0,0,0, 0,0,0,0,0
 #define fiftyoh tenoh, tenoh, tenoh, tenoh, tenoh
 #define hundredoh fiftyoh, fiftyoh
-static unsigned int tbl_sdltoquake[] = 
+static unsigned int tbl_sdltoquake[] =
 {
        0,0,0,0,                //SDLK_UNKNOWN          = 0,
        0,0,0,0,                //SDLK_FIRST            = 0,
@@ -180,7 +207,7 @@ static unsigned int tbl_sdltoquake[] =
        0,                      //SDLK_LMETA    = 310,
        0,                      //SDLK_LSUPER   = 311,          /* Left "Windows" key */
        0,                      //SDLK_RSUPER   = 312,          /* Right "Windows" key */
-       0,                      //SDLK_MODE             = 313,          /* "Alt Gr" key */
+       K_ALT,                  //SDLK_MODE             = 313,          /* "Alt Gr" key */
        0,                      //SDLK_COMPOSE  = 314,          /* Multi-key compose key */
        0,                      //SDLK_HELP             = 315,
        0,                      //SDLK_PRINT    = 316,
@@ -195,79 +222,120 @@ static unsigned int tbl_sdltoquake[] =
 #undef fiftyoh
 #undef hundredoh
 
-static int MapKey( int sdlkey )
+static int MapKey( unsigned int sdlkey )
 {
        if( sdlkey > sizeof(tbl_sdltoquake)/ sizeof(int) )
                return 0;
     return tbl_sdltoquake[ sdlkey ];
 }
 
-static void IN_Activate( void )
-{
-       SDL_WM_GrabInput( SDL_GRAB_ON );
-       SDL_ShowCursor( SDL_DISABLE );
-}
-
-static void IN_Deactivate( void )
+static void IN_Activate( qboolean grab )
 {
-       SDL_WM_GrabInput( SDL_GRAB_OFF );
-       SDL_ShowCursor( SDL_ENABLE );
+       if (grab)
+       {
+               if (!vid_usingmouse)
+               {
+                       vid_usingmouse = true;
+                       cl_ignoremousemove = true;
+                       SDL_WM_GrabInput( SDL_GRAB_ON );
+                       SDL_ShowCursor( SDL_DISABLE );
+               }
+       }
+       else
+       {
+               if (vid_usingmouse)
+               {
+                       vid_usingmouse = false;
+                       cl_ignoremousemove = true;
+                       SDL_WM_GrabInput( SDL_GRAB_OFF );
+                       SDL_ShowCursor( SDL_ENABLE );
+               }
+       }
 }
 
-void IN_Commands (void)
+static double IN_JoystickGetAxis(SDL_Joystick *joy, int axis, double sensitivity, double deadzone)
 {
+       double value;
+       if (axis < 0 || axis >= SDL_JoystickNumAxes(joy))
+               return 0; // no such axis on this joystick
+       value = SDL_JoystickGetAxis(joy, axis) * (1.0 / 32767.0);
+       value = bound(-1, value, 1);
+       if (fabs(value) < deadzone)
+               return 0; // within deadzone around center
+       return value * sensitivity;
 }
 
-static void IN_MouseMove (usercmd_t *cmd)
+void IN_Move( void )
 {
+       int j;
        int x, y;
-
-       if( !vid_usingmouse ) {
-               IN_Mouse( cmd, 0, 0 );
-               return;
+       if( vid_usingmouse )
+       {
+               SDL_GetRelativeMouseState( &x, &y );
+               in_mouse_x = x;
+               in_mouse_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];
+               int numballs = SDL_JoystickNumBalls(joy);
+               for (j = 0;j < numballs;j++)
+               {
+                       SDL_JoystickGetBall(joy, j, &x, &y);
+                       in_mouse_x += x;
+                       in_mouse_y += y;
+               }
+               cl.cmd.forwardmove += IN_JoystickGetAxis(joy, joy_axisforward.integer, joy_sensitivityforward.value, joy_deadzoneforward.value) * cl_forwardspeed.value;
+               cl.cmd.sidemove    += IN_JoystickGetAxis(joy, joy_axisside.integer, joy_sensitivityside.value, joy_deadzoneside.value) * cl_sidespeed.value;
+               cl.cmd.upmove      += IN_JoystickGetAxis(joy, joy_axisup.integer, joy_sensitivityup.value, joy_deadzoneup.value) * cl_upspeed.value;
+               cl.viewangles[0]   += IN_JoystickGetAxis(joy, joy_axispitch.integer, joy_sensitivitypitch.value, joy_deadzonepitch.value) * cl.realframetime * cl_pitchspeed.value;
+               cl.viewangles[1]   += IN_JoystickGetAxis(joy, joy_axisyaw.integer, joy_sensitivityyaw.value, joy_deadzoneyaw.value) * cl.realframetime * cl_yawspeed.value;
+               //cl.viewangles[2]   += IN_JoystickGetAxis(joy, joy_axisroll.integer, joy_sensitivityroll.value, joy_deadzoneroll.value) * cl.realframetime * cl_rollspeed.value;
        }
-
-       SDL_GetRelativeMouseState( &x, &y );
-       IN_Mouse( cmd, x, y );
-}
-
-void IN_Move( usercmd_t *cmd )
-{
-       IN_MouseMove( cmd );    
-}
-
-static void IN_Init( void )
-{
-       // init keyboard
-       SDL_EnableUNICODE( SDL_ENABLE );
-
-       // init mouse
-       vid_usingmouse = false;
-}
-
-static void IN_Shutdown( void )
-{
 }
 
 /////////////////////
 // Message Handling
 ////
 
-static int Sys_EventFilter( SDL_Event *event ) 
+static int Sys_EventFilter( SDL_Event *event )
 {
        //TODO: Add a quit query in linux, too - though linux user are more likely to know what they do
 #ifdef WIN32
        if( event->type == SDL_QUIT && MessageBox( NULL, "Are you sure you want to quit?", "Confirm Exit", MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION ) == IDNO )
                return 0;
-       else 
+       else
                return 1;
 #else
        return 1;
 #endif
 }
 
+static keynum_t buttonremap[18] =
+{
+       K_MOUSE1,
+       K_MOUSE3,
+       K_MOUSE2,
+       K_MWHEELUP,
+       K_MWHEELDOWN,
+       K_MOUSE4,
+       K_MOUSE5,
+       K_MOUSE6,
+       K_MOUSE7,
+       K_MOUSE8,
+       K_MOUSE9,
+       K_MOUSE10,
+       K_MOUSE11,
+       K_MOUSE12,
+       K_MOUSE13,
+       K_MOUSE14,
+       K_MOUSE15,
+       K_MOUSE16,
+};
+
 void Sys_SendKeyEvents( void )
 {
+       static qboolean sound_active = true;
        SDL_Event event;
 
        while( SDL_PollEvent( &event ) )
@@ -277,10 +345,10 @@ void Sys_SendKeyEvents( void )
                                break;
                        case SDL_KEYDOWN:
                        case SDL_KEYUP:
-                               Key_Event( MapKey( event.key.keysym.sym ), event.key.keysym.unicode, (event.key.state == SDL_PRESSED) );
+                               Key_Event( MapKey( event.key.keysym.sym ), (char)event.key.keysym.unicode, (event.key.state == SDL_PRESSED) );
                                break;
                        case SDL_ACTIVEEVENT:
-                               if( event.active.state == SDL_APPACTIVE ) 
+                               if( event.active.state == SDL_APPACTIVE )
                                {
                                        if( event.active.gain )
                                                vid_hidden = false;
@@ -289,20 +357,30 @@ void Sys_SendKeyEvents( void )
                                }
                                break;
                        case SDL_MOUSEBUTTONDOWN:
-                               if( event.button.button == SDL_BUTTON_MIDDLE ) 
-                                       event.button.button = SDL_BUTTON_RIGHT;
-                               else if( event.button.button == SDL_BUTTON_RIGHT )
-                                       event.button.button = SDL_BUTTON_MIDDLE;
-                               Key_Event( K_MOUSE1 + event.button.button - 1, 0, true );
-                               break;
                        case SDL_MOUSEBUTTONUP:
-                               if( event.button.button == SDL_BUTTON_MIDDLE ) 
-                                       event.button.button = SDL_BUTTON_RIGHT;
-                               else if( event.button.button == SDL_BUTTON_RIGHT )
-                                       event.button.button = SDL_BUTTON_MIDDLE;
-                               Key_Event( K_MOUSE1 + event.button.button - 1, 0, false );
+                               if (event.button.button <= 18)
+                                       Key_Event( buttonremap[event.button.button - 1], 0, event.button.state == SDL_PRESSED );
+                               break;
+                       case SDL_JOYBUTTONDOWN:
+                               if (!joy_enable.integer)
+                                       break; // ignore down events if joystick has been disabled
+                       case SDL_JOYBUTTONUP:
+                               if (event.jbutton.button < 48)
+                                       Key_Event( event.jbutton.button + (event.jbutton.button < 16 ? K_JOY1 : K_AUX1 - 16), 0, (event.jbutton.state == SDL_PRESSED) );
                                break;
                }
+
+       // enable/disable sound on focus gain/loss
+       if (!vid_activewindow && sound_active)
+       {
+               S_BlockSound ();
+               sound_active = false;
+       }
+       else if (vid_activewindow && !sound_active)
+       {
+               S_UnblockSound ();
+               sound_active = true;
+       }
 }
 
 /////////////////
@@ -317,14 +395,37 @@ void *GL_GetProcAddress(const char *name)
 }
 
 static int Sys_EventFilter( SDL_Event *event );
+static qboolean vid_sdl_initjoysticksystem = false;
 void VID_Init (void)
 {
+       Cvar_RegisterVariable(&joy_detected);
+       Cvar_RegisterVariable(&joy_enable);
+       Cvar_RegisterVariable(&joy_index);
+       Cvar_RegisterVariable(&joy_axisforward);
+       Cvar_RegisterVariable(&joy_axisside);
+       Cvar_RegisterVariable(&joy_axisup);
+       Cvar_RegisterVariable(&joy_axispitch);
+       Cvar_RegisterVariable(&joy_axisyaw);
+       //Cvar_RegisterVariable(&joy_axisroll);
+       Cvar_RegisterVariable(&joy_deadzoneforward);
+       Cvar_RegisterVariable(&joy_deadzoneside);
+       Cvar_RegisterVariable(&joy_deadzoneup);
+       Cvar_RegisterVariable(&joy_deadzonepitch);
+       Cvar_RegisterVariable(&joy_deadzoneyaw);
+       //Cvar_RegisterVariable(&joy_deadzoneroll);
+       Cvar_RegisterVariable(&joy_sensitivityforward);
+       Cvar_RegisterVariable(&joy_sensitivityside);
+       Cvar_RegisterVariable(&joy_sensitivityup);
+       Cvar_RegisterVariable(&joy_sensitivitypitch);
+       Cvar_RegisterVariable(&joy_sensitivityyaw);
+       //Cvar_RegisterVariable(&joy_sensitivityroll);
+
        if (SDL_Init(SDL_INIT_VIDEO) < 0)
-               Sys_Error ("Failed to init video: %s\n", SDL_GetError());
+               Sys_Error ("Failed to init SDL video subsystem: %s", SDL_GetError());
+       vid_sdl_initjoysticksystem = SDL_Init(SDL_INIT_JOYSTICK) >= 0;
+       if (vid_sdl_initjoysticksystem)
+               Con_Printf("Failed to init SDL joystick subsystem: %s\n", SDL_GetError());
        vid_isfullscreen = false;
-
-       SDL_SetEventFilter( (SDL_EventFilter) Sys_EventFilter );
-       IN_Init();
 }
 
 // set the icon (we dont use SDL here since it would be too much a PITA)
@@ -339,14 +440,18 @@ static void VID_SetCaption()
        // set the caption
        SDL_WM_SetCaption( gamename, NULL );
 
-       // get the HWND handle 
+       // get the HWND handle
     SDL_VERSION( &info.version );
        if( !SDL_GetWMInfo( &info ) )
                return;
 
-       //icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) );
-       icon = LoadIcon( NULL, IDI_ERROR );
-       SetClassLong( info.window, GCL_HICON, (LONG) icon );
+       icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) );
+#ifndef _W64 //If Windows 64bit data types don't exist
+#define SetClassLongPtr SetClassLong
+#define GCLP_HICON GCL_HICON
+#define LONG_PTR LONG
+#endif
+       SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
 }
 #else
 static void VID_SetCaption()
@@ -359,13 +464,13 @@ static void VID_OutputVersion()
 {
        const SDL_version *version;
        version = SDL_Linked_Version();
-       Con_DPrintf(    "Linked against SDL version %d.%d.%d\n"
+       Con_Printf(     "Linked against SDL version %d.%d.%d\n"
                                        "Using SDL library version %d.%d.%d\n",
                                        SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL,
-                                       version->major, version->minor, version->patch );       
+                                       version->major, version->minor, version->patch );
 }
 
-int VID_InitMode(int fullscreen, int width, int height, int bpp)
+int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer)
 {
        int i;
        int flags = SDL_OPENGL;
@@ -373,135 +478,163 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 
        VID_OutputVersion();
 
-       /* 
-       SDL Hack 
+       /*
+       SDL Hack
                We cant switch from one OpenGL video mode to another.
                Thus we first switch to some stupid 2D mode and then back to OpenGL.
        */
        SDL_SetVideoMode( 0, 0, 0, 0 );
 
-#ifdef WIN32
-       drivername = "opengl32.dll";
-#elif defined(__APPLE__) && defined(__MACH__)
-       drivername = "OpenGL.framework";
-#else
-       drivername = "libGL.so.1";
-#endif
+       // SDL usually knows best
+       drivername = NULL;
 
-// COMMANDLINEOPTION: SDL GL: -gl_driver <drivername> selects a GL driver library, default is libGL.so.1 (Linux/BSD) or opengl32.dll (windows) or OpenGL.framework (MacOSX), useful only for 3dfxogl.dll/3dfxvgl.dll or fxmesa or similar, if you don't know what this is for, you don't need it
+// COMMANDLINEOPTION: SDL GL: -gl_driver <drivername> selects a GL driver library, default is whatever SDL recommends, useful only for 3dfxogl.dll/3dfxvgl.dll or fxmesa or similar, if you don't know what this is for, you don't need it
        i = COM_CheckParm("-gl_driver");
        if (i && i < com_argc - 1)
                drivername = com_argv[i + 1];
-       if (SDL_GL_LoadLibrary(drivername))
-       {   
-               Con_Printf("Unable to load GL driver \"%s\": ", drivername, SDL_GetError());
+       if (SDL_GL_LoadLibrary(drivername) < 0)
+       {
+               Con_Printf("Unable to load GL driver \"%s\": %s\n", drivername, SDL_GetError());
                return false;
        }
 
-       qglGetString = GL_GetProcAddress("glGetString");
-       
-       // Knghtbrd: should do platform-specific extension string function here
-
-       if (qglGetString == NULL)
+       if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL)
        {
                VID_Shutdown();
                Con_Print("Required OpenGL function glGetString not found\n");
                return false;
        }
 
+       // Knghtbrd: should do platform-specific extension string function here
+
        vid_isfullscreen = false;
        if (fullscreen) {
                flags |= SDL_FULLSCREEN;
                vid_isfullscreen = true;
        }
 
-       SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 1);
-       SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 1);
-       SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 1);
-       SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
        SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
+       if (bpp >= 32)
+       {
+               SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 8);
+               SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 8);
+               SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 8);
+               SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 8);
+               SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 24);
+               SDL_GL_SetAttribute (SDL_GL_STENCIL_SIZE, 8);
+       }
+       else
+       {
+               SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 1);
+               SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 1);
+               SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 1);
+               SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
+       }
+       if (stereobuffer)
+               SDL_GL_SetAttribute (SDL_GL_STEREO, 1);
 
        screen = SDL_SetVideoMode(width, height, bpp, flags);
        if (screen == NULL)
        {
-               Con_Printf("Failed to set video mode to %ix%i: %s\n", width, height, SDL_GetError);
+               Con_Printf("Failed to set video mode to %ix%i: %s\n", width, height, SDL_GetError());
                VID_Shutdown();
                return false;
        }
+
+       // set window title
        VID_SetCaption();
-       
-       gl_renderer = qglGetString(GL_RENDERER);
-       gl_vendor = qglGetString(GL_VENDOR);
-       gl_version = qglGetString(GL_VERSION);
-       gl_extensions = qglGetString(GL_EXTENSIONS);
+       // set up an event filter to ask confirmation on close button in WIN32
+       SDL_SetEventFilter( (SDL_EventFilter) Sys_EventFilter );
+       // init keyboard
+       SDL_EnableUNICODE( SDL_ENABLE );
+       // enable key repeat since everyone expects it
+       SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+
+       gl_renderer = (const char *)qglGetString(GL_RENDERER);
+       gl_vendor = (const char *)qglGetString(GL_VENDOR);
+       gl_version = (const char *)qglGetString(GL_VERSION);
+       gl_extensions = (const char *)qglGetString(GL_EXTENSIONS);
        gl_platform = "SDL";
        // Knghtbrd: should assign platform-specific extensions here
        //TODO: maybe ;)
        gl_platformextensions = "";
        gl_videosyncavailable = false;
-       
+
        GL_Init();
 
+       vid_numjoysticks = SDL_NumJoysticks();
+       vid_numjoysticks = bound(0, vid_numjoysticks, MAX_JOYSTICKS);
+       Cvar_SetValueQuick(&joy_detected, vid_numjoysticks);
+       Con_Printf("%d SDL joystick(s) found:\n", vid_numjoysticks);
+       memset(vid_joysticks, 0, sizeof(vid_joysticks));
+       for (i = 0;i < vid_numjoysticks;i++)
+       {
+               SDL_Joystick *joy;
+               joy = vid_joysticks[i] = SDL_JoystickOpen(i);
+               if (!joy)
+               {
+                       Con_Printf("joystick #%i: open failed: %s\n", i, SDL_GetError());
+                       continue;
+               }
+               Con_Printf("joystick #%i: opened \"%s\" with %i axes, %i buttons, %i balls\n", i, SDL_JoystickName(i), (int)SDL_JoystickNumAxes(joy), (int)SDL_JoystickNumButtons(joy), (int)SDL_JoystickNumBalls(joy));
+       }
+
        vid_hidden = false;
        vid_activewindow = false;
        vid_usingmouse = false;
-       IN_Init();
        return true;
 }
 
 void VID_Shutdown (void)
 {
-       IN_Shutdown();
+       IN_Activate(false);
        SDL_QuitSubSystem(SDL_INIT_VIDEO);
 }
 
-int VID_SetGamma (unsigned short *ramps)
+int VID_SetGamma (unsigned short *ramps, int rampsize)
 {
-       return !SDL_SetGammaRamp (ramps, ramps + 256, ramps + 512);
+       return !SDL_SetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2);
 }
 
-int VID_GetGamma (unsigned short *ramps)
+int VID_GetGamma (unsigned short *ramps, int rampsize)
 {
-       return !SDL_GetGammaRamp( ramps, ramps + 256, ramps + 512);
+       return !SDL_GetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2);
 }
 
-void VID_GetWindowSize (int *x, int *y, int *width, int *height)
-{
-       *x = *y = 0;
-       *width = screen->w;
-       *height = screen->h;
-}
-
-void VID_Finish (void)
+void VID_Finish (qboolean allowmousegrab)
 {
        Uint8 appstate;
-       int vid_usemouse;
-
-       if (r_speeds.integer || gl_finish.integer)
-               qglFinish();
-       SDL_GL_SwapBuffers();
+       qboolean vid_usemouse;
 
        //react on appstate changes
        appstate = SDL_GetAppState();
 
-       if( !( appstate & SDL_APPMOUSEFOCUS ) || !( appstate & SDL_APPINPUTFOCUS ) )
+       vid_hidden = !(appstate & SDL_APPACTIVE);
+
+       if( vid_hidden || !( appstate & SDL_APPMOUSEFOCUS ) || !( appstate & SDL_APPINPUTFOCUS ) )
                vid_activewindow = false;
-       else 
+       else
                vid_activewindow = true;
 
        vid_usemouse = false;
-       if( vid_mouse.integer && !key_consoleactive )
+       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;
 
-       if( vid_usemouse && !vid_usingmouse ) {
-               vid_usingmouse = true;
-               IN_Activate();
-       } else if( !vid_usemouse && vid_usingmouse ) {
-               vid_usingmouse = false;
-               IN_Deactivate();
+       IN_Activate(vid_usemouse);
+
+       VID_UpdateGamma(false, 256);
+
+       if (r_render.integer && !vid_hidden)
+       {
+               CHECKGLERROR
+               if (r_speeds.integer || gl_finish.integer)
+               {
+                       qglFinish();CHECKGLERROR
+               }
+               SDL_GL_SwapBuffers();
        }
 }