ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replaced con.textscale with con.charWidth and con.charHeight, ctrl+KP_INS for scale reset

Browse source
This commit is contained in:
Pan7 2014-10-20 15:34:20 +02:00
parent 71ba22c39f
commit daa5248cc7
5 changed files with 82 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
code/client/cl_console.c
View file

@ -51,7 +51,7 @@ typedef struct {
int times[NUM_CON_TIMES]; // cls.realtime time the line was generated int times[NUM_CON_TIMES]; // cls.realtime time the line was generated
// for transparent notify lines // for transparent notify lines
vec4_t color; vec4_t color;
float textscale; int charWidth, charHeight;
} console_t; } console_t;
console_t con; console_t con;
@ -277,7 +277,7 @@ void Con_CheckResize (void)
int i, j, width, oldwidth, oldtotallines, numlines, numchars; int i, j, width, oldwidth, oldtotallines, numlines, numchars;
short tbuf[CON_TEXTSIZE]; short tbuf[CON_TEXTSIZE];
width = (SCREEN_WIDTH / SMALLCHAR_WIDTH * con.textscale) - 2; width = (SCREEN_WIDTH / con.charWidth ) - 2;
if (width == con.linewidth) if (width == con.linewidth)
return; return;
@ -451,6 +451,8 @@ void CL_ConsolePrint( char *txt ) {
con.color[2] = con.color[2] =
con.color[3] = 1.0f; con.color[3] = 1.0f;
con.linewidth = -1; con.linewidth = -1;
con.charWidth = SMALLCHAR_WIDTH;
con.charHeight = SMALLCHAR_HEIGHT;
Con_CheckResize (); Con_CheckResize ();
con.initialized = qtrue; con.initialized = qtrue;
} }
@ -538,14 +540,14 @@ void Con_DrawInput (void) {
return; return;
} }
y = con.vislines - ( SMALLCHAR_HEIGHT * 2 * con.textscale ); y = con.vislines - ( con.charHeight * 2 );
re.SetColor( con.color ); re.SetColor( con.color );
SCR_DrawScaledSmallChar( con.xadjust + 1 * SMALLCHAR_WIDTH * con.textscale, y, con.textscale, ']' ); SCR_DrawSmallChar( con.xadjust + 1 * con.charWidth, y, con.charWidth, con.charHeight, ']' );
Field_VariableSizeDraw( &g_consoleField, con.xadjust + 2 * SMALLCHAR_WIDTH * con.textscale, y, Field_VariableSizeDraw( &g_consoleField, con.xadjust + 2 * con.charWidth, y,
SCREEN_WIDTH - 3 * SMALLCHAR_WIDTH * con.textscale, SMALLCHAR_WIDTH, con.textscale, con.charWidth, con.charHeight, qfalse, SMALLCHAR_WIDTH,
qtrue, qtrue ); qtrue, qtrue );
} }
@ -565,14 +567,10 @@ void Con_DrawNotify (void)
int time; int time;
int skip; int skip;
int currentColor; int currentColor;
int charHeight, charWidth;
currentColor = 7; currentColor = 7;
re.SetColor( g_color_table[currentColor] ); re.SetColor( g_color_table[currentColor] );
charHeight = floor( SMALLCHAR_HEIGHT * con.textscale );
charWidth = floor( SMALLCHAR_WIDTH * con.textscale );
v = 0; v = 0;
for (i= con.current-NUM_CON_TIMES+1 ; i<=con.current ; i++) for (i= con.current-NUM_CON_TIMES+1 ; i<=con.current ; i++)
{ {
@ -598,10 +596,10 @@ void Con_DrawNotify (void)
currentColor = ColorIndexForNumber( text[x]>>8 ); currentColor = ColorIndexForNumber( text[x]>>8 );
re.SetColor( g_color_table[currentColor] ); re.SetColor( g_color_table[currentColor] );
} }
SCR_DrawScaledSmallChar( cl_conXOffset->integer + con.xadjust + (x+1)*charWidth, v, con.textscale, text[x] & 0xff ); SCR_DrawSmallChar( cl_conXOffset->integer + con.xadjust + (x+1)*con.charWidth, v, con.charWidth, con.charHeight, text[x] & 0xff );
} }
v += charHeight; v += con.charHeight;
} }
re.SetColor( NULL ); re.SetColor( NULL );
@ -646,7 +644,6 @@ void Con_DrawSolidConsole( float frac ) {
// qhandle_t conShader; // qhandle_t conShader;
int currentColor; int currentColor;
vec4_t color; vec4_t color;
int charHeight, charWidth;
lines = cls.glconfig.vidHeight * frac; lines = cls.glconfig.vidHeight * frac;
if (lines <= 0) if (lines <= 0)
@ -674,9 +671,6 @@ void Con_DrawSolidConsole( float frac ) {
color[3] = 1; color[3] = 1;
SCR_FillRect( 0, y, SCREEN_WIDTH, 2, color ); SCR_FillRect( 0, y, SCREEN_WIDTH, 2, color );
charHeight = floor( SMALLCHAR_HEIGHT * con.textscale );
charWidth = floor( SMALLCHAR_WIDTH * con.textscale );
// draw the version number // draw the version number
re.SetColor( g_color_table[ColorIndex(COLOR_RED)] ); re.SetColor( g_color_table[ColorIndex(COLOR_RED)] );
@ -684,16 +678,16 @@ void Con_DrawSolidConsole( float frac ) {
i = strlen( Q3_VERSION ); i = strlen( Q3_VERSION );
for (x=0 ; x<i ; x++) { for (x=0 ; x<i ; x++) {
SCR_DrawScaledSmallChar( cls.glconfig.vidWidth - ( i - x + 1 ) * charWidth, SCR_DrawSmallChar( cls.glconfig.vidWidth - ( i - x + 1 ) * con.charWidth,
lines - charHeight, con.textscale, Q3_VERSION[x] ); lines - con.charHeight, con.charWidth, con.charHeight, Q3_VERSION[x] );
} }
// draw the text // draw the text
con.vislines = lines; con.vislines = lines;
rows = (lines-charHeight)/charHeight; // rows of text to draw rows = (lines-con.charHeight)/con.charHeight; // rows of text to draw
y = lines - (charHeight*3); y = lines - (con.charHeight*3);
// draw from the bottom up // draw from the bottom up
if (con.display != con.current) if (con.display != con.current)
@ -701,8 +695,8 @@ void Con_DrawSolidConsole( float frac ) {
// draw arrows to show the buffer is backscrolled // draw arrows to show the buffer is backscrolled
re.SetColor( g_color_table[ColorIndex(COLOR_RED)] ); re.SetColor( g_color_table[ColorIndex(COLOR_RED)] );
for (x=0 ; x<con.linewidth ; x+=4) for (x=0 ; x<con.linewidth ; x+=4)
SCR_DrawScaledSmallChar( con.xadjust + (x+1)*charWidth, y, con.textscale, '^' ); SCR_DrawSmallChar( con.xadjust + (x+1)*con.charWidth, y, con.charWidth, con.charHeight, '^' );
y -= charHeight; y -= con.charHeight;
rows--; rows--;
} }
@ -715,7 +709,7 @@ void Con_DrawSolidConsole( float frac ) {
currentColor = 7; currentColor = 7;
re.SetColor( g_color_table[currentColor] ); re.SetColor( g_color_table[currentColor] );
for (i=0 ; i<rows ; i++, y -= charHeight, row--) for (i=0 ; i<rows ; i++, y -= con.charHeight, row--)
{ {
if (row < 0) if (row < 0)
break; break;
@ -735,7 +729,7 @@ void Con_DrawSolidConsole( float frac ) {
currentColor = ColorIndexForNumber( text[x]>>8 ); currentColor = ColorIndexForNumber( text[x]>>8 );
re.SetColor( g_color_table[currentColor] ); re.SetColor( g_color_table[currentColor] );
} }
SCR_DrawScaledSmallChar( con.xadjust + (x+1)*charWidth, y, con.textscale, text[x] & 0xff ); SCR_DrawSmallChar( con.xadjust + (x+1)*con.charWidth, y, con.charWidth, con.charHeight, text[x] & 0xff );
} }
} }
@ -755,13 +749,25 @@ Con_DrawConsole
void Con_DrawConsole( void ) { void Con_DrawConsole( void ) {
if ( con_textscale->value == -1.0f ) { if ( con_textscale->value == -1.0f ) {
con.textscale = cls.glconfig.vidHeight / ( CON_TEXT_LINE_COUNT * SMALLCHAR_HEIGHT + SMALLCHAR_HEIGHT ); float charWidth, charHeight;
//aligning to 4 pixels to avoid any unsmooth text
con.textscale = floor( con.textscale * 100 ) / 100.0f - ( (int)floor( con.textscale * 100 ) % 25 ) / 100.0f; charWidth = SMALLCHAR_WIDTH;
if( con.textscale < 1.0f ) charHeight = SMALLCHAR_HEIGHT;
con.textscale = 1.0f;
SCR_AdjustFrom640( NULL, NULL, &charWidth, &charHeight );
con.charWidth = floor( charWidth );
con.charHeight = floor( charHeight );
} else { } else {
con.textscale = con_textscale->value; con.charWidth = floor( SMALLCHAR_WIDTH * con_textscale->value );
con.charHeight = floor( SMALLCHAR_HEIGHT * con_textscale->value );
}
if ( con.charWidth < 1 ) {
con.charWidth = SMALLCHAR_WIDTH;
}
if ( con.charHeight < 1 ) {
con.charHeight = SMALLCHAR_HEIGHT;
} }
// check for console width changes from a vid mode change // check for console width changes from a vid mode change

45
code/client/cl_keys.c
View file

@ -309,7 +309,7 @@ Handles horizontal scrolling and cursor blinking
x, y, and width are in pixels x, y, and width are in pixels
=================== ===================
*/ */
void Field_VariableSizeDraw( field_t *edit, int x, int y, int width, int size, float scale, qboolean showCursor, void Field_VariableSizeDraw( field_t *edit, int x, int y, int width, int height, qboolean nativeSize, int size, qboolean showCursor,
qboolean noColorEscape ) { qboolean noColorEscape ) {
int len; int len;
int drawLen; int drawLen;
@ -346,17 +346,27 @@ void Field_VariableSizeDraw( field_t *edit, int x, int y, int width, int size, f
Com_Memcpy( str, edit->buffer + prestep, drawLen ); Com_Memcpy( str, edit->buffer + prestep, drawLen );
str[ drawLen ] = 0; str[ drawLen ] = 0;
if( nativeSize ) {
// draw it // draw it
if ( size == SMALLCHAR_WIDTH ) { if ( size == SMALLCHAR_WIDTH ) {
float color[4]; float color[4];
color[0] = color[1] = color[2] = color[3] = 1.0;
color[0] = color[1] = color[2] = color[3] = 1.0; SCR_DrawNativeSmallStringExt( x, y, str, color, qfalse, noColorEscape );
SCR_DrawScaledSmallStringExt( x, y, scale, str, color, qfalse, noColorEscape ); } else {
// draw big string with drop shadow
SCR_DrawBigString( x, y, str, 1.0, noColorEscape );
}
} else { } else {
// draw big string with drop shadow if ( size == SMALLCHAR_WIDTH ) {
SCR_DrawBigString( x, y, str, 1.0, noColorEscape ); float color[4];
}
color[0] = color[1] = color[2] = color[3] = 1.0;
SCR_DrawSmallStringExt( x, y, width, height, str, color, qfalse, noColorEscape );
} else {
// draw big string with drop shadow
SCR_DrawBigString( x, y, str, 1.0, noColorEscape );
}
}
// draw the cursor // draw the cursor
if ( showCursor ) { if ( showCursor ) {
if ( (int)( cls.realtime >> 8 ) & 1 ) { if ( (int)( cls.realtime >> 8 ) & 1 ) {
@ -372,7 +382,7 @@ void Field_VariableSizeDraw( field_t *edit, int x, int y, int width, int size, f
i = drawLen - strlen( str ); i = drawLen - strlen( str );
if ( size == SMALLCHAR_WIDTH ) { if ( size == SMALLCHAR_WIDTH ) {
SCR_DrawScaledSmallChar( x + ( edit->cursor - prestep - i ) * SMALLCHAR_WIDTH * scale, y, scale, cursorChar ); SCR_DrawSmallChar( x + ( edit->cursor - prestep - i ) * width, y, width, height, cursorChar );
} else { } else {
str[0] = cursorChar; str[0] = cursorChar;
str[1] = 0; str[1] = 0;
@ -384,12 +394,12 @@ void Field_VariableSizeDraw( field_t *edit, int x, int y, int width, int size, f
void Field_Draw( field_t *edit, int x, int y, int width, qboolean showCursor, qboolean noColorEscape ) void Field_Draw( field_t *edit, int x, int y, int width, qboolean showCursor, qboolean noColorEscape )
{ {
Field_VariableSizeDraw( edit, x, y, width, SMALLCHAR_WIDTH, 1.0f, showCursor, noColorEscape ); Field_VariableSizeDraw( edit, x, y, width, SMALLCHAR_HEIGHT, qtrue, SMALLCHAR_WIDTH, showCursor, noColorEscape );
} }
void Field_BigDraw( field_t *edit, int x, int y, int width, qboolean showCursor, qboolean noColorEscape ) void Field_BigDraw( field_t *edit, int x, int y, int width, qboolean showCursor, qboolean noColorEscape )
{ {
Field_VariableSizeDraw( edit, x, y, width, BIGCHAR_WIDTH, 1.0f, showCursor, noColorEscape ); Field_VariableSizeDraw( edit, x, y, width, BIGCHAR_HEIGHT, qtrue, BIGCHAR_WIDTH, showCursor, noColorEscape );
} }
/* /*
@ -704,19 +714,24 @@ void Console_Key (int key) {
return; return;
} }
if ( key == K_KP_PLUS && keys[K_CTRL].down && con_textscale->value != -1.0f ) { if ( key == K_KP_PLUS && keys[K_CTRL].down && con_textscale->value > 0.0f ) {
Cvar_SetValue( con_textscale->name, con_textscale->value + 0.25f ); Cvar_SetValue( con_textscale->name, con_textscale->value + 0.25f );
return; return;
} }
if ( key == K_KP_MINUS && keys[K_CTRL].down && con_textscale->value != -1.0f ) { if ( key == K_KP_MINUS && keys[K_CTRL].down && con_textscale->value > 0.0f ) {
if( con_textscale->value - 0.25f >= 0 ) if( con_textscale->value - 0.25f > 0 )
{ {
Cvar_SetValue( con_textscale->name, con_textscale->value - 0.25f ); Cvar_SetValue( con_textscale->name, con_textscale->value - 0.25f );
} }
return; return;
} }
if ( key == K_KP_INS && keys[K_CTRL].down ) {
Cvar_SetValue( con_textscale->name, 1.0f );
return;
}
// pass to the normal editline routine // pass to the normal editline routine
Field_KeyDownEvent( &g_consoleField, key ); Field_KeyDownEvent( &g_consoleField, key );
} }

22
code/client/cl_scrn.c
View file

@ -154,10 +154,10 @@ static void SCR_DrawChar( int x, int y, float size, int ch ) {
} }
/* /*
** SCR_DrawSmallChar ** SCR_DrawNativeSmallChar
** small chars are drawn at native screen resolution ** small chars are drawn at native screen resolution
*/ */
void SCR_DrawSmallChar( int x, int y, int ch ) { void SCR_DrawNativeSmallChar( int x, int y, int ch ) {
int row, col; int row, col;
float frow, fcol; float frow, fcol;
float size; float size;
@ -185,7 +185,7 @@ void SCR_DrawSmallChar( int x, int y, int ch ) {
cls.charSetShader ); cls.charSetShader );
} }
void SCR_DrawScaledSmallChar( int x, int y, float scale, int ch ) { void SCR_DrawSmallChar( int x, int y, int width, int height, int ch ) {
int row, col; int row, col;
float frow, fcol; float frow, fcol;
float size; float size;
@ -196,7 +196,7 @@ void SCR_DrawScaledSmallChar( int x, int y, float scale, int ch ) {
return; return;
} }
if ( y < -SMALLCHAR_HEIGHT*scale ) { if ( y < -height ) {
return; return;
} }
@ -207,7 +207,7 @@ void SCR_DrawScaledSmallChar( int x, int y, float scale, int ch ) {
fcol = col*0.0625; fcol = col*0.0625;
size = 0.0625; size = 0.0625;
re.DrawStretchPic( x, y, SMALLCHAR_WIDTH*scale, SMALLCHAR_HEIGHT*scale, re.DrawStretchPic( x, y, width, height,
fcol, frow, fcol, frow,
fcol + size, frow + size, fcol + size, frow + size,
cls.charSetShader ); cls.charSetShader );
@ -291,7 +291,7 @@ Draws a multi-colored string with a drop shadow, optionally forcing
to a fixed color. to a fixed color.
================== ==================
*/ */
void SCR_DrawSmallStringExt( int x, int y, const char *string, float *setColor, qboolean forceColor, void SCR_DrawSmallStringExt( int x, int y, int width, int height, const char *string, float *setColor, qboolean forceColor,
qboolean noColorEscape ) { qboolean noColorEscape ) {
vec4_t color; vec4_t color;
const char *s; const char *s;
@ -313,15 +313,15 @@ void SCR_DrawSmallStringExt( int x, int y, const char *string, float *setColor,
continue; continue;
} }
} }
SCR_DrawSmallChar( xx, y, *s ); SCR_DrawSmallChar( xx, y, width, height, *s );
xx += SMALLCHAR_WIDTH; xx += width;
s++; s++;
} }
re.SetColor( NULL ); re.SetColor( NULL );
} }
void SCR_DrawScaledSmallStringExt( int x, int y, float scale, const char *string, float *setColor, qboolean forceColor, void SCR_DrawNativeSmallStringExt( int x, int y, const char *string, float *setColor, qboolean forceColor,
qboolean noColorEscape ) { qboolean noColorEscape ) {
vec4_t color; vec4_t color;
const char *s; const char *s;
@ -343,8 +343,8 @@ void SCR_DrawScaledSmallStringExt( int x, int y, float scale, const char *string
continue; continue;
} }
} }
SCR_DrawScaledSmallChar( xx, y, scale, *s ); SCR_DrawNativeSmallChar( xx, y, *s );
xx += SMALLCHAR_WIDTH * scale; xx += SMALLCHAR_WIDTH;
s++; s++;
} }
re.SetColor( NULL ); re.SetColor( NULL );

8
code/client/client.h
View file

@ -576,10 +576,10 @@ void SCR_DrawNamedPic( float x, float y, float width, float height, const char *
void SCR_DrawBigString( int x, int y, const char *s, float alpha, qboolean noColorEscape ); // draws a string with embedded color control characters with fade void SCR_DrawBigString( int x, int y, const char *s, float alpha, qboolean noColorEscape ); // draws a string with embedded color control characters with fade
void SCR_DrawBigStringColor( int x, int y, const char *s, vec4_t color, qboolean noColorEscape ); // ignores embedded color control characters void SCR_DrawBigStringColor( int x, int y, const char *s, vec4_t color, qboolean noColorEscape ); // ignores embedded color control characters
void SCR_DrawSmallStringExt( int x, int y, const char *string, float *setColor, qboolean forceColor, qboolean noColorEscape ); void SCR_DrawNativeSmallStringExt( int x, int y, const char *string, float *setColor, qboolean forceColor, qboolean noColorEscape );
void SCR_DrawScaledSmallStringExt( int x, int y, float scale, const char *string, float *setColor, qboolean forceColor, qboolean noColorEscape ); void SCR_DrawSmallStringExt( int x, int y, int width, int height, const char *string, float *setColor, qboolean forceColor, qboolean noColorEscape );
void SCR_DrawSmallChar( int x, int y, int ch ); void SCR_DrawNativeSmallChar( int x, int y, int ch );
void SCR_DrawScaledSmallChar( int x, int y, float scale, int ch ); void SCR_DrawSmallChar( int x, int y, int width, int height, int ch );
// //

2
code/client/keys.h
View file

@ -35,7 +35,7 @@ void Field_KeyDownEvent( field_t *edit, int key );
void Field_CharEvent( field_t *edit, int ch ); void Field_CharEvent( field_t *edit, int ch );
void Field_Draw( field_t *edit, int x, int y, int width, qboolean showCursor, qboolean noColorEscape ); void Field_Draw( field_t *edit, int x, int y, int width, qboolean showCursor, qboolean noColorEscape );
void Field_BigDraw( field_t *edit, int x, int y, int width, qboolean showCursor, qboolean noColorEscape ); void Field_BigDraw( field_t *edit, int x, int y, int width, qboolean showCursor, qboolean noColorEscape );
void Field_VariableSizeDraw( field_t *edit, int x, int y, int width, int size, float scale, qboolean showCursor, qboolean noColorEscape ); void Field_VariableSizeDraw( field_t *edit, int x, int y, int width, int height, qboolean nativeSize, int size, qboolean showCursor, qboolean noColorEscape );
#define COMMAND_HISTORY 32 #define COMMAND_HISTORY 32
extern field_t historyEditLines[COMMAND_HISTORY]; extern field_t historyEditLines[COMMAND_HISTORY];