implemented threaded audio mixing for SDL client (required some

[xonotic/darkplaces.git] / vid_sdl.c

diff --git a/vid_sdl.c b/vid_sdl.c
index 0bdfbf5517237e8bb5b8afeeb88975442880b535..872f8cffe30e49b061ee73a235c937961fbcb55d 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -244,7 +244,7 @@ static void IN_Activate( qboolean grab )
                        cl_ignoremousemoves = 2;
                        SDL_WM_GrabInput( SDL_GRAB_ON );
                        SDL_ShowCursor( SDL_DISABLE );
-               }               
+               }
        }
        else
        {
@@ -282,7 +282,7 @@ void IN_Move( void )
                {
                        // have the mouse stuck in the middle, example use: prevent expose effect of beryl during the game when not using
                        // window grabbing. --blub
-                       
+
                        // we need 2 frames to initialize the center position
                        if(!stuck)
                        {
@@ -331,14 +331,14 @@ void IN_Move( void )
 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
+       if (event->type == SDL_QUIT)
+       {
 #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
-               return 1;
-#else
-       return 1;
+               if (MessageBox( NULL, "Are you sure you want to quit?", "Confirm Exit", MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION ) == IDNO)
+                       return 0;
 #endif
+       }
+       return 1;
 }
 
 static keynum_t buttonremap[18] =
@@ -491,9 +491,15 @@ static void VID_SetCaption()
 
        icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) );
 #ifndef _W64 //If Windows 64bit data types don't exist
+#ifndef SetClassLongPtr
 #define SetClassLongPtr SetClassLong
+#endif
+#ifndef GCLP_HICON
 #define GCLP_HICON GCL_HICON
+#endif
+#ifndef LONG_PTR
 #define LONG_PTR LONG
+#endif
 #endif
        SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
 }
@@ -511,12 +517,12 @@ static void VID_SetIcon()
         * Somewhat restricted XPM reader. Only supports XPMs saved by GIMP 2.4 at
         * default settings with less than 91 colors and transparency.
         */
-               
+
        int width, height, colors, isize, i, j;
        int thenone = -1;
        static SDL_Color palette[256];
        unsigned short palenc[256]; // store color id by char
-               
+
        char **idata = ENGINE_ICON;
        char *data = idata[0];
 
@@ -533,7 +539,7 @@ static void VID_SetIcon()
                Con_Printf("This XPM's palette is either huge or idiotically unoptimized. It's key size is %i\n", isize);
                return;
        }
-               
+
        for(i = 0; i < colors; ++i)
        {
                int r, g, b;
@@ -576,7 +582,7 @@ static void VID_SetIcon()
                        data[j * width + i] = palenc[((unsigned char*)idata[colors+j+1])[i]];
                }
        }
-               
+
        if(icon != NULL)
        {
                // SDL_FreeSurface should free the data too
@@ -602,7 +608,7 @@ static void VID_SetIcon()
        icon->pixels = data;
        SDL_SetPalette(icon, SDL_PHYSPAL|SDL_LOGPAL, palette, 0, colors);
        SDL_SetColorKey(icon, SDL_SRCCOLORKEY, thenone);
-               
+
        SDL_WM_SetIcon(icon, NULL);
 }
 
@@ -623,7 +629,7 @@ static void VID_OutputVersion()
                                        version->major, version->minor, version->patch );
 }
 
-int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer)
+int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples)
 {
        int i;
        static int notfirstvideomode = false;
@@ -659,7 +665,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
                Con_Printf("Unable to load GL driver \"%s\": %s\n", drivername, SDL_GetError());
                return false;
        }
-       
+
        if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL)
        {
                VID_Shutdown();
@@ -688,19 +694,28 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        }
        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_RED_SIZE, 5);
+               SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
+               SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
                SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
        }
        if (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 (samples > 1)
+       {
+               SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
+               SDL_GL_SetAttribute (SDL_GL_MULTISAMPLESAMPLES, samples);
+       }
 
        video_bpp = bpp;
        video_flags = flags;
        VID_SetIcon();
        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());