vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: client: console: simplify Field_DrawInputLine, try to make it safer

Browse source
This commit is contained in:
Alibek Omarov 2025-03-08 02:35:29 +03:00
parent b2d8239829
commit a5191d8948
1 changed files with 9 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
engine/client/console.c
View file

@ -1267,45 +1267,16 @@ static void Field_CharEvent( field_t *edit, int ch )
Field_DrawInputLine Field_DrawInputLine
================== ==================
*/ */
static void Field_DrawInputLine( int x, int y, field_t *edit ) static void Field_DrawInputLine( int x, int y, const field_t *edit )
{ {
int len, cursorChar; int curPos;
int drawLen; char str[MAX_SYSPATH];
int prestep, curPos; const byte *colorDefault = g_color_table[ColorIndex( COLOR_DEFAULT )];
char str[MAX_SYSPATH]; const int prestep = bound( 0, edit->scroll, sizeof( edit->buffer ) - 1 );
byte *colorDefault; const int drawLen = bound( 0, edit->widthInChars, sizeof( str ));
const int cursorCharPos = bound( 0, edit->cursor - prestep, sizeof( str ));
drawLen = edit->widthInChars; Q_strncpy( str, edit->buffer + prestep, drawLen );
len = Q_strlen( edit->buffer ) + 1;
colorDefault = g_color_table[ColorIndex( COLOR_DEFAULT )];
// guarantee that cursor will be visible
if( len <= drawLen )
{
prestep = 0;
}
else
{
if( edit->scroll + drawLen > len )
{
edit->scroll = len - drawLen;
if( edit->scroll < 0 ) edit->scroll = 0;
}
prestep = edit->scroll;
}
if( prestep + drawLen > len )
drawLen = len - prestep;
// extract <drawLen> characters from the field at <prestep>
drawLen = Q_min( drawLen, MAX_SYSPATH - 1 );
memcpy( str, edit->buffer + prestep, drawLen );
str[drawLen] = 0;
// save char for overstrike
cursorChar = str[edit->cursor - prestep];
// draw it // draw it
CL_DrawString( x, y, str, colorDefault, con.curFont, FONT_DRAW_UTF8 ); CL_DrawString( x, y, str, colorDefault, con.curFont, FONT_DRAW_UTF8 );
@ -1314,7 +1285,7 @@ static void Field_DrawInputLine( int x, int y, field_t *edit )
if((int)( host.realtime * 4 ) & 1 ) return; // off blink if((int)( host.realtime * 4 ) & 1 ) return; // off blink
// calc cursor position // calc cursor position
str[edit->cursor - prestep] = 0; str[cursorCharPos] = 0;
CL_DrawStringLen( con.curFont, str, &curPos, NULL, FONT_DRAW_UTF8 ); CL_DrawStringLen( con.curFont, str, &curPos, NULL, FONT_DRAW_UTF8 );
if( host.key_overstrike ) if( host.key_overstrike )