]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - vid_sdl.c
huge audit of dprints throughout engine, all notices of successfully
[xonotic/darkplaces.git] / vid_sdl.c
index 43096f3920df45cb5131073b45005f89499f1a69..8b41854a43983fd85a9cda6c095a0aa20cdb587d 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -49,7 +49,6 @@ 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_isfullscreen;
 static int vid_numjoysticks = 0;
@@ -58,8 +57,7 @@ static SDL_Joystick *vid_joysticks[MAX_JOYSTICKS];
 
 static int win_half_width = 50;
 static int win_half_height = 50;
-static int stick_mouse = 0;
-static int grab_input = 1;
+static int video_bpp, video_flags;
 
 static SDL_Surface *screen;
 
@@ -243,10 +241,8 @@ static void IN_Activate( qboolean grab )
                if (!vid_usingmouse)
                {
                        vid_usingmouse = true;
-                       cl_ignoremousemove = true;
-                       if(grab_input) {
-                               SDL_WM_GrabInput( SDL_GRAB_ON );
-                       }
+                       cl_ignoremousemoves = 2;
+                       SDL_WM_GrabInput( SDL_GRAB_ON );
                        SDL_ShowCursor( SDL_DISABLE );
                }               
        }
@@ -255,10 +251,8 @@ static void IN_Activate( qboolean grab )
                if (vid_usingmouse)
                {
                        vid_usingmouse = false;
-                       cl_ignoremousemove = true;
-                       if(grab_input) {
-                               SDL_WM_GrabInput( SDL_GRAB_OFF );
-                       }
+                       cl_ignoremousemoves = 2;
+                       SDL_WM_GrabInput( SDL_GRAB_OFF );
                        SDL_ShowCursor( SDL_ENABLE );
                }
        }
@@ -284,7 +278,7 @@ void IN_Move( void )
        int x, y;
        if( vid_usingmouse )
        {
-               if(stick_mouse)
+               if(vid_stick_mouse.integer)
                {
                        // have the mouse stuck in the middle, example use: prevent expose effect of beryl during the game when not using
                        // window grabbing. --blub
@@ -404,6 +398,14 @@ void Sys_SendKeyEvents( void )
                                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;
+                       case SDL_VIDEORESIZE:
+                               if(vid_resizable.integer < 2)
+                               {
+                                       vid.width = event.resize.w;
+                                       vid.height = event.resize.h;
+                                       SDL_SetVideoMode(vid.width, vid.height, video_bpp, video_flags);
+                               }
+                               break;
                }
 
        // enable/disable sound on focus gain/loss
@@ -495,7 +497,116 @@ static void VID_SetCaption()
 #endif
        SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
 }
+static void VID_SetIcon()
+{
+}
 #else
+// Adding the OS independent XPM version --blub
+#include "darkplaces.xpm"
+#include "nexuiz.xpm"
+static SDL_Surface *icon = NULL;
+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];
+
+       if(sscanf(data, "%i %i %i %i", &width, &height, &colors, &isize) != 4)
+       {
+               // NOTE: Only 1-char colornames are supported
+               Con_Printf("Sorry, but this does not even look similar to an XPM.\n");
+               return;
+       }
+
+       if(isize != 1)
+       {
+               // NOTE: Only 1-char colornames are supported
+               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;
+               char idx;
+
+               if(sscanf(idata[i+1], "%c c #%02x%02x%02x", &idx, &r, &g, &b) != 4)
+               {
+                       char foo[2];
+                       if(sscanf(idata[i+1], "%c c Non%1[e]", &idx, foo) != 2) // I take the DailyWTF credit for this. --div0
+                       {
+                               Con_Printf("This XPM's palette looks odd. Can't continue.\n");
+                               return;
+                       }
+                       else
+                       {
+                               palette[i].r = 255; // color key
+                               palette[i].g = 0;
+                               palette[i].b = 255;
+                               thenone = i; // weeeee
+                       }
+               }
+               else
+               {
+                       palette[i].r = r - (r == 255 && g == 0 && b == 255); // change 255/0/255 pink to 254/0/255 for color key
+                       palette[i].g = g;
+                       palette[i].b = b;
+               }
+
+               palenc[(unsigned char) idx] = i;
+       }
+
+       // allocate the image data
+       data = (char*) malloc(width*height);
+
+       for(j = 0; j < height; ++j)
+       {
+               for(i = 0; i < width; ++i)
+               {
+                       // casting to the safest possible datatypes ^^
+                       data[j * width + i] = palenc[((unsigned char*)idata[colors+j+1])[i]];
+               }
+       }
+               
+       if(icon != NULL)
+       {
+               // SDL_FreeSurface should free the data too
+               // but for completeness' sake...
+               if(icon->flags & SDL_PREALLOC)
+               {
+                       free(icon->pixels);
+                       icon->pixels = NULL; // safety
+               }
+               SDL_FreeSurface(icon);
+       }
+
+       icon = SDL_CreateRGBSurface(SDL_SRCCOLORKEY, width, height, 8, 0,0,0,0);// rmask, gmask, bmask, amask); no mask needed
+       // 8 bit surfaces get an empty palette allocated according to the docs
+       // so it's a palette image for sure :) no endian check necessary for the mask
+
+       if(icon == NULL) {
+               Con_Printf(     "Failed to create surface for the window Icon!\n"
+                               "%s\n", SDL_GetError());
+               free(data);
+               return;
+       }
+       icon->pixels = data;
+       SDL_SetPalette(icon, SDL_PHYSPAL|SDL_LOGPAL, palette, 0, colors);
+       SDL_SetColorKey(icon, SDL_SRCCOLORKEY, thenone);
+               
+       SDL_WM_SetIcon(icon, NULL);
+}
+
+
 static void VID_SetCaption()
 {
        SDL_WM_SetCaption( gamename, NULL );
@@ -522,6 +633,9 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        win_half_width = width>>1;
        win_half_height = height>>1;
 
+       if(vid_resizable.integer)
+               flags |= SDL_RESIZABLE;
+
        VID_OutputVersion();
 
        /*
@@ -545,18 +659,6 @@ 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(COM_CheckParm("-resizable")) {
-               flags |= SDL_RESIZABLE;
-       }
-          
-       stick_mouse = COM_CheckParm("-stick_mouse");
-       if(COM_CheckParm("-no_input_grabbing")) {
-               grab_input = 0;
-       } else {
-               grab_input = 1;
-       }
        
        if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL)
        {
@@ -594,6 +696,9 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        if (stereobuffer)
                SDL_GL_SetAttribute (SDL_GL_STEREO, 1);
 
+       video_bpp = bpp;
+       video_flags = flags;
+       VID_SetIcon();
        screen = SDL_SetVideoMode(width, height, bpp, flags);
        
        if (screen == NULL)
@@ -622,6 +727,12 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        gl_platformextensions = "";
        gl_videosyncavailable = false;
 
+       Con_DPrintf("GL_VENDOR: %s\n", gl_vendor);
+       Con_DPrintf("GL_RENDERER: %s\n", gl_renderer);
+       Con_DPrintf("GL_VERSION: %s\n", gl_version);
+       Con_DPrintf("GL_EXTENSIONS: %s\n", gl_extensions);
+       Con_DPrintf("%s_EXTENSIONS: %s\n", gl_platform, gl_platformextensions);
+
        GL_Init();
 
        vid_numjoysticks = SDL_NumJoysticks();
@@ -645,8 +756,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        vid_activewindow = false;
        vid_usingmouse = false;
 
-       if(!grab_input)
-               SDL_WM_GrabInput(SDL_GRAB_OFF);
+       SDL_WM_GrabInput(SDL_GRAB_OFF);
        return true;
 }