X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_sdl.c;h=0474a26c73f19976ab8e72a5c3cbea37a4eb9844;hb=953b5703b6b003beb3818593d86ed8784915780d;hp=826d8d98a1f864a91821a3e60cf77ac2a7a8d6e7;hpb=05b6edf1a4dac900a2d587ce8f26077642ba1792;p=xonotic%2Fdarkplaces.git diff --git a/vid_sdl.c b/vid_sdl.c index 826d8d98..0474a26c 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,66 +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 (void) -{ - int x, y; - - if( !vid_usingmouse ) { - IN_Mouse( 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( x, y ); } void IN_Move( void ) { - IN_MouseMove(); -} - -static void IN_Init( void ) -{ - // init keyboard - SDL_EnableUNICODE( SDL_ENABLE ); - // enable key repeat since everyone expects it - SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); - - // init mouse - vid_usingmouse = false; -} - -static void IN_Shutdown( 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; @@ -282,7 +265,7 @@ void Sys_SendKeyEvents( void ) 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; @@ -291,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; @@ -324,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) @@ -341,7 +321,7 @@ 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; @@ -363,7 +343,7 @@ static void VID_OutputVersion() 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) @@ -374,8 +354,8 @@ 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. */ @@ -391,13 +371,13 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) if (i && i < com_argc - 1) drivername = com_argv[i + 1]; 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) @@ -438,8 +418,16 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) VID_Shutdown(); return false; } + + // 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 = qglGetString(GL_RENDERER); gl_vendor = qglGetString(GL_VENDOR); gl_version = qglGetString(GL_VERSION); @@ -449,19 +437,18 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) //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); } @@ -475,17 +462,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(); @@ -496,22 +476,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); }