]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - vid_sdl.c
detect whether dpsoftrast is being built with SDL
[xonotic/darkplaces.git] / vid_sdl.c
index 1387e69b7dc359cf7046da3152b3469ae8d46859..c91b3ea529a268fac0b8c4b2c12c67c0f7a61259 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -23,7 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include "image.h"
+#include "dpsoftrast.h"
 
+#ifndef __IPHONEOS__
 #ifdef MACOSX
 #include <Carbon/Carbon.h>
 #include <IOKit/hidsystem/IOHIDLib.h>
@@ -53,6 +55,7 @@ io_connect_t IN_GetIOHandle(void)
        return iohandle;
 }
 #endif
+#endif
 
 #ifdef WIN32
 #define SDL_R_RESTART
@@ -63,6 +66,8 @@ int cl_available = true;
 
 qboolean vid_supportrefreshrate = false;
 
+cvar_t vid_soft = {CVAR_SAVE, "vid_soft", "0", "enables use of the DarkPlaces Software Rasterizer rather than OpenGL or Direct3D"};
+cvar_t vid_soft_threads = {CVAR_SAVE, "vid_soft_threads", "2", "the number of threads the DarkPlaces Software Rasterizer should use"}; 
 cvar_t joy_detected = {CVAR_READONLY, "joy_detected", "0", "number of joysticks detected by engine"};
 cvar_t joy_enable = {CVAR_SAVE, "joy_enable", "0", "enables joystick support"};
 cvar_t joy_index = {0, "joy_index", "0", "selects which joystick to use if you have multiple"};
@@ -84,10 +89,14 @@ 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"};
+cvar_t joy_axiskeyevents = {CVAR_SAVE, "joy_axiskeyevents", "0", "generate uparrow/leftarrow etc. keyevents for joystick axes, use if your joystick driver is not generating them"};
 
 static qboolean vid_usingmouse = false;
 static qboolean vid_usinghidecursor = false;
 static qboolean vid_isfullscreen;
+#if !(SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION == 2)
+static qboolean vid_usingvsync = false;
+#endif
 static int vid_numjoysticks = 0;
 #define MAX_JOYSTICKS 8
 static SDL_Joystick *vid_joysticks[MAX_JOYSTICKS];
@@ -97,6 +106,17 @@ static int win_half_height = 50;
 static int video_bpp, video_flags;
 
 static SDL_Surface *screen;
+static SDL_Surface *vid_softsurface;
+
+// joystick axes state
+#define MAX_JOYSTICK_AXES      16
+typedef struct
+{
+       float oldmove;
+       float move;
+       double keytime;
+}joy_axiscache_t;
+static joy_axiscache_t joy_axescache[MAX_JOYSTICK_AXES];
 
 /////////////////////////
 // Input handling
@@ -271,16 +291,19 @@ static int MapKey( unsigned int sdlkey )
 
 void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor)
 {
+#ifndef __IPHONEOS__
 #ifdef MACOSX
        if(relative)
                if(vid_usingmouse && (vid_usingnoaccel != !!apple_mouse_noaccel.integer))
                        VID_SetMouse(false, false, false); // ungrab first!
+#endif
 #endif
        if (vid_usingmouse != relative)
        {
                vid_usingmouse = relative;
                cl_ignoremousemoves = 2;
                SDL_WM_GrabInput( relative ? SDL_GRAB_ON : SDL_GRAB_OFF );
+#ifndef __IPHONEOS__
 #ifdef MACOSX
                if(relative)
                {
@@ -332,6 +355,7 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso
                                        Con_Print("Could not re-enable mouse acceleration (failed at IO_GetIOHandle).\n");
                        }
                }
+#endif
 #endif
        }
        if (vid_usinghidecursor != hidecursor)
@@ -353,12 +377,79 @@ static double IN_JoystickGetAxis(SDL_Joystick *joy, int axis, double sensitivity
        return value * sensitivity;
 }
 
+/////////////////////
+// Joystick axis keyevents
+// a sort of hack emulating Arrow keys for joystick axises
+// as some drives dont send such keyevents for them
+// additionally we should block drivers that do send arrow keyevents to prevent double events
+////
+
+static void IN_JoystickKeyeventForAxis(SDL_Joystick *joy, int axis, int key_pos, int key_neg)
+{
+       double joytime;
+
+       if (axis < 0 || axis >= SDL_JoystickNumAxes(joy))
+               return; // no such axis on this joystick
+
+       joytime = Sys_DoubleTime();
+       // no key event, continuous keydown event
+       if (joy_axescache[axis].move == joy_axescache[axis].oldmove)
+       {
+               if (joy_axescache[axis].move != 0 && joytime > joy_axescache[axis].keytime)
+               {
+                       //Con_Printf("joy %s %i %f\n", Key_KeynumToString((joy_axescache[axis].move > 0) ? key_pos : key_neg), 1, cl.time);
+                       Key_Event((joy_axescache[axis].move > 0) ? key_pos : key_neg, 0, 1);
+                       joy_axescache[axis].keytime = joytime + 0.5 / 20;
+               }
+               return;
+       }
+       // generate key up event
+       if (joy_axescache[axis].oldmove)
+       {
+               //Con_Printf("joy %s %i %f\n", Key_KeynumToString((joy_axescache[axis].oldmove > 0) ? key_pos : key_neg), 1, cl.time);
+               Key_Event((joy_axescache[axis].oldmove > 0) ? key_pos : key_neg, 0, 0);
+       }
+       // generate key down event
+       if (joy_axescache[axis].move)
+       {
+               //Con_Printf("joy %s %i %f\n", Key_KeynumToString((joy_axescache[axis].move > 0) ? key_pos : key_neg), 1, cl.time);
+               Key_Event((joy_axescache[axis].move > 0) ? key_pos : key_neg, 0, 1);
+               joy_axescache[axis].keytime = joytime + 0.5;
+       }
+}
+
+static qboolean IN_JoystickBlockDoubledKeyEvents(int keycode)
+{
+       if (!joy_axiskeyevents.integer)
+               return false;
+
+       // block keyevent if it's going to be provided by joystick keyevent system
+       if (vid_numjoysticks && joy_enable.integer && joy_index.integer >= 0 && joy_index.integer < vid_numjoysticks)
+       {
+               SDL_Joystick *joy = vid_joysticks[joy_index.integer];
+
+               if (keycode == K_UPARROW || keycode == K_DOWNARROW)
+                       if (IN_JoystickGetAxis(joy, joy_axisforward.integer, 1, 0.01) || joy_axescache[joy_axisforward.integer].move || joy_axescache[joy_axisforward.integer].oldmove)
+                               return true;
+               if (keycode == K_RIGHTARROW || keycode == K_LEFTARROW)
+                       if (IN_JoystickGetAxis(joy, joy_axisside.integer, 1, 0.01) || joy_axescache[joy_axisside.integer].move || joy_axescache[joy_axisside.integer].oldmove)
+                               return true;
+       }
+
+       return false;
+}
+
+/////////////////////
+// Movement handling
+////
+
 void IN_Move( void )
 {
        int j;
        static int old_x = 0, old_y = 0;
        static int stuck = 0;
-       int x, y;
+       int x, y, numaxes, numballs;
+
        if (vid_usingmouse)
        {
                if(vid_stick_mouse.integer)
@@ -396,19 +487,38 @@ void IN_Move( void )
        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);
+
+               // balls convert to mousemove
+               numballs = SDL_JoystickNumBalls(joy);
                for (j = 0;j < numballs;j++)
                {
                        SDL_JoystickGetBall(joy, j, &x, &y);
                        in_mouse_x += x;
                        in_mouse_y += y;
                }
+
+               // axes
                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;
+       
+               // cache state of axes to emulate button events for them
+               numaxes = min(MAX_JOYSTICK_AXES, SDL_JoystickNumAxes(joy));
+               for (j = 0; j < numaxes; j++)
+               {
+                       joy_axescache[j].oldmove = joy_axescache[j].move;
+                       joy_axescache[j].move = IN_JoystickGetAxis(joy, j, 1, 0.01);
+               }
+
+               // run keyevents
+               if (joy_axiskeyevents.integer)
+               {
+                       IN_JoystickKeyeventForAxis(joy, joy_axisforward.integer, K_DOWNARROW, K_UPARROW);
+                       IN_JoystickKeyeventForAxis(joy, joy_axisside.integer, K_RIGHTARROW, K_LEFTARROW);
+               }
        }
 }
 
@@ -416,6 +526,7 @@ void IN_Move( void )
 // Message Handling
 ////
 
+#if SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION == 2
 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
@@ -428,6 +539,7 @@ static int Sys_EventFilter( SDL_Event *event )
        }
        return 1;
 }
+#endif
 
 #ifdef SDL_R_RESTART
 static qboolean sdl_needs_restart;
@@ -468,16 +580,25 @@ static keynum_t buttonremap[18] =
 void Sys_SendKeyEvents( void )
 {
        static qboolean sound_active = true;
+       int keycode;
        SDL_Event event;
 
        while( SDL_PollEvent( &event ) )
                switch( event.type ) {
                        case SDL_QUIT:
+#if !(SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION == 2)
+#ifdef WIN32
+                               if (MessageBox( NULL, "Are you sure you want to quit?", "Confirm Exit", MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION ) == IDNO)
+                                       return 0;
+#endif
+#endif
                                Sys_Quit(0);
                                break;
                        case SDL_KEYDOWN:
                        case SDL_KEYUP:
-                               Key_Event( MapKey( event.key.keysym.sym ), event.key.keysym.unicode, (event.key.state == SDL_PRESSED) );
+                               keycode = MapKey(event.key.keysym.sym);
+                               if (!IN_JoystickBlockDoubledKeyEvents(keycode))
+                                       Key_Event(keycode, event.key.keysym.unicode, (event.key.state == SDL_PRESSED));
                                break;
                        case SDL_ACTIVEEVENT:
                                if( event.active.state & SDL_APPACTIVE )
@@ -506,6 +627,16 @@ void Sys_SendKeyEvents( void )
                                        vid.width = event.resize.w;
                                        vid.height = event.resize.h;
                                        SDL_SetVideoMode(vid.width, vid.height, video_bpp, video_flags);
+                                       if (vid_softsurface)
+                                       {
+                                               SDL_FreeSurface(vid_softsurface);
+                                               vid_softsurface = SDL_CreateRGBSurface(SDL_SWSURFACE, vid.width, vid.height, 32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000);
+                                               vid.softpixels = (unsigned int *)vid_softsurface->pixels;
+                                               SDL_SetAlpha(vid_softsurface, 0, 255);
+                                               if (vid.softdepthpixels)
+                                                       free(vid.softdepthpixels);
+                                               vid.softdepthpixels = (unsigned int*)calloc(1, vid.width * vid.height * 4);
+                                       }
 #ifdef SDL_R_RESTART
                                        // better not call R_Modules_Restart from here directly, as this may wreak havoc...
                                        // so, let's better queue it for next frame
@@ -549,14 +680,20 @@ void *GL_GetProcAddress(const char *name)
        return p;
 }
 
+#if SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION == 2
 static int Sys_EventFilter( SDL_Event *event );
+#endif
 static qboolean vid_sdl_initjoysticksystem = false;
 
 void VID_Init (void)
 {
+#ifndef __IPHONEOS__
 #ifdef MACOSX
        Cvar_RegisterVariable(&apple_mouse_noaccel);
 #endif
+#endif
+       Cvar_RegisterVariable(&vid_soft);
+       Cvar_RegisterVariable(&vid_soft_threads);
        Cvar_RegisterVariable(&joy_detected);
        Cvar_RegisterVariable(&joy_enable);
        Cvar_RegisterVariable(&joy_index);
@@ -578,6 +715,7 @@ void VID_Init (void)
        Cvar_RegisterVariable(&joy_sensitivitypitch);
        Cvar_RegisterVariable(&joy_sensitivityyaw);
        //Cvar_RegisterVariable(&joy_sensitivityroll);
+       Cvar_RegisterVariable(&joy_axiskeyevents);
        
 #ifdef SDL_R_RESTART
        R_RegisterModule("SDL", sdl_start, sdl_shutdown, sdl_newmap, NULL, NULL);
@@ -585,7 +723,7 @@ void VID_Init (void)
 
        if (SDL_Init(SDL_INIT_VIDEO) < 0)
                Sys_Error ("Failed to init SDL video subsystem: %s", SDL_GetError());
-       vid_sdl_initjoysticksystem = SDL_Init(SDL_INIT_JOYSTICK) >= 0;
+       vid_sdl_initjoysticksystem = SDL_InitSubSystem(SDL_INIT_JOYSTICK) >= 0;
        if (vid_sdl_initjoysticksystem)
                Con_Printf("Failed to init SDL joystick subsystem: %s\n", SDL_GetError());
        vid_isfullscreen = false;
@@ -788,6 +926,8 @@ static void VID_SetIcon_Pre(void)
 }
 static void VID_SetIcon_Post(void)
 {
+#if SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION == 2
+// LordHavoc: info.info.x11.lock_func and accompanying code do not seem to compile with SDL 1.3
 #if SDL_VIDEO_DRIVER_X11 && !SDL_VIDEO_DRIVER_QUARTZ
        int j;
        char *data;
@@ -841,6 +981,7 @@ static void VID_SetIcon_Post(void)
                }
        }
 #endif
+#endif
 }
 
 
@@ -860,9 +1001,10 @@ static void VID_OutputVersion(void)
                                        version->major, version->minor, version->patch );
 }
 
-qboolean VID_InitMode(viddef_mode_t *mode)
+qboolean VID_InitModeGL(viddef_mode_t *mode)
 {
        int i;
+// FIXME SDL_SetVideoMode
        static int notfirstvideomode = false;
        int flags = SDL_OPENGL;
        const char *drivername;
@@ -932,15 +1074,19 @@ qboolean VID_InitMode(viddef_mode_t *mode)
        }
        if (mode->stereobuffer)
                SDL_GL_SetAttribute (SDL_GL_STEREO, 1);
-       if (vid_vsync.integer)
-               SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
-       else
-               SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 0);
        if (mode->samples > 1)
        {
                SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
                SDL_GL_SetAttribute (SDL_GL_MULTISAMPLESAMPLES, mode->samples);
        }
+#if SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION == 2
+       if (vid_vsync.integer)
+               SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
+       else
+               SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 0);
+#else
+       // TODO: SDL_GL_CONTEXT_MAJOR_VERSION, SDL_GL_CONTEXT_MINOR_VERSION
+#endif
 
        video_bpp = mode->bitsperpixel;
        video_flags = flags;
@@ -955,15 +1101,25 @@ qboolean VID_InitMode(viddef_mode_t *mode)
                return false;
        }
 
+       vid_softsurface = NULL;
+       vid.softpixels = NULL;
+
        // set window title
        VID_SetCaption();
+#if SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION == 2
        // set up an event filter to ask confirmation on close button in WIN32
        SDL_SetEventFilter( (SDL_EventFilter) Sys_EventFilter );
+#endif
        // init keyboard
        SDL_EnableUNICODE( SDL_ENABLE );
        // enable key repeat since everyone expects it
        SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 
+#if !(SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION == 2)
+       SDL_GL_SetSwapInterval(vid_vsync.integer != 0);
+       vid_usingvsync = (vid_vsync.integer != 0);
+#endif
+
        gl_platform = "SDL";
        gl_platformextensions = "";
 
@@ -995,11 +1151,185 @@ qboolean VID_InitMode(viddef_mode_t *mode)
        return true;
 }
 
+extern cvar_t gl_info_extensions;
+extern cvar_t gl_info_vendor;
+extern cvar_t gl_info_renderer;
+extern cvar_t gl_info_version;
+extern cvar_t gl_info_platform;
+extern cvar_t gl_info_driver;
+
+qboolean VID_InitModeSoft(viddef_mode_t *mode)
+{
+// FIXME SDL_SetVideoMode
+       int i;
+       int flags = SDL_HWSURFACE;
+
+       win_half_width = mode->width>>1;
+       win_half_height = mode->height>>1;
+
+       if(vid_resizable.integer)
+               flags |= SDL_RESIZABLE;
+
+       VID_OutputVersion();
+
+       vid_isfullscreen = false;
+       if (mode->fullscreen) {
+               flags |= SDL_FULLSCREEN;
+               vid_isfullscreen = true;
+       }
+
+       video_bpp = mode->bitsperpixel;
+       video_flags = flags;
+       VID_SetIcon_Pre();
+       screen = SDL_SetVideoMode(mode->width, mode->height, mode->bitsperpixel, flags);
+       VID_SetIcon_Post();
+
+       if (screen == NULL)
+       {
+               Con_Printf("Failed to set video mode to %ix%i: %s\n", mode->width, mode->height, SDL_GetError());
+               VID_Shutdown();
+               return false;
+       }
+
+       // create a framebuffer using our specific color format, we let the SDL blit function convert it in VID_Finish
+       vid_softsurface = SDL_CreateRGBSurface(SDL_SWSURFACE, mode->width, mode->height, 32, 0x00FF0000, 0x0000FF00, 0x00000000FF, 0xFF000000);
+       if (vid_softsurface == NULL)
+       {
+               Con_Printf("Failed to setup software rasterizer framebuffer %ix%ix32bpp: %s\n", mode->width, mode->height, SDL_GetError());
+               VID_Shutdown();
+               return false;
+       }
+       SDL_SetAlpha(vid_softsurface, 0, 255);
+
+       vid.softpixels = (unsigned int *)vid_softsurface->pixels;
+       vid.softdepthpixels = (unsigned int *)calloc(1, mode->width * mode->height * 4);
+       DPSOFTRAST_Init(mode->width, mode->height, vid_soft_threads.integer, (unsigned int *)vid_softsurface->pixels, (unsigned int *)vid.softdepthpixels);
+
+       // set window title
+       VID_SetCaption();
+       // set up an event filter to ask confirmation on close button in WIN32
+#if SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION == 2
+       SDL_SetEventFilter( (SDL_EventFilter) Sys_EventFilter );
+#endif
+       // init keyboard
+       SDL_EnableUNICODE( SDL_ENABLE );
+       // enable key repeat since everyone expects it
+       SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+
+       gl_platform = "SDLSoft";
+       gl_platformextensions = "";
+
+       gl_renderer = "DarkPlaces-Soft";
+       gl_vendor = "Forest Hale";
+       gl_version = "0.0";
+       gl_extensions = "";
+
+       // clear the extension flags
+       memset(&vid.support, 0, sizeof(vid.support));
+       Cvar_SetQuick(&gl_info_extensions, "");
+
+       vid.forcevbo = false;
+       vid.support.arb_depth_texture = true;
+       vid.support.arb_draw_buffers = true;
+       vid.support.arb_occlusion_query = true;
+       vid.support.arb_shadow = true;
+       //vid.support.arb_texture_compression = true;
+       vid.support.arb_texture_cube_map = true;
+       vid.support.arb_texture_non_power_of_two = false;
+       vid.support.arb_vertex_buffer_object = true;
+       vid.support.ext_blend_subtract = true;
+       vid.support.ext_draw_range_elements = true;
+       vid.support.ext_framebuffer_object = true;
+       vid.support.ext_texture_3d = true;
+       //vid.support.ext_texture_compression_s3tc = true;
+       vid.support.ext_texture_filter_anisotropic = true;
+       vid.support.ati_separate_stencil = true;
+
+       vid.maxtexturesize_2d = 16384;
+       vid.maxtexturesize_3d = 512;
+       vid.maxtexturesize_cubemap = 16384;
+       vid.texunits = 4;
+       vid.teximageunits = 32;
+       vid.texarrayunits = 8;
+       vid.max_anisotropy = 1;
+       vid.maxdrawbuffers = 4;
+
+       vid.texunits = bound(4, vid.texunits, MAX_TEXTUREUNITS);
+       vid.teximageunits = bound(16, vid.teximageunits, MAX_TEXTUREUNITS);
+       vid.texarrayunits = bound(8, vid.texarrayunits, MAX_TEXTUREUNITS);
+       Con_DPrintf("Using DarkPlaces Software Rasterizer rendering path\n");
+       vid.renderpath = RENDERPATH_SOFT;
+       vid.useinterleavedarrays = false;
+
+       Cvar_SetQuick(&gl_info_vendor, gl_vendor);
+       Cvar_SetQuick(&gl_info_renderer, gl_renderer);
+       Cvar_SetQuick(&gl_info_version, gl_version);
+       Cvar_SetQuick(&gl_info_platform, gl_platform ? gl_platform : "");
+       Cvar_SetQuick(&gl_info_driver, gl_driver);
+
+       // LordHavoc: report supported extensions
+       Con_DPrintf("\nQuakeC extensions for server and client: %s\nQuakeC extensions for menu: %s\n", vm_sv_extensions, vm_m_extensions );
+
+       // clear to black (loading plaque will be seen over this)
+       GL_Clear(GL_COLOR_BUFFER_BIT, NULL, 1.0f, 128);
+
+       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;
+       vid_usinghidecursor = false;
+
+       SDL_WM_GrabInput(SDL_GRAB_OFF);
+       return true;
+}
+
+qboolean VID_InitMode(viddef_mode_t *mode)
+{
+       if (!SDL_WasInit(SDL_INIT_VIDEO) && SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
+               Sys_Error ("Failed to init SDL video subsystem: %s", SDL_GetError());
+#ifdef SSE2_PRESENT
+       if (vid_soft.integer)
+               return VID_InitModeSoft(mode);
+       else
+#endif
+               return VID_InitModeGL(mode);
+}
+
 void VID_Shutdown (void)
 {
        VID_SetMouse(false, false, false);
        VID_RestoreSystemGamma();
 
+#ifndef WIN32
+       if (icon)
+               SDL_FreeSurface(icon);
+       icon = NULL;
+#endif
+
+       if (vid_softsurface)
+               SDL_FreeSurface(vid_softsurface);
+       vid_softsurface = NULL;
+       vid.softpixels = NULL;
+       if (vid.softdepthpixels)
+               free(vid.softdepthpixels);
+       vid.softdepthpixels = NULL;
+
        SDL_QuitSubSystem(SDL_INIT_VIDEO);
 
        gl_driver[0] = 0;
@@ -1036,12 +1366,42 @@ void VID_Finish (void)
 
        if (!vid_hidden)
        {
-               CHECKGLERROR
-               if (r_speeds.integer == 2 || gl_finish.integer)
+               switch(vid.renderpath)
                {
-                       qglFinish();CHECKGLERROR
+               case RENDERPATH_GL11:
+               case RENDERPATH_GL13:
+               case RENDERPATH_GL20:
+               case RENDERPATH_CGGL:
+                       CHECKGLERROR
+                       if (r_speeds.integer == 2 || gl_finish.integer)
+                       {
+                               qglFinish();CHECKGLERROR
+                       }
+#if !(SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION == 2)
+{
+       qboolean vid_usevsync;
+       vid_usevsync = (vid_vsync.integer && !cls.timedemo);
+       if (vid_usingvsync != vid_usevsync)
+       {
+               if (SDL_GL_SetSwapInterval(vid_usevsync != 0) >= 0)
+                       Con_DPrintf("Vsync %s\n", vid_usevsync ? "activated" : "deactivated");
+               else
+                       Con_DPrintf("ERROR: can't %s vsync\n", vid_usevsync ? "activate" : "deactivate");
+       }
+}
+#endif
+                       SDL_GL_SwapBuffers();
+                       break;
+               case RENDERPATH_SOFT:
+                       DPSOFTRAST_Flush();
+                       SDL_BlitSurface(vid_softsurface, NULL, screen, NULL);
+                       SDL_Flip(screen);
+                       break;
+               case RENDERPATH_D3D9:
+               case RENDERPATH_D3D10:
+               case RENDERPATH_D3D11:
+                       break;
                }
-               SDL_GL_SwapBuffers();
        }
 }