X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_sdl.c;h=0df9e422a0b1649ca1d809584d86c9c1bdc23d13;hp=295d8bca9174781c5b6f611c03af3a58f2bb2bc0;hb=eabf1215930a0d26f23c1c83cb36da40710b235f;hpb=d7fd66581c5ea2bdb6c6f589fb02c0c40ee6974b diff --git a/vid_sdl.c b/vid_sdl.c index 295d8bca..0df9e422 100644 --- a/vid_sdl.c +++ b/vid_sdl.c @@ -16,6 +16,7 @@ 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. */ +#undef WIN32_LEAN_AND_MEAN //hush a warning, SDL.h redefines this #include #include @@ -23,6 +24,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Tell startup code that we have a client int cl_available = true; + +qboolean vid_supportrefreshrate = false; + static qboolean vid_usingmouse; static qboolean vid_isfullscreen; @@ -251,6 +255,28 @@ static int Sys_EventFilter( SDL_Event *event ) #endif } +static keynum_t buttonremap[18] = +{ + K_MOUSE1, + K_MOUSE3, + K_MOUSE2, + K_MWHEELUP, + K_MWHEELDOWN, + K_MOUSE4, + K_MOUSE5, + K_MOUSE6, + K_MOUSE7, + K_MOUSE8, + K_MOUSE9, + K_MOUSE10, + K_MOUSE11, + K_MOUSE12, + K_MOUSE13, + K_MOUSE14, + K_MOUSE15, + K_MOUSE16, +}; + void Sys_SendKeyEvents( void ) { SDL_Event event; @@ -274,18 +300,12 @@ void Sys_SendKeyEvents( void ) } break; case SDL_MOUSEBUTTONDOWN: - if( event.button.button == SDL_BUTTON_MIDDLE ) - event.button.button = SDL_BUTTON_RIGHT; - else if( event.button.button == SDL_BUTTON_RIGHT ) - event.button.button = SDL_BUTTON_MIDDLE; - Key_Event( K_MOUSE1 + event.button.button - 1, 0, true ); + if (event.button.button <= 18) + Key_Event( buttonremap[event.button.button - 1], 0, true ); break; case SDL_MOUSEBUTTONUP: - if( event.button.button == SDL_BUTTON_MIDDLE ) - event.button.button = SDL_BUTTON_RIGHT; - else if( event.button.button == SDL_BUTTON_RIGHT ) - event.button.button = SDL_BUTTON_MIDDLE; - Key_Event( K_MOUSE1 + event.button.button - 1, 0, false ); + if (event.button.button <= 18) + Key_Event( buttonremap[event.button.button - 1], 0, false ); break; } } @@ -305,7 +325,7 @@ static int Sys_EventFilter( SDL_Event *event ); void VID_Init (void) { if (SDL_Init(SDL_INIT_VIDEO) < 0) - Sys_Error ("Failed to init video: %s\n", SDL_GetError()); + Sys_Error ("Failed to init video: %s", SDL_GetError()); vid_isfullscreen = false; } @@ -327,7 +347,12 @@ static void VID_SetCaption() return; icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) ); - SetClassLong( info.window, GCL_HICON, (LONG) icon ); +#ifndef _W64 //If Windows 64bit data types don't exist +#define SetClassLongPtr SetClassLong +#define GCLP_HICON GCL_HICON +#define LONG_PTR LONG +#endif + SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon ); } #else static void VID_SetCaption() @@ -346,7 +371,7 @@ static void VID_OutputVersion() version->major, version->minor, version->patch ); } -int VID_InitMode(int fullscreen, int width, int height, int bpp) +int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate) { int i; int flags = SDL_OPENGL; @@ -374,17 +399,15 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) return false; } - qglGetString = GL_GetProcAddress("glGetString"); - - // Knghtbrd: should do platform-specific extension string function here - - if (qglGetString == NULL) + if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL) { VID_Shutdown(); Con_Print("Required OpenGL function glGetString not found\n"); return false; } + // Knghtbrd: should do platform-specific extension string function here + vid_isfullscreen = false; if (fullscreen) { flags |= SDL_FULLSCREEN; @@ -426,10 +449,10 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) // enable key repeat since everyone expects it SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); - gl_renderer = qglGetString(GL_RENDERER); - gl_vendor = qglGetString(GL_VENDOR); - gl_version = qglGetString(GL_VERSION); - gl_extensions = qglGetString(GL_EXTENSIONS); + 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 ;) @@ -450,17 +473,17 @@ void VID_Shutdown (void) SDL_QuitSubSystem(SDL_INIT_VIDEO); } -int VID_SetGamma (unsigned short *ramps) +int VID_SetGamma (unsigned short *ramps, int rampsize) { - return !SDL_SetGammaRamp (ramps, ramps + 256, ramps + 512); + return !SDL_SetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2); } -int VID_GetGamma (unsigned short *ramps) +int VID_GetGamma (unsigned short *ramps, int rampsize) { - return !SDL_GetGammaRamp( ramps, ramps + 256, ramps + 512); + return !SDL_GetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2); } -void VID_Finish (void) +void VID_Finish (qboolean allowmousegrab) { Uint8 appstate; qboolean vid_usemouse; @@ -472,13 +495,15 @@ void VID_Finish (void) //react on appstate changes appstate = SDL_GetAppState(); - if( !( appstate & SDL_APPMOUSEFOCUS ) || !( appstate & SDL_APPINPUTFOCUS ) ) + vid_hidden = !(appstate & SDL_APPACTIVE); + + if( vid_hidden || !( appstate & SDL_APPMOUSEFOCUS ) || !( appstate & SDL_APPINPUTFOCUS ) ) vid_activewindow = false; else vid_activewindow = true; vid_usemouse = false; - if( vid_mouse.integer && !key_consoleactive && !cls.demoplayback ) + if( allowmousegrab && vid_mouse.integer && !key_consoleactive && !cls.demoplayback ) vid_usemouse = true; if( vid_isfullscreen ) vid_usemouse = true; @@ -486,4 +511,6 @@ void VID_Finish (void) vid_usemouse = false; IN_Activate(vid_usemouse); + + VID_UpdateGamma(false, 256); }