X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_sdl.c;h=c87dbe7454a845502ef786a1ed9db24aa417a531;hp=69a11d756d8034df4b58939df31cde6d701d3882;hb=cb872df2ca589d4b30c733dc239986dfd64f0c12;hpb=6631251252a526c873d18d381d26a47bafe5ab51 diff --git a/vid_sdl.c b/vid_sdl.c index 69a11d75..c87dbe74 100644 --- a/vid_sdl.c +++ b/vid_sdl.c @@ -16,14 +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. */ -/* -TODOs until first commit: - 1. Hide and/or show the mouse whether the mainwindow is focused or not. - 2. Minimize when losing focus in fullscreen mode. -d 3. GrabInput while mainwindow is active. - 4 - -*/ +#undef WIN32_LEAN_AND_MEAN //hush a warning, SDL.h redefines this #include #include @@ -31,15 +24,13 @@ d 3. GrabInput while mainwindow is active. // Tell startup code that we have a client int cl_available = true; -static int vid_usingmouse; -static int vid_isfullscreen; -static SDL_Surface *screen; +qboolean vid_supportrefreshrate = false; -static Uint8 in_mouse_buttons; +static qboolean vid_usingmouse; +static qboolean vid_isfullscreen; -static void IN_Init( void ); -static void IN_Shutdown( void ); +static SDL_Surface *screen; ///////////////////////// // Input handling @@ -52,7 +43,7 @@ static void IN_Shutdown( void ); #define tenoh 0,0,0,0,0, 0,0,0,0,0 #define fiftyoh tenoh, tenoh, tenoh, tenoh, tenoh #define hundredoh fiftyoh, fiftyoh -static unsigned int tbl_sdltoquake[] = +static unsigned int tbl_sdltoquake[] = { 0,0,0,0, //SDLK_UNKNOWN = 0, 0,0,0,0, //SDLK_FIRST = 0, @@ -205,88 +196,87 @@ static unsigned int tbl_sdltoquake[] = #undef fiftyoh #undef hundredoh -static int MapKey( int sdlkey ) +static int MapKey( unsigned int sdlkey ) { if( sdlkey > sizeof(tbl_sdltoquake)/ sizeof(int) ) return 0; return tbl_sdltoquake[ sdlkey ]; } -static void IN_Activate( void ) -{ - SDL_WM_GrabInput( SDL_GRAB_ON ); - SDL_ShowCursor( SDL_DISABLE ); -} - -static void IN_Deactivate( void ) -{ - SDL_WM_GrabInput( SDL_GRAB_OFF ); - SDL_ShowCursor( SDL_ENABLE ); -} - -void IN_Commands (void) +static void IN_Activate( qboolean grab ) { -} - -static void IN_MouseMove (usercmd_t *cmd) -{ - int x, y; - Uint8 state; - int i; - - if( !vid_usingmouse ) { - IN_Mouse( cmd, 0, 0 ); - return; + if (grab) + { + if (!vid_usingmouse) + { + vid_usingmouse = true; + cl_ignoremousemove = true; + SDL_WM_GrabInput( SDL_GRAB_ON ); + SDL_ShowCursor( SDL_DISABLE ); + } + } + else + { + if (vid_usingmouse) + { + vid_usingmouse = false; + cl_ignoremousemove = true; + SDL_WM_GrabInput( SDL_GRAB_OFF ); + SDL_ShowCursor( SDL_ENABLE ); + } } - - state = SDL_GetRelativeMouseState( &x, &y ); - for( i = 0; i < 8 ; i++ ) - if( state & ~in_mouse_buttons & 1 << i ) - Key_Event( K_MOUSE1 + i, 0, true ); - else if( ~state & in_mouse_buttons & 1 << i ) - Key_Event( K_MOUSE1 + i, 0, false ); - - in_mouse_buttons = state; - - IN_Mouse( cmd, x, y ); -} - -void IN_Move( usercmd_t *cmd ) -{ - IN_MouseMove( cmd ); -} - -static void IN_Init( void ) -{ - // init keyboard - SDL_EnableUNICODE( SDL_ENABLE ); - - // init mouse - in_mouse_buttons = SDL_GetMouseState( NULL, NULL ); - vid_usingmouse = false; } -static void IN_Shutdown( void ) +void IN_Move( void ) { + if( vid_usingmouse ) + { + int x, y; + SDL_GetRelativeMouseState( &x, &y ); + in_mouse_x = x; + in_mouse_y = y; + } } ///////////////////// // Message Handling //// -static int Sys_EventFilter( SDL_Event *event ) +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 #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 + else return 1; #else return 1; #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; @@ -298,14 +288,24 @@ void Sys_SendKeyEvents( void ) break; case SDL_KEYDOWN: case SDL_KEYUP: - Key_Event( MapKey( event.key.keysym.sym ), event.key.keysym.unicode, (event.key.state == SDL_PRESSED) ); + Key_Event( MapKey( event.key.keysym.sym ), (char)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; else vid_hidden = true; + } + break; + case SDL_MOUSEBUTTONDOWN: + if (event.button.button <= 18) + Key_Event( buttonremap[event.button.button - 1], 0, true ); + break; + case SDL_MOUSEBUTTONUP: + if (event.button.button <= 18) + Key_Event( buttonremap[event.button.button - 1], 0, false ); break; } } @@ -325,65 +325,112 @@ 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; +} - SDL_SetEventFilter( (SDL_EventFilter) Sys_EventFilter ); - IN_Init(); +// set the icon (we dont use SDL here since it would be too much a PITA) +#ifdef WIN32 +#include "resource.h" +#include +static void VID_SetCaption() +{ + SDL_SysWMinfo info; + HICON icon; + + // set the caption + SDL_WM_SetCaption( gamename, NULL ); + + // get the HWND handle + SDL_VERSION( &info.version ); + if( !SDL_GetWMInfo( &info ) ) + return; + + icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) ); +#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() +{ + SDL_WM_SetCaption( gamename, NULL ); +} +#endif + +static void VID_OutputVersion() +{ + const SDL_version *version; + version = SDL_Linked_Version(); + Con_Printf( "Linked against SDL version %d.%d.%d\n" + "Using SDL library version %d.%d.%d\n", + SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL, + 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; const char *drivername; - /* - SDL Hack + VID_OutputVersion(); + + /* + SDL Hack We cant switch from one OpenGL video mode to another. Thus we first switch to some stupid 2D mode and then back to OpenGL. */ SDL_SetVideoMode( 0, 0, 0, 0 ); -#ifdef WIN32 - drivername = "opengl32.dll"; -#elif defined(__APPLE__) && defined(__MACH__) - drivername = "OpenGL.framework"; -#else - drivername = "libGL.so.1"; -#endif + // SDL usually knows best + drivername = NULL; +// COMMANDLINEOPTION: SDL GL: -gl_driver selects a GL driver library, default is whatever SDL recommends, useful only for 3dfxogl.dll/3dfxvgl.dll or fxmesa or similar, if you don't know what this is for, you don't need it i = COM_CheckParm("-gl_driver"); if (i && i < com_argc - 1) drivername = com_argv[i + 1]; - if (SDL_GL_LoadLibrary(drivername)) - { - Con_Printf("Unable to load GL driver \"%s\": ", drivername, SDL_GetError()); + if (SDL_GL_LoadLibrary(drivername) < 0) + { + Con_Printf("Unable to load GL driver \"%s\": %s\n", drivername, SDL_GetError()); 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; vid_isfullscreen = true; } - 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_DEPTH_SIZE, 16); SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); + if (bpp >= 32) + { + SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 8); + SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 8); + SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 8); + SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 8); + SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 24); + SDL_GL_SetAttribute (SDL_GL_STENCIL_SIZE, 8); + } + 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_DEPTH_SIZE, 16); + } screen = SDL_SetVideoMode(width, height, bpp, flags); if (screen == NULL) @@ -392,29 +439,37 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) VID_Shutdown(); return false; } - - gl_renderer = qglGetString(GL_RENDERER); - gl_vendor = qglGetString(GL_VENDOR); - gl_version = qglGetString(GL_VERSION); - gl_extensions = qglGetString(GL_EXTENSIONS); + + // set window title + VID_SetCaption(); + // set up an event filter to ask confirmation on close button in WIN32 + SDL_SetEventFilter( (SDL_EventFilter) Sys_EventFilter ); + // init keyboard + SDL_EnableUNICODE( SDL_ENABLE ); + // 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(); vid_hidden = false; vid_activewindow = false; vid_usingmouse = false; - IN_Init(); return true; } void VID_Shutdown (void) { - IN_Shutdown(); + IN_Activate(false); SDL_QuitSubSystem(SDL_INIT_VIDEO); } @@ -428,42 +483,32 @@ int VID_GetGamma (unsigned short *ramps) return !SDL_GetGammaRamp( ramps, ramps + 256, ramps + 512); } -void VID_GetWindowSize (int *x, int *y, int *width, int *height) -{ - *x = *y = 0; - *width = screen->w; - *height = screen->h; -} - -void VID_Finish (void) +void VID_Finish (qboolean allowmousegrab) { Uint8 appstate; - int vid_usemouse; + qboolean vid_usemouse; - qglFinish(); + if (r_speeds.integer || gl_finish.integer) + qglFinish(); SDL_GL_SwapBuffers(); //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 + else vid_activewindow = true; vid_usemouse = false; - if( vid_mouse.integer && !key_consoleactive ) + if( allowmousegrab && vid_mouse.integer && !key_consoleactive && !cls.demoplayback ) vid_usemouse = true; if( vid_isfullscreen ) vid_usemouse = true; if( !vid_activewindow ) vid_usemouse = false; - if( vid_usemouse && !vid_usingmouse ) { - vid_usingmouse = true; - IN_Activate(); - } else if( !vid_usemouse && vid_usingmouse ) { - vid_usingmouse = false; - IN_Deactivate(); - } + IN_Activate(vid_usemouse); }