teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-12-02 08:53:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow optional window resizing.

Browse source 
Fixes Bugzilla #2844.
This commit is contained in:
Ryan C. Gordon 2009-09-14 22:07:34 +00:00
parent 8bb2f9a5f5
commit b096ca1d04
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README
View file

@ -159,6 +159,7 @@ New cvars
ipv6 servers on the local network ipv6 servers on the local network
net_mcastiface - outgoing interface to use for scan net_mcastiface - outgoing interface to use for scan
r_allowResize - make window resizable (SDL only)
r_zProj - distance of observer camera to projection r_zProj - distance of observer camera to projection
plane in quake3 standard units plane in quake3 standard units
r_greyscale - render black and white images r_greyscale - render black and white images

5
code/sdl/sdl_glimp.c
View file

@ -79,6 +79,7 @@ static SDL_Surface *screen = NULL;
static const SDL_VideoInfo *videoInfo = NULL; static const SDL_VideoInfo *videoInfo = NULL;
cvar_t *r_allowSoftwareGL; // Don't abort out if a hardware visual can't be obtained cvar_t *r_allowSoftwareGL; // Don't abort out if a hardware visual can't be obtained
cvar_t *r_allowResize; // make window resizable
cvar_t *r_sdlDriver; cvar_t *r_sdlDriver;
void (APIENTRYP qglActiveTextureARB) (GLenum texture); void (APIENTRYP qglActiveTextureARB) (GLenum texture);
@ -215,6 +216,9 @@ static int GLimp_SetMode( int mode, qboolean fullscreen )
ri.Printf( PRINT_ALL, "Initializing OpenGL display\n"); ri.Printf( PRINT_ALL, "Initializing OpenGL display\n");
if ( r_allowResize->integer )
flags |= SDL_RESIZABLE;
#if !SDL_VERSION_ATLEAST(1, 2, 10) #if !SDL_VERSION_ATLEAST(1, 2, 10)
// 1.2.10 is needed to get the desktop resolution // 1.2.10 is needed to get the desktop resolution
displayAspect = 4.0f / 3.0f; displayAspect = 4.0f / 3.0f;
@ -667,6 +671,7 @@ void GLimp_Init( void )
{ {
r_allowSoftwareGL = ri.Cvar_Get( "r_allowSoftwareGL", "0", CVAR_LATCH ); r_allowSoftwareGL = ri.Cvar_Get( "r_allowSoftwareGL", "0", CVAR_LATCH );
r_sdlDriver = ri.Cvar_Get( "r_sdlDriver", "", CVAR_ROM ); r_sdlDriver = ri.Cvar_Get( "r_sdlDriver", "", CVAR_ROM );
r_allowResize = ri.Cvar_Get( "r_allowResize", "0", CVAR_ARCHIVE );
Sys_GLimpInit( ); Sys_GLimpInit( );

24
code/sdl/sdl_input.c
View file

@ -70,6 +70,8 @@ static cvar_t *in_joystickDebug = NULL;
static cvar_t *in_joystickThreshold = NULL; static cvar_t *in_joystickThreshold = NULL;
static cvar_t *in_joystickNo = NULL; static cvar_t *in_joystickNo = NULL;
static int vidRestartTime = 0;
#define CTRL(a) ((a)-'a'+1) #define CTRL(a) ((a)-'a'+1)
/* /*
@ -901,6 +903,21 @@ static void IN_ProcessEvents( void )
Sys_Quit( ); Sys_Quit( );
break; break;
case SDL_VIDEORESIZE:
{
char width[32], height[32];
Com_sprintf( width, sizeof(width), "%d", e.resize.w );
Com_sprintf( height, sizeof(height), "%d", e.resize.h );
ri.Cvar_Set( "r_customwidth", width );
ri.Cvar_Set( "r_customheight", height );
ri.Cvar_Set( "r_mode", "-1" );
/* wait until user stops dragging for 1 second, so
we aren't constantly recreating the GL context while
he tries to drag...*/
vidRestartTime = Sys_Milliseconds() + 1000;
}
break;
default: default:
break; break;
} }
@ -939,6 +956,13 @@ void IN_Frame( void )
} }
else else
IN_ActivateMouse( ); IN_ActivateMouse( );
/* in case we had to delay actual restart of video system... */
if ( (vidRestartTime != 0) && (vidRestartTime < Sys_Milliseconds()) )
{
vidRestartTime = 0;
Cbuf_AddText( "vid_restart" );
}
} }
/* /*