X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_sdl.c;h=d6123be70d8829eb87be09fc6b8b51536d7d1a82;hb=dfd0f25d0d8f8a17868ca8657df5c25d08925149;hp=0bdfbf5517237e8bb5b8afeeb88975442880b535;hpb=a2535521709ba873592188925ed1c9c170eb662c;p=xonotic%2Fdarkplaces.git diff --git a/vid_sdl.c b/vid_sdl.c index 0bdfbf55..d6123be7 100644 --- a/vid_sdl.c +++ b/vid_sdl.c @@ -49,7 +49,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,29 +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) { - //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_ignoremousemoves = 2; - 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_ignoremousemoves = 2; - SDL_WM_GrabInput( SDL_GRAB_OFF ); - SDL_ShowCursor( SDL_ENABLE ); - } + vid_usinghidecursor = hidecursor; + SDL_ShowCursor( hidecursor ? SDL_DISABLE : SDL_ENABLE); } } @@ -276,13 +266,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) { @@ -305,6 +295,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]; @@ -331,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] = @@ -491,9 +486,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 +512,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 +534,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 +577,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 +603,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 +624,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 +660,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 +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()); @@ -717,21 +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; - - 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_videosyncavailable = true; GL_Init(); @@ -755,6 +753,7 @@ 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; @@ -762,11 +761,15 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate 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) @@ -779,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(); @@ -794,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)