X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_sdl.c;h=9618cb611d2ebcd80884afe8fa10bc9e785c96d5;hb=2138c1a71154ae6661f42f9491f0a9e3d363d5c0;hp=39755e526f71ed4df038470ad131e35ed66cdab0;hpb=95263788ff29ba10f60227b30b219e984df4abf5;p=xonotic%2Fdarkplaces.git diff --git a/vid_sdl.c b/vid_sdl.c index 39755e52..9618cb61 100644 --- a/vid_sdl.c +++ b/vid_sdl.c @@ -18,9 +18,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #undef WIN32_LEAN_AND_MEAN //hush a warning, SDL.h redefines this #include +#include #include #include "quakedef.h" +#include "image.h" + +#ifdef WIN32 +#define SDL_R_RESTART +#endif // Tell startup code that we have a client int cl_available = true; @@ -28,7 +34,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,7 +55,8 @@ 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 @@ -232,33 +239,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) { - //SDL_WM_GrabInput( SDL_GRAB_OFF ); - //Con_Printf("< Turning off input-grabbing. --blub\n"); - if (grab) + if (vid_usingmouse != relative) { - if (!vid_usingmouse) - { - vid_usingmouse = true; - cl_ignoremousemove = true; - if(vid_grabkeyboard.integer) { - 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; - if(vid_grabkeyboard.integer) { - SDL_WM_GrabInput( SDL_GRAB_OFF ); - } - SDL_ShowCursor( SDL_ENABLE ); - } + vid_usinghidecursor = hidecursor; + SDL_ShowCursor( hidecursor ? SDL_DISABLE : SDL_ENABLE); } } @@ -280,13 +272,13 @@ void IN_Move( void ) static int old_x = 0, old_y = 0; static int stuck = 0; int x, y; - if( vid_usingmouse ) + if (vid_usingmouse) { 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) { @@ -309,6 +301,11 @@ void IN_Move( void ) 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]; @@ -335,15 +332,29 @@ 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; +} + +#ifdef SDL_R_RESTART +static qboolean sdl_needs_restart; +static void sdl_start(void) +{ +} +static void sdl_shutdown(void) +{ + sdl_needs_restart = false; +} +static void sdl_newmap(void) +{ } +#endif static keynum_t buttonremap[18] = { @@ -379,10 +390,10 @@ void Sys_SendKeyEvents( void ) break; case SDL_KEYDOWN: case SDL_KEYUP: - Key_Event( MapKey( event.key.keysym.sym ), (char)event.key.keysym.unicode, (event.key.state == SDL_PRESSED) ); + Key_Event( MapKey( event.key.keysym.sym ), event.key.keysym.unicode, (event.key.state == SDL_PRESSED) ); break; case SDL_ACTIVEEVENT: - if( event.active.state == SDL_APPACTIVE ) + if( event.active.state & SDL_APPACTIVE ) { if( event.active.gain ) vid_hidden = false; @@ -408,12 +419,21 @@ void Sys_SendKeyEvents( void ) vid.width = event.resize.w; vid.height = event.resize.h; SDL_SetVideoMode(vid.width, vid.height, video_bpp, video_flags); +#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 + if(!sdl_needs_restart) + { + Cbuf_AddText("\nr_restart\n"); + sdl_needs_restart = true; + } +#endif } break; } // enable/disable sound on focus gain/loss - if (!vid_hidden && (vid_activewindow || !snd_mutewhenidle.integer)) + if ((!vid_hidden && vid_activewindow) || !snd_mutewhenidle.integer) { if (!sound_active) { @@ -444,6 +464,7 @@ void *GL_GetProcAddress(const char *name) static int Sys_EventFilter( SDL_Event *event ); static qboolean vid_sdl_initjoysticksystem = false; + void VID_Init (void) { Cvar_RegisterVariable(&joy_detected); @@ -467,6 +488,10 @@ void VID_Init (void) Cvar_RegisterVariable(&joy_sensitivitypitch); Cvar_RegisterVariable(&joy_sensitivityyaw); //Cvar_RegisterVariable(&joy_sensitivityroll); + +#ifdef SDL_R_RESTART + R_RegisterModule("SDL", sdl_start, sdl_shutdown, sdl_newmap, NULL, NULL); +#endif if (SDL_Init(SDL_INIT_VIDEO) < 0) Sys_Error ("Failed to init SDL video subsystem: %s", SDL_GetError()); @@ -480,7 +505,7 @@ void VID_Init (void) #ifdef WIN32 #include "resource.h" #include -static void VID_SetCaption() +static void VID_SetCaption(void) { SDL_SysWMinfo info; HICON icon; @@ -495,20 +520,247 @@ 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_Pre(void) +{ +} +static void VID_SetIcon_Post(void) +{ +} #else -static void VID_SetCaption() +// Adding the OS independent XPM version --blub +#include "darkplaces.xpm" +#include "nexuiz.xpm" +static SDL_Surface *icon = NULL; +static void VID_SetIcon_Pre(void) +{ + /* + * 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 *xpm; + char **idata, *data; + const SDL_version *version; + + version = SDL_Linked_Version(); + // only use non-XPM icon support in SDL v1.3 and higher + // SDL v1.2 does not support "smooth" transparency, and thus is better + // off the xpm way + if(version->major >= 2 || (version->major == 1 && version->minor >= 3)) + { + data = (char *) loadimagepixelsbgra("darkplaces-icon", false, false, false, NULL); + if(data) + { + unsigned int red = 0x00FF0000; + unsigned int green = 0x0000FF00; + unsigned int blue = 0x000000FF; + unsigned int alpha = 0xFF000000; + width = image_width; + height = image_height; + + // reallocate with malloc, as this is in tempmempool (do not want) + xpm = data; + data = malloc(width * height * 4); + memcpy(data, xpm, width * height * 4); + Mem_Free(xpm); + xpm = NULL; + + icon = SDL_CreateRGBSurface(SDL_SRCALPHA, width, height, 32, LittleLong(red), LittleLong(green), LittleLong(blue), LittleLong(alpha)); + + if(icon == NULL) { + Con_Printf( "Failed to create surface for the window Icon!\n" + "%s\n", SDL_GetError()); + free(data); + return; + } + + icon->pixels = data; + } + } + + // we only get here if non-XPM icon was missing, or SDL version is not + // sufficient for transparent non-XPM icons + if(!icon) + { + xpm = (char *) FS_LoadFile("darkplaces-icon.xpm", tempmempool, false, NULL); + idata = NULL; + if(xpm) + idata = XPM_DecodeString(xpm); + if(!idata) + idata = ENGINE_ICON; + if(xpm) + Mem_Free(xpm); + + 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) + { + unsigned 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_SetIcon_Post(void) +{ +#if SDL_VIDEO_DRIVER_X11 && !SDL_VIDEO_DRIVER_QUARTZ + int j; + char *data; + const SDL_version *version; + + version = SDL_Linked_Version(); + // only use non-XPM icon support in SDL v1.3 and higher + // SDL v1.2 does not support "smooth" transparency, and thus is better + // off the xpm way + if(!(version->major >= 2 || (version->major == 1 && version->minor >= 3))) + { + // in this case, we did not set the good icon yet + SDL_SysWMinfo info; + SDL_VERSION(&info.version); + if(SDL_GetWMInfo(&info) == 1 && info.subsystem == SDL_SYSWM_X11) + { + data = (char *) loadimagepixelsbgra("darkplaces-icon", false, false, false, NULL); + if(data) + { + // use _NET_WM_ICON too + static long netwm_icon[MAX_NETWM_ICON]; + int pos = 0; + int i = 1; + + while(data) + { + if(pos + 2 * image_width * image_height < MAX_NETWM_ICON) + { + netwm_icon[pos++] = image_width; + netwm_icon[pos++] = image_height; + for(i = 0; i < image_height; ++i) + for(j = 0; j < image_width; ++j) + netwm_icon[pos++] = BuffLittleLong((unsigned char *) &data[(i*image_width+j)*4]); + } + else + { + Con_Printf("Skipping NETWM icon #%d because there is no space left\n", i); + } + ++i; + Mem_Free(data); + data = (char *) loadimagepixelsbgra(va("darkplaces-icon%d", i), false, false, false, NULL); + } + + info.info.x11.lock_func(); + { + Atom net_wm_icon = XInternAtom(info.info.x11.display, "_NET_WM_ICON", false); + XChangeProperty(info.info.x11.display, info.info.x11.wmwindow, net_wm_icon, XA_CARDINAL, 32, PropModeReplace, (const unsigned char *) netwm_icon, pos); + } + info.info.x11.unlock_func(); + } + } + } +#endif +} + + +static void VID_SetCaption(void) { SDL_WM_SetCaption( gamename, NULL ); } #endif -static void VID_OutputVersion() +static void VID_OutputVersion(void) { const SDL_version *version; version = SDL_Linked_Version(); @@ -518,15 +770,15 @@ 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) +qboolean VID_InitMode(viddef_mode_t *mode) { int i; static int notfirstvideomode = false; int flags = SDL_OPENGL; const char *drivername; - win_half_width = width>>1; - win_half_height = height>>1; + win_half_width = mode->width>>1; + win_half_height = mode->height>>1; if(vid_resizable.integer) flags |= SDL_RESIZABLE; @@ -554,7 +806,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(); @@ -565,14 +817,14 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate // Knghtbrd: should do platform-specific extension string function here vid_isfullscreen = false; - if (fullscreen) { + if (mode->fullscreen) { flags |= SDL_FULLSCREEN; vid_isfullscreen = true; } //flags |= SDL_HWSURFACE; SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); - if (bpp >= 32) + if (mode->bitsperpixel >= 32) { SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 8); SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 8); @@ -583,21 +835,32 @@ 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) + 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); + } - video_bpp = bpp; + video_bpp = mode->bitsperpixel; video_flags = flags; - screen = SDL_SetVideoMode(width, height, bpp, 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", width, height, SDL_GetError()); + Con_Printf("Failed to set video mode to %ix%i: %s\n", mode->width, mode->height, SDL_GetError()); VID_Shutdown(); return false; } @@ -611,15 +874,8 @@ 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_Init(); @@ -643,19 +899,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; - if(!vid_grabkeyboard.integer) - SDL_WM_GrabInput(SDL_GRAB_OFF); + 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) @@ -668,10 +928,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(); @@ -683,25 +942,37 @@ 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) + if (!vid_hidden) { CHECKGLERROR - if (r_speeds.integer || gl_finish.integer) + if (r_speeds.integer == 2 || gl_finish.integer) { qglFinish();CHECKGLERROR } SDL_GL_SwapBuffers(); } } + +size_t VID_ListModes(vid_mode_t *modes, size_t maxcount) +{ + size_t k; + SDL_Rect **vidmodes; + int bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel; + + k = 0; + for(vidmodes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE); *vidmodes; ++vidmodes) + { + if(k >= maxcount) + break; + modes[k].width = (*vidmodes)->w; + modes[k].height = (*vidmodes)->h; + modes[k].bpp = bpp; + modes[k].refreshrate = 60; // no support for refresh rate in SDL + modes[k].pixelheight_num = 1; + modes[k].pixelheight_denom = 1; // SDL does not provide this + ++k; + } + return k; +}