ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2025-05-31 09:01:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Replace "powered by ioq3" text with ui_ioq3 CVAR_ROM

Browse source 
* Guess display aspect based on the desktop resolution
* Sort detected resolutions by...
  + closeness to display aspect
  + ascending width
  + ascending height
* Apply Q3 coding style to resolution detection code
This commit is contained in:
Tim Angus 2007-12-11 00:19:23 +00:00
parent 6b5fbd189d
commit b9ab949ec7
7 changed files with 209 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

123
code/sdl/sdl_glimp.c
View file

@ -44,6 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include "../renderer/tr_local.h"
#include "../client/client.h"
@ -110,44 +111,79 @@ void GLimp_LogComment( char *comment )
{
}
static void set_available_modes(void)
/*
===============
GLimp_CompareModes
===============
*/
static int GLimp_CompareModes( const void *a, const void *b )
{
char buf[MAX_STRING_CHARS];
SDL_Rect **modes;
size_t len = 0;
int i;
const float ASPECT_EPSILON = 0.001f;
SDL_Rect *modeA = *(SDL_Rect **)a;
SDL_Rect *modeB = *(SDL_Rect **)b;
float aspectDiffA = fabs( ( (float)modeA->w / (float)modeA->h ) - displayAspect );
float aspectDiffB = fabs( ( (float)modeB->w / (float)modeB->h ) - displayAspect );
float aspectDiffsDiff = aspectDiffA - aspectDiffB;
modes = SDL_ListModes(NULL, SDL_OPENGL | SDL_FULLSCREEN);
if( aspectDiffsDiff > ASPECT_EPSILON )
return 1;
else if( aspectDiffsDiff < -ASPECT_EPSILON )
return -1;
else
{
if( modeA->w == modeB->w )
return modeA->h - modeB->h;
else
return modeA->w - modeB->w;
}
}
if (!modes)
{
ri.Printf( PRINT_WARNING, "Can't get list of available modes\n");
return;
}
/*
===============
GLimp_DetectAvailableModes
===============
*/
static void GLimp_DetectAvailableModes(void)
{
char buf[ MAX_STRING_CHARS ] = { 0 };
SDL_Rect **modes;
int numModes;
int i;
if (modes == (SDL_Rect **)-1)
{
ri.Printf( PRINT_ALL, "Display supports any resolution\n");
return; // can set any resolution
}
modes = SDL_ListModes( NULL, SDL_OPENGL | SDL_FULLSCREEN );
for (i = 0; modes[i]; ++i)
{
if(snprintf(NULL, 0, "%ux%u ", modes[i]->w, modes[i]->h) < (int)sizeof(buf)-len)
{
len += sprintf(buf+len, "%ux%u ", modes[i]->w, modes[i]->h);
}
else
{
ri.Printf( PRINT_WARNING, "Skipping mode %ux%x, buffer too small\n", modes[i]->w, modes[i]->h);
}
}
if(len)
{
buf[strlen(buf)-1] = 0;
ri.Printf( PRINT_ALL, "Available modes: '%s'\n", buf);
ri.Cvar_Set( "r_availableModes", buf );
}
if( !modes )
{
ri.Printf( PRINT_WARNING, "Can't get list of available modes\n" );
return;
}
if( modes == (SDL_Rect **)-1 )
{
ri.Printf( PRINT_ALL, "Display supports any resolution\n" );
return; // can set any resolution
}
for( numModes = 0; modes[ numModes ]; numModes++ );
qsort( modes, numModes, sizeof( SDL_Rect* ), GLimp_CompareModes );
for( i = 0; i < numModes; i++ )
{
const char *newModeString = va( "%ux%u ", modes[ i ]->w, modes[ i ]->h );
if( strlen( newModeString ) < (int)sizeof( buf ) - strlen( buf ) )
Q_strcat( buf, sizeof( buf ), newModeString );
else
ri.Printf( PRINT_WARNING, "Skipping mode %ux%x, buffer too small\n", modes[i]->w, modes[i]->h );
}
if( *buf )
{
buf[ strlen( buf ) - 1 ] = 0;
ri.Printf( PRINT_ALL, "Available modes: '%s'\n", buf );
ri.Cvar_Set( "r_availableModes", buf );
}
}
/*
@ -164,9 +200,28 @@ static int GLimp_SetMode( int mode, qboolean fullscreen )
int i = 0;
SDL_Surface *vidscreen = NULL;
Uint32 flags = SDL_OPENGL;
const SDL_VideoInfo *videoInfo;
ri.Printf( PRINT_ALL, "Initializing OpenGL display\n");
if( displayAspect == 0.0f )
{
#if !SDL_VERSION_ATLEAST(1, 2, 10)
// 1.2.10 is needed to get the desktop resolution
displayAspect = 4.0f / 3.0f;
#elif MINSDL_PATCH >= 10
# error Ifdeffery no longer necessary, please remove
#else
// Guess the display aspect ratio through the desktop resolution
// by assuming (relatively safely) that it is set at or close to
// the display's native aspect ratio
videoInfo = SDL_GetVideoInfo( );
displayAspect = (float)videoInfo->current_w / (float)videoInfo->current_h;
#endif
ri.Printf( PRINT_ALL, "Estimated display aspect: %.3f\n", displayAspect );
}
ri.Printf (PRINT_ALL, "...setting mode %d:", mode );
if ( !R_GetModeInfo( &glConfig.vidWidth, &glConfig.vidHeight, &glConfig.windowAspect, mode ) )
@ -315,7 +370,7 @@ static int GLimp_SetMode( int mode, qboolean fullscreen )
break;
}
set_available_modes();
GLimp_DetectAvailableModes();
if (!vidscreen)
{