X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_sdl.c;h=d6123be70d8829eb87be09fc6b8b51536d7d1a82;hp=af30f9cb7059451baeba06a3eff2be2edc98178e;hb=5df92adaacff0dc8663713592b13f86cbca710cb;hpb=f9dcdc3e0de79608d613dc34c5bb1d14c32fa8a8 diff --git a/vid_sdl.c b/vid_sdl.c index af30f9cb..d6123be7 100644 --- a/vid_sdl.c +++ b/vid_sdl.c @@ -28,7 +28,7 @@ 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"}; @@ -49,13 +49,17 @@ 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_usingmouse = false; +static qboolean vid_usinghidecursor = false; static qboolean vid_isfullscreen; static int vid_numjoysticks = 0; #define MAX_JOYSTICKS 8 static SDL_Joystick *vid_joysticks[MAX_JOYSTICKS]; +static int win_half_width = 50; +static int win_half_height = 50; +static int video_bpp, video_flags; + static SDL_Surface *screen; ///////////////////////// @@ -229,27 +233,18 @@ static int MapKey( unsigned int sdlkey ) return tbl_sdltoquake[ sdlkey ]; } -static void IN_Activate( qboolean grab ) +void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor) { - if (grab) + if (vid_usingmouse != relative) { - if (!vid_usingmouse) - { - vid_usingmouse = true; - cl_ignoremousemove = true; - SDL_WM_GrabInput( SDL_GRAB_ON ); - SDL_ShowCursor( SDL_DISABLE ); - } + vid_usingmouse = relative; + cl_ignoremousemoves = 2; + SDL_WM_GrabInput( relative ? SDL_GRAB_ON : SDL_GRAB_OFF ); } - else + if (vid_usinghidecursor != hidecursor) { - if (vid_usingmouse) - { - vid_usingmouse = false; - cl_ignoremousemove = true; - SDL_WM_GrabInput( SDL_GRAB_OFF ); - SDL_ShowCursor( SDL_ENABLE ); - } + vid_usinghidecursor = hidecursor; + SDL_ShowCursor( hidecursor ? SDL_DISABLE : SDL_ENABLE); } } @@ -268,13 +263,43 @@ static double IN_JoystickGetAxis(SDL_Joystick *joy, int axis, double sensitivity void IN_Move( void ) { int j; + static int old_x = 0, old_y = 0; + static int stuck = 0; int x, y; - if( vid_usingmouse ) + if (vid_usingmouse) { - SDL_GetRelativeMouseState( &x, &y ); - in_mouse_x = x; - in_mouse_y = y; + 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 + + // we need 2 frames to initialize the center position + if(!stuck) + { + SDL_WarpMouse(win_half_width, win_half_height); + SDL_GetMouseState(&x, &y); + SDL_GetRelativeMouseState(&x, &y); + ++stuck; + } else { + SDL_GetRelativeMouseState(&x, &y); + in_mouse_x = x + old_x; + in_mouse_y = y + old_y; + SDL_GetMouseState(&x, &y); + old_x = x - win_half_width; + old_y = y - win_half_height; + SDL_WarpMouse(win_half_width, win_half_height); + } + } else { + SDL_GetRelativeMouseState( &x, &y ); + in_mouse_x = x; + in_mouse_y = y; + } } + + SDL_GetMouseState(&x, &y); + in_windowmouse_x = x; + in_windowmouse_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]; @@ -301,14 +326,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] = @@ -341,7 +366,7 @@ void Sys_SendKeyEvents( void ) while( SDL_PollEvent( &event ) ) switch( event.type ) { case SDL_QUIT: - Sys_Quit(); + Sys_Quit(0); break; case SDL_KEYDOWN: case SDL_KEYUP: @@ -368,18 +393,32 @@ 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 - if (!vid_activewindow && sound_active) + if (!vid_hidden && (vid_activewindow || !snd_mutewhenidle.integer)) { - S_BlockSound (); - sound_active = false; + if (!sound_active) + { + S_UnblockSound (); + sound_active = true; + } } - else if (vid_activewindow && !sound_active) + else { - S_UnblockSound (); - sound_active = true; + if (sound_active) + { + S_BlockSound (); + sound_active = false; + } } } @@ -447,13 +486,128 @@ 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 ); } +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 ); @@ -470,13 +624,19 @@ 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; int flags = SDL_OPENGL; const char *drivername; + win_half_width = width>>1; + win_half_height = height>>1; + + if(vid_resizable.integer) + flags |= SDL_RESIZABLE; + VID_OutputVersion(); /* @@ -515,6 +675,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate flags |= SDL_FULLSCREEN; vid_isfullscreen = true; } + //flags |= SDL_HWSURFACE; SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); if (bpp >= 32) @@ -528,15 +689,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()); @@ -553,15 +727,9 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate // 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_videosyncavailable = true; GL_Init(); @@ -585,16 +753,23 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate vid_hidden = false; vid_activewindow = false; vid_usingmouse = false; + vid_usinghidecursor = false; + + SDL_WM_GrabInput(SDL_GRAB_OFF); return true; } void VID_Shutdown (void) { - // this is needed to retry gamma after a vid_restart + VID_SetMouse(false, false, false); VID_RestoreSystemGamma(); - IN_Activate(false); SDL_QuitSubSystem(SDL_INIT_VIDEO); + + gl_driver[0] = 0; + gl_extensions = ""; + gl_platform = ""; + gl_platformextensions = ""; } int VID_SetGamma (unsigned short *ramps, int rampsize) @@ -607,10 +782,9 @@ int VID_GetGamma (unsigned short *ramps, int rampsize) return !SDL_GetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2); } -void VID_Finish (qboolean allowmousegrab) +void VID_Finish (void) { Uint8 appstate; - qboolean vid_usemouse; //react on appstate changes appstate = SDL_GetAppState(); @@ -622,16 +796,6 @@ void VID_Finish (qboolean allowmousegrab) else vid_activewindow = true; - vid_usemouse = false; - 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; - - IN_Activate(vid_usemouse); - VID_UpdateGamma(false, 256); if (r_render.integer && !vid_hidden)