X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_sdl.c;h=50513fe6e24bddb6881005882cd0adfe3740b0f5;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hp=b366fd9b18baf70ff7ff427e3be6a8d6c3219cd3;hpb=be78599265318efb91ca18071f3f9356c4e5a7ea;p=xonotic%2Fdarkplaces.git diff --git a/vid_sdl.c b/vid_sdl.c index b366fd9b..50513fe6 100644 --- a/vid_sdl.c +++ b/vid_sdl.c @@ -23,14 +23,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Tell startup code that we have a client int cl_available = true; -static int vid_usingmouse; -static int vid_isfullscreen; +static qboolean vid_usingmouse; +static qboolean vid_isfullscreen; static SDL_Surface *screen; -static void IN_Init( void ); -static void IN_Shutdown( void ); - ///////////////////////// // Input handling //// @@ -42,7 +39,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, @@ -202,64 +199,52 @@ static int MapKey( unsigned int sdlkey ) 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; - - 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 ); + } } - - SDL_GetRelativeMouseState( &x, &y ); - 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 - 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; @@ -277,10 +262,10 @@ 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; @@ -289,14 +274,14 @@ void Sys_SendKeyEvents( void ) } break; case SDL_MOUSEBUTTONDOWN: - if( event.button.button == SDL_BUTTON_MIDDLE ) + 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 ); break; case SDL_MOUSEBUTTONUP: - if( event.button.button == SDL_BUTTON_MIDDLE ) + 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; @@ -322,9 +307,6 @@ void VID_Init (void) if (SDL_Init(SDL_INIT_VIDEO) < 0) Sys_Error ("Failed to init video: %s\n", 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) @@ -339,13 +321,12 @@ static void VID_SetCaption() // set the caption SDL_WM_SetCaption( gamename, NULL ); - // get the HWND handle + // get the HWND handle SDL_VERSION( &info.version ); if( !SDL_GetWMInfo( &info ) ) return; - //icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) ); - icon = LoadIcon( NULL, IDI_ERROR ); + icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) ); SetClassLong( info.window, GCL_HICON, (LONG) icon ); } #else @@ -359,10 +340,10 @@ static void VID_OutputVersion() { const SDL_version *version; version = SDL_Linked_Version(); - Con_DPrintf( "Linked against SDL version %d.%d.%d\n" + 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 ); + version->major, version->minor, version->patch ); } int VID_InitMode(int fullscreen, int width, int height, int bpp) @@ -373,42 +354,35 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) VID_OutputVersion(); - /* - SDL Hack + /* + 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 libGL.so.1 (Linux/BSD) or opengl32.dll (windows) or OpenGL.framework (MacOSX), 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 +// 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; @@ -440,30 +414,37 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) VID_Shutdown(); return false; } + + // set window title VID_SetCaption(); - - gl_renderer = qglGetString(GL_RENDERER); - gl_vendor = qglGetString(GL_VENDOR); - gl_version = qglGetString(GL_VERSION); - gl_extensions = qglGetString(GL_EXTENSIONS); + // 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); } @@ -477,17 +458,10 @@ 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) { Uint8 appstate; - int vid_usemouse; + qboolean vid_usemouse; if (r_speeds.integer || gl_finish.integer) qglFinish(); @@ -498,22 +472,16 @@ void VID_Finish (void) if( !( appstate & SDL_APPMOUSEFOCUS ) || !( appstate & SDL_APPINPUTFOCUS ) ) vid_activewindow = false; - else + else vid_activewindow = true; vid_usemouse = false; - if( vid_mouse.integer && !key_consoleactive ) + if( 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); }