mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2025-02-15 08:21:41 +00:00
A fix to Con_DrawInput for new console editing style.
This commit is contained in:
parent
d3dd8d3e36
commit
bd2524f060
1 changed files with 14 additions and 10 deletions
|
@ -444,19 +444,21 @@ void Con_DrawInput (void)
|
||||||
int y;
|
int y;
|
||||||
int i;
|
int i;
|
||||||
char *text;
|
char *text;
|
||||||
|
char temp[MAXCMDLINE];
|
||||||
|
|
||||||
if (key_dest != key_console && cls.state == ca_active)
|
if (key_dest != key_console && cls.state == ca_active)
|
||||||
return; // don't draw anything (allways draw if not active)
|
return; // don't draw anything (allways draw if not active)
|
||||||
|
|
||||||
text = key_lines[edit_line];
|
text = strcpy (temp, key_lines[edit_line]);
|
||||||
|
|
||||||
// add the cursor frame
|
|
||||||
text[key_linepos] = 10+((int)(realtime*con_cursorspeed)&1);
|
|
||||||
|
|
||||||
// fill out remainder with spaces
|
// fill out remainder with spaces
|
||||||
for (i=key_linepos+1 ; i< con_linewidth ; i++)
|
for (i=strlen(text) ; i < MAXCMDLINE ; i++)
|
||||||
text[i] = ' ';
|
text[i] = ' ';
|
||||||
|
|
||||||
|
// add the cursor frame
|
||||||
|
if ( (int)(realtime*con_cursorspeed) & 1 )
|
||||||
|
text[key_linepos] = 11;
|
||||||
|
|
||||||
// prestep if horizontally scrolling
|
// prestep if horizontally scrolling
|
||||||
if (key_linepos >= con_linewidth)
|
if (key_linepos >= con_linewidth)
|
||||||
text += 1 + key_linepos - con_linewidth;
|
text += 1 + key_linepos - con_linewidth;
|
||||||
|
@ -466,9 +468,6 @@ void Con_DrawInput (void)
|
||||||
|
|
||||||
for (i=0 ; i<con_linewidth ; i++)
|
for (i=0 ; i<con_linewidth ; i++)
|
||||||
Draw_Character ( (i+1)<<3, con_vislines - 22, text[i]);
|
Draw_Character ( (i+1)<<3, con_vislines - 22, text[i]);
|
||||||
|
|
||||||
// remove cursor
|
|
||||||
key_lines[edit_line][key_linepos] = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -557,8 +556,10 @@ void Con_DrawConsole (int lines)
|
||||||
int rows;
|
int rows;
|
||||||
char *text;
|
char *text;
|
||||||
int row;
|
int row;
|
||||||
|
#ifdef QUAKEWORLD
|
||||||
int j, n;
|
int j, n;
|
||||||
char dlbar[1024];
|
char dlbar[1024];
|
||||||
|
#endif
|
||||||
|
|
||||||
if (lines <= 0)
|
if (lines <= 0)
|
||||||
return;
|
return;
|
||||||
|
@ -599,6 +600,7 @@ void Con_DrawConsole (int lines)
|
||||||
Draw_Character ( (x+1)<<3, y, text[x]);
|
Draw_Character ( (x+1)<<3, y, text[x]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef QUAKEWORLD
|
||||||
// draw the download bar
|
// draw the download bar
|
||||||
// figure out width
|
// figure out width
|
||||||
if (cls.download) {
|
if (cls.download) {
|
||||||
|
@ -641,6 +643,8 @@ void Con_DrawConsole (int lines)
|
||||||
for (i = 0; i < strlen(dlbar); i++)
|
for (i = 0; i < strlen(dlbar); i++)
|
||||||
Draw_Character ( (i+1)<<3, y, dlbar[i]);
|
Draw_Character ( (i+1)<<3, y, dlbar[i]);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// draw the input prompt, user text, and cursor if desired
|
// draw the input prompt, user text, and cursor if desired
|
||||||
Con_DrawInput ();
|
Con_DrawInput ();
|
||||||
|
|
Loading…
Reference in a new issue