diff options
Diffstat (limited to 'src/vid_sdl.c')
| -rw-r--r-- | src/vid_sdl.c | 633 |
1 files changed, 335 insertions, 298 deletions
diff --git a/src/vid_sdl.c b/src/vid_sdl.c index aa37966..840fd89 100644 --- a/src/vid_sdl.c +++ b/src/vid_sdl.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #if USE_REF == REF_GL #include <GL/glx.h> #include <GL/glxext.h> -typedef const char *(*PFNGLXQUERYEXTENSIONSSTRING)( Display *, int ); +typedef const char *(*PFNGLXQUERYEXTENSIONSSTRING)(Display *, int); #endif #endif @@ -73,19 +73,20 @@ COMMON SDL VIDEO RELATED ROUTINES */ #if USE_REF == REF_GL -static void init_opengl( void ); +static void init_opengl(void); #endif #if USE_X11 -static void init_x11( void ) { +static void init_x11(void) +{ SDL_SysWMinfo info; - SDL_VERSION( &info.version ); - if( !SDL_GetWMInfo( &info ) ) { + SDL_VERSION(&info.version); + if (!SDL_GetWMInfo(&info)) { return; } - if( info.subsystem != SDL_SYSWM_X11 ) { + if (info.subsystem != SDL_SYSWM_X11) { return; } @@ -93,21 +94,22 @@ static void init_x11( void ) { sdl.win = info.info.x11.window; } -static void set_wm_hints( void ) { +static void set_wm_hints(void) +{ XSizeHints hints; - if( !sdl.dpy ) { + if (!sdl.dpy) { return; } - memset( &hints, 0, sizeof( hints ) ); - hints.flags = PMinSize|PResizeInc; + memset(&hints, 0, sizeof(hints)); + hints.flags = PMinSize | PResizeInc; hints.min_width = 64; hints.min_height = 64; hints.width_inc = 8; hints.height_inc = 2; - XSetWMSizeHints( sdl.dpy, sdl.win, &hints, XA_WM_SIZE_HINTS ); + XSetWMSizeHints(sdl.dpy, sdl.win, &hints, XA_WM_SIZE_HINTS); } #endif @@ -116,7 +118,8 @@ static void set_wm_hints( void ) { VID_GetClipboardData ================= */ -char *VID_GetClipboardData( void ) { +char *VID_GetClipboardData(void) +{ #if USE_X11 Window sowner; Atom type, property; @@ -125,38 +128,38 @@ char *VID_GetClipboardData( void ) { int format, result; char *ret; - if( !sdl.dpy ) { + if (!sdl.dpy) { return NULL; } - sowner = XGetSelectionOwner( sdl.dpy, XA_PRIMARY ); - if( sowner == None ) { + sowner = XGetSelectionOwner(sdl.dpy, XA_PRIMARY); + if (sowner == None) { return NULL; } - property = XInternAtom( sdl.dpy, "GETCLIPBOARDDATA_PROP", False ); - - XConvertSelection( sdl.dpy, XA_PRIMARY, XA_STRING, property, sdl.win, CurrentTime ); - - XSync( sdl.dpy, False ); - - result = XGetWindowProperty( sdl.dpy, sdl.win, property, 0, 0, False, - AnyPropertyType, &type, &format, &len, &bytes_left, &data ); - - if( result != Success ) { + property = XInternAtom(sdl.dpy, "GETCLIPBOARDDATA_PROP", False); + + XConvertSelection(sdl.dpy, XA_PRIMARY, XA_STRING, property, sdl.win, CurrentTime); + + XSync(sdl.dpy, False); + + result = XGetWindowProperty(sdl.dpy, sdl.win, property, 0, 0, False, + AnyPropertyType, &type, &format, &len, &bytes_left, &data); + + if (result != Success) { return NULL; } ret = NULL; - if( bytes_left ) { - result = XGetWindowProperty( sdl.dpy, sdl.win, property, 0, bytes_left, True, - AnyPropertyType, &type, &format, &len, &bytes_left, &data ); - if( result == Success ) { - ret = Z_CopyString( ( char * )data ); + if (bytes_left) { + result = XGetWindowProperty(sdl.dpy, sdl.win, property, 0, bytes_left, True, + AnyPropertyType, &type, &format, &len, &bytes_left, &data); + if (result == Success) { + ret = Z_CopyString((char *)data); } } - XFree( data ); + XFree(data); return ret; #else @@ -169,45 +172,47 @@ char *VID_GetClipboardData( void ) { VID_SetClipboardData ================= */ -void VID_SetClipboardData( const char *data ) { +void VID_SetClipboardData(const char *data) +{ } -static qboolean set_video_mode( int flags, int forcedepth ) { +static qboolean set_video_mode(int flags, int forcedepth) +{ SDL_Surface *surf; vrect_t rc; int depth; - flags &= ~(SDL_FULLSCREEN|SDL_RESIZABLE); + flags &= ~(SDL_FULLSCREEN | SDL_RESIZABLE); sdl.flags &= ~QVF_FULLSCREEN; - if( vid_fullscreen->integer > 0 ) { - VID_GetFullscreen( &rc, NULL, &depth ); - if( forcedepth ) { + if (vid_fullscreen->integer > 0) { + VID_GetFullscreen(&rc, NULL, &depth); + if (forcedepth) { depth = forcedepth; } - Com_DPrintf( "...setting fullscreen mode: %dx%d:%d\n", - rc.width, rc.height, depth ); - surf = SDL_SetVideoMode( rc.width, rc.height, depth, - flags | SDL_FULLSCREEN ); - if( surf ) { + Com_DPrintf("...setting fullscreen mode: %dx%d:%d\n", + rc.width, rc.height, depth); + surf = SDL_SetVideoMode(rc.width, rc.height, depth, + flags | SDL_FULLSCREEN); + if (surf) { sdl.flags |= QVF_FULLSCREEN; goto success; } - Com_EPrintf( "Fullscreen video mode failed: %s\n", SDL_GetError() ); - Cvar_Set( "vid_fullscreen", "0" ); + Com_EPrintf("Fullscreen video mode failed: %s\n", SDL_GetError()); + Cvar_Set("vid_fullscreen", "0"); } flags |= SDL_RESIZABLE; - VID_GetGeometry( &rc ); - Com_DPrintf( "...setting windowed mode: %dx%d\n", rc.width, rc.height ); - surf = SDL_SetVideoMode( rc.width, rc.height, forcedepth, flags ); - if( !surf ) { + VID_GetGeometry(&rc); + Com_DPrintf("...setting windowed mode: %dx%d\n", rc.width, rc.height); + surf = SDL_SetVideoMode(rc.width, rc.height, forcedepth, flags); + if (!surf) { return qfalse; } success: // init some stuff for the first time - if( sdl.surface != surf ) { + if (sdl.surface != surf) { sdl.surface = surf; #if USE_X11 init_x11(); @@ -217,12 +222,13 @@ success: init_opengl(); #endif } - R_ModeChanged( rc.width, rc.height, sdl.flags, surf->pitch, surf->pixels ); + R_ModeChanged(rc.width, rc.height, sdl.flags, surf->pitch, surf->pixels); SCR_ModeChanged(); return qtrue; } -char *VID_GetDefaultModeList( void ) { +char *VID_GetDefaultModeList(void) +{ return Z_CopyString(VID_MODELIST); } @@ -231,117 +237,122 @@ char *VID_GetDefaultModeList( void ) { VID_SetMode ============ */ -void VID_SetMode( void ) { - if( !set_video_mode( sdl.surface->flags, sdl.surface->format->BitsPerPixel ) ) { - Com_Error( ERR_FATAL, "Couldn't change video mode: %s", SDL_GetError() ); +void VID_SetMode(void) +{ + if (!set_video_mode(sdl.surface->flags, sdl.surface->format->BitsPerPixel)) { + Com_Error(ERR_FATAL, "Couldn't change video mode: %s", SDL_GetError()); } } -void VID_FatalShutdown( void ) { - SDL_ShowCursor( SDL_ENABLE ); - SDL_WM_GrabInput( SDL_GRAB_OFF ); +void VID_FatalShutdown(void) +{ + SDL_ShowCursor(SDL_ENABLE); + SDL_WM_GrabInput(SDL_GRAB_OFF); SDL_Quit(); } -static qboolean init_video( void ) { +static qboolean init_video(void) +{ SDL_Color color; byte *dst; char buffer[MAX_QPATH]; int i, ret; cvar_t *vid_hwgamma; - if( SDL_WasInit( SDL_INIT_EVERYTHING ) == 0 ) { - ret = SDL_Init( SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE ); + if (SDL_WasInit(SDL_INIT_EVERYTHING) == 0) { + ret = SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE); } else { - ret = SDL_InitSubSystem( SDL_INIT_VIDEO ); + ret = SDL_InitSubSystem(SDL_INIT_VIDEO); } - if( ret == -1 ) { - Com_EPrintf( "Couldn't initialize SDL video: %s\n", SDL_GetError() ); + if (ret == -1) { + Com_EPrintf("Couldn't initialize SDL video: %s\n", SDL_GetError()); return qfalse; } - if( SDL_VideoDriverName( buffer, sizeof( buffer ) ) != NULL ) { - Com_Printf( "Using SDL video driver: %s\n", buffer ); + if (SDL_VideoDriverName(buffer, sizeof(buffer)) != NULL) { + Com_Printf("Using SDL video driver: %s\n", buffer); } - sdl.icon = SDL_CreateRGBSurface( SDL_SWSURFACE, q2icon_width, - q2icon_height, 8, 0, 0, 0, 0 ); - if( sdl.icon ) { - SDL_SetColorKey( sdl.icon, SDL_SRCCOLORKEY, 0 ); + sdl.icon = SDL_CreateRGBSurface(SDL_SWSURFACE, q2icon_width, + q2icon_height, 8, 0, 0, 0, 0); + if (sdl.icon) { + SDL_SetColorKey(sdl.icon, SDL_SRCCOLORKEY, 0); // transparent pixel color.r = 255; color.g = 255; color.b = 255; - SDL_SetColors( sdl.icon, &color, 0, 1 ); + SDL_SetColors(sdl.icon, &color, 0, 1); // colored pixel color.r = 0; color.g = 128; color.b = 128; - SDL_SetColors( sdl.icon, &color, 1, 1 ); + SDL_SetColors(sdl.icon, &color, 1, 1); // expand the bitmap dst = sdl.icon->pixels; - for( i = 0; i < q2icon_width * q2icon_height; i++ ) { - *dst++ = Q_IsBitSet( q2icon_bits, i ); + for (i = 0; i < q2icon_width * q2icon_height; i++) { + *dst++ = Q_IsBitSet(q2icon_bits, i); } - SDL_WM_SetIcon( sdl.icon, NULL ); + SDL_WM_SetIcon(sdl.icon, NULL); } - vid_hwgamma = Cvar_Get( "vid_hwgamma", "0", CVAR_REFRESH ); + vid_hwgamma = Cvar_Get("vid_hwgamma", "0", CVAR_REFRESH); - if( vid_hwgamma->integer ) { - if( SDL_GetGammaRamp( sdl.gamma[0], sdl.gamma[1], sdl.gamma[2] ) != -1 && - SDL_SetGammaRamp( sdl.gamma[0], sdl.gamma[1], sdl.gamma[2] ) != -1 ) - { - Com_Printf( "...enabling hardware gamma\n" ); + if (vid_hwgamma->integer) { + if (SDL_GetGammaRamp(sdl.gamma[0], sdl.gamma[1], sdl.gamma[2]) != -1 && + SDL_SetGammaRamp(sdl.gamma[0], sdl.gamma[1], sdl.gamma[2]) != -1) { + Com_Printf("...enabling hardware gamma\n"); sdl.flags |= QVF_GAMMARAMP; } else { - Com_Printf( "...hardware gamma not supported\n" ); - Cvar_Reset( vid_hwgamma ); + Com_Printf("...hardware gamma not supported\n"); + Cvar_Reset(vid_hwgamma); } } - SDL_WM_SetCaption( PRODUCT, APPLICATION ); + SDL_WM_SetCaption(PRODUCT, APPLICATION); - SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL ); + SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); return qtrue; } -void VID_Shutdown( void ) { - if( sdl.flags & QVF_GAMMARAMP ) { - SDL_SetGammaRamp( sdl.gamma[0], sdl.gamma[1], sdl.gamma[2] ); +void VID_Shutdown(void) +{ + if (sdl.flags & QVF_GAMMARAMP) { + SDL_SetGammaRamp(sdl.gamma[0], sdl.gamma[1], sdl.gamma[2]); } - if( sdl.icon ) { - SDL_FreeSurface( sdl.icon ); + if (sdl.icon) { + SDL_FreeSurface(sdl.icon); } - memset( &sdl, 0, sizeof( sdl ) ); + memset(&sdl, 0, sizeof(sdl)); - if( SDL_WasInit( SDL_INIT_EVERYTHING ) == SDL_INIT_VIDEO ) { + if (SDL_WasInit(SDL_INIT_EVERYTHING) == SDL_INIT_VIDEO) { SDL_Quit(); } else { - SDL_QuitSubSystem( SDL_INIT_VIDEO ); + SDL_QuitSubSystem(SDL_INIT_VIDEO); } } -void VID_UpdateGamma( const byte *table ) { +void VID_UpdateGamma(const byte *table) +{ Uint16 ramp[256]; int i; - if( sdl.flags & QVF_GAMMARAMP ) { - for( i = 0; i < 256; i++ ) { + if (sdl.flags & QVF_GAMMARAMP) { + for (i = 0; i < 256; i++) { ramp[i] = table[i] << 8; } - SDL_SetGammaRamp( ramp, ramp, ramp ); + SDL_SetGammaRamp(ramp, ramp, ramp); } } -static void activate_event( void ) { +static void activate_event(void) +{ int state = SDL_GetAppState(); active_t active; - if( state & SDL_APPACTIVE ) { - if( state & (SDL_APPMOUSEFOCUS|SDL_APPINPUTFOCUS) ) { + if (state & SDL_APPACTIVE) { + if (state & (SDL_APPMOUSEFOCUS | SDL_APPINPUTFOCUS)) { active = ACT_ACTIVATED; } else { active = ACT_RESTORED; @@ -350,125 +361,128 @@ static void activate_event( void ) { active = ACT_MINIMIZED; } - CL_Activate( active ); + CL_Activate(active); } -static void key_event( SDL_keysym *keysym, qboolean down ) { +static void key_event(SDL_keysym *keysym, qboolean down) +{ unsigned key1, key2 = 0; - if( keysym->sym <= 127 ) { + if (keysym->sym <= 127) { // ASCII chars are mapped directly - Key_Event( keysym->sym, down, com_eventTime ); + Key_Event(keysym->sym, down, com_eventTime); return; } -#define K( s, d ) case SDLK_ ## s: key1 = K_ ## d; break; -#define KK( s, d1, d2 ) case SDLK_ ## s: key1 = K_ ## d1; key2 = K_ ## d2; break; - - switch( keysym->sym ) { - K( KP0, KP_INS ) - K( KP1, KP_END ) - K( KP2, KP_DOWNARROW ) - K( KP3, KP_PGDN ) - K( KP4, KP_LEFTARROW ) - K( KP5, KP_5 ) - K( KP6, KP_RIGHTARROW ) - K( KP7, KP_HOME ) - K( KP8, KP_UPARROW ) - K( KP9, KP_PGUP ) - K( KP_PERIOD, KP_DEL ) - K( KP_DIVIDE, KP_SLASH ) - K( KP_MULTIPLY, KP_MULTIPLY ) - K( KP_MINUS, KP_MINUS ) - K( KP_PLUS, KP_PLUS ) - K( KP_ENTER, KP_ENTER ) - - K( UP, UPARROW ) - K( DOWN, DOWNARROW ) - K( RIGHT, RIGHTARROW ) - K( LEFT, LEFTARROW ) - K( INSERT, INS ) - K( HOME, HOME ) - K( END, END ) - K( PAGEUP, PGUP ) - K( PAGEDOWN, PGDN ) - - K( F1, F1 ) - K( F2, F2 ) - K( F3, F3 ) - K( F4, F4 ) - K( F5, F5 ) - K( F6, F6 ) - K( F7, F7 ) - K( F8, F8 ) - K( F9, F9 ) - K( F10, F10 ) - K( F11, F11 ) - K( F12, F12 ) - - K( NUMLOCK, NUMLOCK ) - K( CAPSLOCK, CAPSLOCK ) - K( SCROLLOCK, SCROLLOCK ) - K( LSUPER, LWINKEY ) - K( RSUPER, RWINKEY ) - K( MENU, MENU ) - - KK( RSHIFT, SHIFT, RSHIFT ) - KK( LSHIFT, SHIFT, LSHIFT ) - KK( RCTRL, CTRL, RCTRL ) - KK( LCTRL, CTRL, LCTRL ) - KK( RALT, ALT, RALT ) - KK( LALT, ALT, LALT ) +#define K(s, d) case SDLK_ ## s: key1 = K_ ## d; break; +#define KK(s, d1, d2) case SDLK_ ## s: key1 = K_ ## d1; key2 = K_ ## d2; break; + + switch (keysym->sym) { + K(KP0, KP_INS) + K(KP1, KP_END) + K(KP2, KP_DOWNARROW) + K(KP3, KP_PGDN) + K(KP4, KP_LEFTARROW) + K(KP5, KP_5) + K(KP6, KP_RIGHTARROW) + K(KP7, KP_HOME) + K(KP8, KP_UPARROW) + K(KP9, KP_PGUP) + K(KP_PERIOD, KP_DEL) + K(KP_DIVIDE, KP_SLASH) + K(KP_MULTIPLY, KP_MULTIPLY) + K(KP_MINUS, KP_MINUS) + K(KP_PLUS, KP_PLUS) + K(KP_ENTER, KP_ENTER) + + K(UP, UPARROW) + K(DOWN, DOWNARROW) + K(RIGHT, RIGHTARROW) + K(LEFT, LEFTARROW) + K(INSERT, INS) + K(HOME, HOME) + K(END, END) + K(PAGEUP, PGUP) + K(PAGEDOWN, PGDN) + + K(F1, F1) + K(F2, F2) + K(F3, F3) + K(F4, F4) + K(F5, F5) + K(F6, F6) + K(F7, F7) + K(F8, F8) + K(F9, F9) + K(F10, F10) + K(F11, F11) + K(F12, F12) + + K(NUMLOCK, NUMLOCK) + K(CAPSLOCK, CAPSLOCK) + K(SCROLLOCK, SCROLLOCK) + K(LSUPER, LWINKEY) + K(RSUPER, RWINKEY) + K(MENU, MENU) + + KK(RSHIFT, SHIFT, RSHIFT) + KK(LSHIFT, SHIFT, LSHIFT) + KK(RCTRL, CTRL, RCTRL) + KK(LCTRL, CTRL, LCTRL) + KK(RALT, ALT, RALT) + KK(LALT, ALT, LALT) #undef K #undef KK default: - Com_DPrintf( "%s: unknown keysym %d\n", __func__, keysym->sym ); + Com_DPrintf("%s: unknown keysym %d\n", __func__, keysym->sym); return; } - Key_Event( key1, down, com_eventTime ); - if( key2 ) { - Key_Event( key2, down, com_eventTime ); + Key_Event(key1, down, com_eventTime); + if (key2) { + Key_Event(key2, down, com_eventTime); } } -static void button_event( int button, qboolean down ) { +static void button_event(int button, qboolean down) +{ unsigned key; - if( !sdl.mouse.initialized ) { + if (!sdl.mouse.initialized) { return; } -#define K( s, d ) case SDL_BUTTON_ ## s: key = K_ ## d; break; +#define K(s, d) case SDL_BUTTON_ ## s: key = K_ ## d; break; - switch( button ) { - K( LEFT, MOUSE1 ) - K( RIGHT, MOUSE2 ) - K( MIDDLE, MOUSE3 ) - K( WHEELUP, MWHEELUP ) - K( WHEELDOWN, MWHEELDOWN ) + switch (button) { + K(LEFT, MOUSE1) + K(RIGHT, MOUSE2) + K(MIDDLE, MOUSE3) + K(WHEELUP, MWHEELUP) + K(WHEELDOWN, MWHEELDOWN) #undef K default: - Com_DPrintf( "%s: unknown button %d\n", __func__, button ); + Com_DPrintf("%s: unknown button %d\n", __func__, button); return; } - Key_Event( key, down, com_eventTime ); + Key_Event(key, down, com_eventTime); } -static void resize_event( int w, int h ) { - if( !sdl.surface ) { +static void resize_event(int w, int h) +{ + if (!sdl.surface) { return; } - if( !( sdl.surface->flags & SDL_RESIZABLE ) ) { + if (!(sdl.surface->flags & SDL_RESIZABLE)) { return; } - Cvar_Set( "vid_geometry", va( "%dx%d", w, h ) ); + Cvar_Set("vid_geometry", va("%dx%d", w, h)); VID_SetMode(); } @@ -477,37 +491,38 @@ static void resize_event( int w, int h ) { VID_PumpEvents ============ */ -void VID_PumpEvents( void ) { +void VID_PumpEvents(void) +{ SDL_Event event; - while( SDL_PollEvent( &event ) ) { - switch( event.type ) { + while (SDL_PollEvent(&event)) { + switch (event.type) { case SDL_ACTIVEEVENT: activate_event(); break; case SDL_QUIT: - Com_Quit( NULL, ERR_DISCONNECT ); + Com_Quit(NULL, ERR_DISCONNECT); break; case SDL_VIDEORESIZE: - resize_event( event.resize.w, event.resize.h ); + resize_event(event.resize.w, event.resize.h); return; // process only one resize event per frame case SDL_VIDEOEXPOSE: SCR_UpdateScreen(); break; case SDL_KEYDOWN: - key_event( &event.key.keysym, qtrue ); + key_event(&event.key.keysym, qtrue); break; case SDL_KEYUP: - key_event( &event.key.keysym, qfalse ); + key_event(&event.key.keysym, qfalse); break; case SDL_MOUSEBUTTONDOWN: - button_event( event.button.button, qtrue ); + button_event(event.button.button, qtrue); break; case SDL_MOUSEBUTTONUP: - button_event( event.button.button, qfalse ); + button_event(event.button.button, qfalse); break; case SDL_MOUSEMOTION: - IN_MouseEvent( event.motion.x, event.motion.y ); + IN_MouseEvent(event.motion.x, event.motion.y); break; } } @@ -516,20 +531,21 @@ void VID_PumpEvents( void ) { /* =============================================================================== -RENDERER SPECIFIC +RENDERER SPECIFIC =============================================================================== */ #if USE_REF == REF_SOFT -qboolean VID_Init( void ) { - if( !init_video() ) { +qboolean VID_Init(void) +{ + if (!init_video()) { return qfalse; } - if( !set_video_mode( SDL_SWSURFACE|SDL_HWPALETTE|SDL_RESIZABLE, 8 ) ) { - Com_EPrintf( "Couldn't set video mode: %s\n", SDL_GetError() ); + if (!set_video_mode(SDL_SWSURFACE | SDL_HWPALETTE | SDL_RESIZABLE, 8)) { + Com_EPrintf("Couldn't set video mode: %s\n", SDL_GetError()); VID_Shutdown(); return qfalse; } @@ -538,34 +554,39 @@ qboolean VID_Init( void ) { return qtrue; } -void VID_UpdatePalette( const byte *palette ) { +void VID_UpdatePalette(const byte *palette) +{ SDL_Color colors[256]; SDL_Color *c; - for( c = colors; c < colors + 256; c++ ) { + for (c = colors; c < colors + 256; c++) { c->r = palette[0]; c->g = palette[1]; c->b = palette[2]; palette += 4; } - SDL_SetPalette( sdl.surface, SDL_LOGPAL, colors, 0, 256 ); + SDL_SetPalette(sdl.surface, SDL_LOGPAL, colors, 0, 256); } -void VID_VideoWait( void ) { +void VID_VideoWait(void) +{ } -qboolean VID_VideoSync( void ) { +qboolean VID_VideoSync(void) +{ return qtrue; } -void VID_BeginFrame( void ) { - SDL_LockSurface( sdl.surface ); +void VID_BeginFrame(void) +{ + SDL_LockSurface(sdl.surface); } -void VID_EndFrame( void ) { - SDL_UnlockSurface( sdl.surface ); - SDL_Flip( sdl.surface ); +void VID_EndFrame(void) +{ + SDL_UnlockSurface(sdl.surface); + SDL_Flip(sdl.surface); } #else // USE_REF == REF_SOFT @@ -574,57 +595,60 @@ void VID_EndFrame( void ) { // for debugging #define SHOW_SYNC() \ - Com_DDDDPrintf( "%s: %u\n", __func__, sdl.sync_count ) + Com_DDDDPrintf("%s: %u\n", __func__, sdl.sync_count) -static unsigned glx_parse_extension_string( const char *s ) { +static unsigned glx_parse_extension_string(const char *s) +{ static const char *const extnames[] = { "GLX_SGI_video_sync", NULL }; - return Com_ParseExtensionString( s, extnames ); + return Com_ParseExtensionString(s, extnames); } -static void init_glx( void ) { +static void init_glx(void) +{ const char *extensions; cvar_t *gl_video_sync; unsigned mask; - if( !sdl.dpy ) { + if (!sdl.dpy) { return; } - sdl.glXQueryExtensionsString = SDL_GL_GetProcAddress( "glXQueryExtensionsString" ); - if( !sdl.glXQueryExtensionsString ) { + sdl.glXQueryExtensionsString = SDL_GL_GetProcAddress("glXQueryExtensionsString"); + if (!sdl.glXQueryExtensionsString) { return; } - gl_video_sync = Cvar_Get( "gl_video_sync", "1", 0 ); + gl_video_sync = Cvar_Get("gl_video_sync", "1", 0); - extensions = sdl.glXQueryExtensionsString( sdl.dpy, DefaultScreen( sdl.dpy ) ); - mask = glx_parse_extension_string( extensions ); - if( mask & 1 ) { - if( gl_video_sync->integer ) { - Com_Printf( "...enabling GLX_SGI_video_sync\n" ); - sdl.glXGetVideoSyncSGI = SDL_GL_GetProcAddress( "glXGetVideoSyncSGI" ); - sdl.glXWaitVideoSyncSGI = SDL_GL_GetProcAddress( "glXWaitVideoSyncSGI" ); - sdl.glXGetVideoSyncSGI( &sdl.sync_count ); + extensions = sdl.glXQueryExtensionsString(sdl.dpy, DefaultScreen(sdl.dpy)); + mask = glx_parse_extension_string(extensions); + if (mask & 1) { + if (gl_video_sync->integer) { + Com_Printf("...enabling GLX_SGI_video_sync\n"); + sdl.glXGetVideoSyncSGI = SDL_GL_GetProcAddress("glXGetVideoSyncSGI"); + sdl.glXWaitVideoSyncSGI = SDL_GL_GetProcAddress("glXWaitVideoSyncSGI"); + sdl.glXGetVideoSyncSGI(&sdl.sync_count); sdl.flags |= QVF_VIDEOSYNC; } else { - Com_Printf( "...ignoring GLX_SGI_video_sync\n" ); + Com_Printf("...ignoring GLX_SGI_video_sync\n"); } - } else if( gl_video_sync->integer ) { - Com_Printf( "GLX_SGI_video_sync not found\n" ); - Cvar_Set( "gl_video_sync", "0" ); + } else if (gl_video_sync->integer) { + Com_Printf("GLX_SGI_video_sync not found\n"); + Cvar_Set("gl_video_sync", "0"); } } #endif -static void init_opengl( void ) { +static void init_opengl(void) +{ int accel; - SDL_GL_GetAttribute( SDL_GL_ACCELERATED_VISUAL, &accel ); - if( accel ) { + SDL_GL_GetAttribute(SDL_GL_ACCELERATED_VISUAL, &accel); + if (accel) { sdl.flags |= QVF_ACCELERATED; } @@ -633,48 +657,49 @@ static void init_opengl( void ) { #endif } -qboolean VID_Init( void ) { +qboolean VID_Init(void) +{ cvar_t *gl_driver; char *s; - if( !init_video() ) { + if (!init_video()) { return qfalse; } - gl_driver = Cvar_Get( "gl_driver", DEFAULT_OPENGL_DRIVER, CVAR_REFRESH ); + gl_driver = Cvar_Get("gl_driver", DEFAULT_OPENGL_DRIVER, CVAR_REFRESH); - while( 1 ) { + while (1) { // ugly hack to work around brain-dead servers that actively // check and enforce `gl_driver' cvar to `opengl32', unaware // of other systems than Windows s = gl_driver->string; - if( !Q_stricmp( s, "opengl32" ) || !Q_stricmp( s, "opengl32.dll" ) ) { - Com_Printf( "...attempting to load %s instead of %s\n", DEFAULT_OPENGL_DRIVER, s ); + if (!Q_stricmp(s, "opengl32") || !Q_stricmp(s, "opengl32.dll")) { + Com_Printf("...attempting to load %s instead of %s\n", DEFAULT_OPENGL_DRIVER, s); s = DEFAULT_OPENGL_DRIVER; } - if( SDL_GL_LoadLibrary( s ) == 0 ) { + if (SDL_GL_LoadLibrary(s) == 0) { break; } - Com_EPrintf( "Couldn't load OpenGL library: %s\n", SDL_GetError() ); - if( !strcmp( s, DEFAULT_OPENGL_DRIVER ) ) { + Com_EPrintf("Couldn't load OpenGL library: %s\n", SDL_GetError()); + if (!strcmp(s, DEFAULT_OPENGL_DRIVER)) { goto fail; } // attempt to recover - Com_Printf( "...falling back to %s\n", DEFAULT_OPENGL_DRIVER ); - Cvar_SetByVar( gl_driver, DEFAULT_OPENGL_DRIVER, FROM_CODE ); + Com_Printf("...falling back to %s\n", DEFAULT_OPENGL_DRIVER); + Cvar_SetByVar(gl_driver, DEFAULT_OPENGL_DRIVER, FROM_CODE); } - 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 ); - SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 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); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); - if( !set_video_mode( SDL_OPENGL|SDL_RESIZABLE, 0 ) ) { - Com_EPrintf( "Couldn't set video mode: %s\n", SDL_GetError() ); + if (!set_video_mode(SDL_OPENGL | SDL_RESIZABLE, 0)) { + Com_EPrintf("Couldn't set video mode: %s\n", SDL_GetError()); goto fail; } @@ -686,30 +711,32 @@ fail: return qfalse; } -void VID_VideoWait( void ) { +void VID_VideoWait(void) +{ #if USE_X11 - if( !sdl.glXWaitVideoSyncSGI ) { + if (!sdl.glXWaitVideoSyncSGI) { return; } - sdl.glXWaitVideoSyncSGI( 2, 1, &sdl.sync_count ); + sdl.glXWaitVideoSyncSGI(2, 1, &sdl.sync_count); SHOW_SYNC(); #endif } -qboolean VID_VideoSync( void ) { +qboolean VID_VideoSync(void) +{ #if USE_X11 GLuint count; - if( !sdl.glXGetVideoSyncSGI ) { + if (!sdl.glXGetVideoSyncSGI) { return qtrue; } - if( sdl.glXGetVideoSyncSGI( &count ) ) { + if (sdl.glXGetVideoSyncSGI(&count)) { return qtrue; } - if( count != sdl.sync_count ) { + if (count != sdl.sync_count) { sdl.sync_count = count; SHOW_SYNC(); return qtrue; @@ -721,21 +748,24 @@ qboolean VID_VideoSync( void ) { #endif } -void VID_BeginFrame( void ) { +void VID_BeginFrame(void) +{ } -void VID_EndFrame( void ) { +void VID_EndFrame(void) +{ SDL_GL_SwapBuffers(); #if USE_X11 - if( sdl.glXGetVideoSyncSGI ) { - sdl.glXGetVideoSyncSGI( &sdl.sync_count ); + if (sdl.glXGetVideoSyncSGI) { + sdl.glXGetVideoSyncSGI(&sdl.sync_count); SHOW_SYNC(); } #endif } -void *VID_GetProcAddr( const char *sym ) { - return SDL_GL_GetProcAddress( sym ); +void *VID_GetProcAddr(const char *sym) +{ + return SDL_GL_GetProcAddress(sym); } #endif // USE_REF == REF_GL @@ -751,87 +781,93 @@ MOUSE DRIVER #define SDL_FULLFOCUS (SDL_APPACTIVE|SDL_APPINPUTFOCUS|SDL_APPMOUSEFOCUS) -static void AcquireMouse( void ) { +static void AcquireMouse(void) +{ int state; // move cursor to center of the main window before we grab the mouse - if( sdl.surface ) { - SDL_WarpMouse( sdl.surface->w / 2, sdl.surface->h / 2 ); + if (sdl.surface) { + SDL_WarpMouse(sdl.surface->w / 2, sdl.surface->h / 2); } // pump mouse motion events generated by SDL_WarpMouse - SDL_PollEvent( NULL ); + SDL_PollEvent(NULL); // grab the mouse, so SDL enters relative mouse mode - SDL_WM_GrabInput( SDL_GRAB_ON ); + SDL_WM_GrabInput(SDL_GRAB_ON); state = SDL_GetAppState(); - if( ( state & SDL_FULLFOCUS ) != SDL_FULLFOCUS ) { - Com_DPrintf( "AcquireMouse: don't have full focus\n" ); + if ((state & SDL_FULLFOCUS) != SDL_FULLFOCUS) { + Com_DPrintf("AcquireMouse: don't have full focus\n"); } - SDL_ShowCursor( SDL_DISABLE ); - + SDL_ShowCursor(SDL_DISABLE); + // pump mouse motion events still pending - SDL_PollEvent( NULL ); + SDL_PollEvent(NULL); // clear any deltas generated - SDL_GetRelativeMouseState( NULL, NULL ); + SDL_GetRelativeMouseState(NULL, NULL); } -static qboolean GetMouseMotion( int *dx, int *dy ) { - if( !sdl.mouse.grabbed ) { +static qboolean GetMouseMotion(int *dx, int *dy) +{ + if (!sdl.mouse.grabbed) { return qfalse; } - SDL_GetRelativeMouseState( dx, dy ); + SDL_GetRelativeMouseState(dx, dy); return qtrue; } -static void WarpMouse( int x, int y ) { - SDL_WarpMouse( x, y ); - SDL_PollEvent( NULL ); - SDL_GetRelativeMouseState( NULL, NULL ); +static void WarpMouse(int x, int y) +{ + SDL_WarpMouse(x, y); + SDL_PollEvent(NULL); + SDL_GetRelativeMouseState(NULL, NULL); } -static void ShutdownMouse( void ) { +static void ShutdownMouse(void) +{ // release the mouse - SDL_ShowCursor( SDL_ENABLE ); - SDL_WM_GrabInput( SDL_GRAB_OFF ); - SDL_WM_SetCaption( PRODUCT, APPLICATION ); - memset( &sdl.mouse, 0, sizeof( sdl.mouse ) ); + SDL_ShowCursor(SDL_ENABLE); + SDL_WM_GrabInput(SDL_GRAB_OFF); + SDL_WM_SetCaption(PRODUCT, APPLICATION); + memset(&sdl.mouse, 0, sizeof(sdl.mouse)); } -static qboolean InitMouse( void ) { - if( SDL_WasInit( SDL_INIT_VIDEO ) != SDL_INIT_VIDEO ) { +static qboolean InitMouse(void) +{ + if (SDL_WasInit(SDL_INIT_VIDEO) != SDL_INIT_VIDEO) { return qfalse; } - Com_Printf( "SDL mouse initialized.\n" ); + Com_Printf("SDL mouse initialized.\n"); sdl.mouse.initialized = qtrue; return qtrue; } -static void GrabMouse( grab_t grab ) { - if( !sdl.mouse.initialized ) { +static void GrabMouse(grab_t grab) +{ + if (!sdl.mouse.initialized) { return; } - if( sdl.mouse.grabbed == grab ) { - SDL_GetRelativeMouseState( NULL, NULL ); + if (sdl.mouse.grabbed == grab) { + SDL_GetRelativeMouseState(NULL, NULL); return; } - if( grab == IN_GRAB ) { + if (grab == IN_GRAB) { AcquireMouse(); - SDL_WM_SetCaption( "[" PRODUCT "]", APPLICATION ); + SDL_WM_SetCaption("[" PRODUCT "]", APPLICATION); } else { - if( sdl.mouse.grabbed == IN_GRAB ) { - SDL_WM_GrabInput( SDL_GRAB_OFF ); - SDL_WM_SetCaption( PRODUCT, APPLICATION ); + if (sdl.mouse.grabbed == IN_GRAB) { + SDL_WM_GrabInput(SDL_GRAB_OFF); + SDL_WM_SetCaption(PRODUCT, APPLICATION); } - if( grab == IN_HIDE ) { - SDL_ShowCursor( SDL_DISABLE ); + if (grab == IN_HIDE) { + SDL_ShowCursor(SDL_DISABLE); } else { - SDL_ShowCursor( SDL_ENABLE ); + SDL_ShowCursor(SDL_ENABLE); } } @@ -843,7 +879,8 @@ static void GrabMouse( grab_t grab ) { VID_FillInputAPI ============ */ -void VID_FillInputAPI( inputAPI_t *api ) { +void VID_FillInputAPI(inputAPI_t *api) +{ api->Init = InitMouse; api->Shutdown = ShutdownMouse; api->Grab = GrabMouse; |