]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - vid_sdl.c
disable joystick by default, and make joy_enable saved;
[xonotic/darkplaces.git] / vid_sdl.c
index 22376f66019de4db68f4c106f44337bd5abdcb8e..0bdfbf5517237e8bb5b8afeeb88975442880b535 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -16,19 +16,19 @@ 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.
 */
-#include "quakedef.h"
-
 #undef WIN32_LEAN_AND_MEAN  //hush a warning, SDL.h redefines this
 #include <SDL.h>
 #include <stdio.h>
 
+#include "quakedef.h"
+
 // Tell startup code that we have a client
 int cl_available = true;
 
 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_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"};
 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"};
@@ -241,10 +241,8 @@ static void IN_Activate( qboolean grab )
                if (!vid_usingmouse)
                {
                        vid_usingmouse = true;
-                       cl_ignoremousemove = true;
-                       if(vid_grabkeyboard.integer) {
-                               SDL_WM_GrabInput( SDL_GRAB_ON );
-                       }
+                       cl_ignoremousemoves = 2;
+                       SDL_WM_GrabInput( SDL_GRAB_ON );
                        SDL_ShowCursor( SDL_DISABLE );
                }               
        }
@@ -253,10 +251,8 @@ static void IN_Activate( qboolean grab )
                if (vid_usingmouse)
                {
                        vid_usingmouse = false;
-                       cl_ignoremousemove = true;
-                       if(vid_grabkeyboard.integer) {
-                               SDL_WM_GrabInput( SDL_GRAB_OFF );
-                       }
+                       cl_ignoremousemoves = 2;
+                       SDL_WM_GrabInput( SDL_GRAB_OFF );
                        SDL_ShowCursor( SDL_ENABLE );
                }
        }
@@ -501,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 );
@@ -593,6 +698,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
 
        video_bpp = bpp;
        video_flags = flags;
+       VID_SetIcon();
        screen = SDL_SetVideoMode(width, height, bpp, flags);
        
        if (screen == NULL)
@@ -621,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();
@@ -644,8 +756,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        vid_activewindow = false;
        vid_usingmouse = false;
 
-       if(!vid_grabkeyboard.integer)
-               SDL_WM_GrabInput(SDL_GRAB_OFF);
+       SDL_WM_GrabInput(SDL_GRAB_OFF);
        return true;
 }