int con_current;
// offset in current line for next print
int con_x;
-char *con_text = 0;
+char con_text[CON_TEXTSIZE];
//seconds
cvar_t con_notifytime = {CVAR_SAVE, "con_notifytime","3"};
qboolean con_initialized;
-mempool_t *console_mempool;
-
/*
==============================================================================
}
-/*
-====================
-Log_Init
-====================
-*/
-void Log_Init (void)
-{
- // Allocate a log queue
- logq_size = 512;
- logqueue = Mem_Alloc (tempmempool, logq_size);
- logq_ind = 0;
-
- Cvar_RegisterVariable (&log_file);
-
- // support for the classic Quake option
-// COMMANDLINEOPTION: Console: -condebug logs console messages to qconsole.log, see also log_file
- if (COM_CheckParm ("-condebug") != 0)
- Cvar_SetQuick (&log_file, "qconsole.log");
-}
-
-
/*
====================
Log_Open
int i, j, width, oldwidth, oldtotallines, numlines, numchars;
char tbuf[CON_TEXTSIZE];
- width = (vid.conwidth >> 3);
+ width = (vid_conwidth.integer >> 3);
if (width == con_linewidth)
return;
- if (width < 1) // video hasn't been initialized yet
- {
- width = 80;
- con_linewidth = width;
- con_totallines = CON_TEXTSIZE / con_linewidth;
- memset (con_text, ' ', CON_TEXTSIZE);
- }
- else
- {
- oldwidth = con_linewidth;
- con_linewidth = width;
- oldtotallines = con_totallines;
- con_totallines = CON_TEXTSIZE / con_linewidth;
- numlines = oldtotallines;
+ oldwidth = con_linewidth;
+ con_linewidth = width;
+ oldtotallines = con_totallines;
+ con_totallines = CON_TEXTSIZE / con_linewidth;
+ numlines = oldtotallines;
- if (con_totallines < numlines)
- numlines = con_totallines;
+ if (con_totallines < numlines)
+ numlines = con_totallines;
- numchars = oldwidth;
+ numchars = oldwidth;
- if (con_linewidth < numchars)
- numchars = con_linewidth;
+ if (con_linewidth < numchars)
+ numchars = con_linewidth;
- memcpy (tbuf, con_text, CON_TEXTSIZE);
- memset (con_text, ' ', CON_TEXTSIZE);
+ memcpy (tbuf, con_text, CON_TEXTSIZE);
+ memset (con_text, ' ', CON_TEXTSIZE);
- for (i=0 ; i<numlines ; i++)
+ for (i=0 ; i<numlines ; i++)
+ {
+ for (j=0 ; j<numchars ; j++)
{
- for (j=0 ; j<numchars ; j++)
- {
- con_text[(con_totallines - 1 - i) * con_linewidth + j] =
- tbuf[((con_current - i + oldtotallines) %
- oldtotallines) * oldwidth + j];
- }
+ con_text[(con_totallines - 1 - i) * con_linewidth + j] =
+ tbuf[((con_current - i + oldtotallines) %
+ oldtotallines) * oldwidth + j];
}
-
- Con_ClearNotify ();
}
+ Con_ClearNotify ();
+
con_backscroll = 0;
con_current = con_totallines - 1;
}
*/
void Con_Init (void)
{
- console_mempool = Mem_AllocPool("console", 0, NULL);
- con_text = Mem_Alloc(console_mempool, CON_TEXTSIZE);
memset (con_text, ' ', CON_TEXTSIZE);
- con_linewidth = -1;
- Con_CheckResize ();
+ con_linewidth = 80;
+ con_totallines = CON_TEXTSIZE / con_linewidth;
+
+ // Allocate a log queue
+ logq_size = 512;
+ logqueue = Mem_Alloc (tempmempool, logq_size);
+ logq_ind = 0;
+ Cvar_RegisterVariable (&log_file);
+
+ // support for the classic Quake option
+// COMMANDLINEOPTION: Console: -condebug logs console messages to qconsole.log, see also log_file
+ if (COM_CheckParm ("-condebug") != 0)
+ Cvar_SetQuick (&log_file, "qconsole.log");
+}
+
+void Con_Init_Commands (void)
+{
// register our cvars
Cvar_RegisterVariable (&con_notifytime);
Cvar_RegisterVariable (&con_notify);
If no console is visible, the notify window will pop up.
================
*/
-void Con_PrintToHistory(const char *txt)
+void Con_PrintToHistory(const char *txt, int mask)
{
- int y, c, l, mask;
+ int y, c, l;
static int cr;
- if (txt[0] == 1)
- {
- mask = 128; // go to colored text
- S_LocalSound ("sound/misc/talk.wav");
- // play talk wav
- txt++;
- }
- else if (txt[0] == 2)
- {
- mask = 128; // go to colored text
- txt++;
- }
- else
- mask = 0;
-
-
while ( (c = *txt) )
{
// count word length
extern qboolean sys_nostdout;
void Con_Print(const char *msg)
{
+ int mask = 0;
static int index = 0;
static char line[16384];
{
// if this is the beginning of a new line, print timestamp
char *timestamp = timestamps.integer ? Sys_TimeString(timeformat.string) : "";
+ // reset the color
+ // FIXME: 1. perhaps we should use a terminal system 2. use a constant instead of 7!
+ line[index++] = '^';
+ line[index++] = '7';
// special color codes for chat messages must always come first
// for Con_PrintToHistory to work properly
if (*msg <= 2)
- line[index++] = *msg++;
+ {
+ if (*msg == 1)
+ {
+ // play talk wav
+ S_LocalSound ("sound/misc/talk.wav");
+ }
+ if (gamemode == GAME_NEXUIZ)
+ {
+ line[index++] = '^';
+ line[index++] = '3';
+ }
+ else
+ {
+ // go to colored text
+ mask = 128;
+ }
+ msg++;
+ }
// store timestamp
for (;*timestamp;index++, timestamp++)
if (index < sizeof(line) - 2)
Log_ConPrint(line);
// send to scrollable buffer
if (con_initialized && cls.state != ca_dedicated)
- Con_PrintToHistory(line);
+ Con_PrintToHistory(line, mask);
// send to terminal or dedicated server window
if (!sys_nostdout)
{
==============================================================================
*/
-static vec4_t _con_colors[] =
-{
- {1.0, 1.0, 1.0, 1.0},
- {1.0, 0.0, 0.0, 1.0},
- {0.0, 1.0, 0.0, 1.0},
- {0.0, 0.0, 1.0, 1.0},
- {1.0, 1.0, 0.0, 1.0},
- {0.0, 1.0, 1.0, 1.0},
- {1.0, 0.0, 1.0, 1.0},
- {0.1, 0.1, 0.1, 1.0}
-};
-
-#define _con_colors_count (sizeof(_con_colors) / sizeof(vec3_t))
-#define _con_color_tag '^'
-
-// color is read and changed in the end
-static void _Con_DrawString( float x, float y, const char *text, int maxlen, float scalex, float scaley, int flags )
-{
- vec_t *color;
- const char *first, *last;
- int len;
-
- color = _con_colors[0];
- if( maxlen < 1)
- len = strlen( text );
- else
- len = min( maxlen, (signed) strlen( text ));
-
- first = last = text;
- while( 1 ) {
- // iterate until we get the next color tag or reach the end of the text part to draw
- for( ; len && *last != _con_color_tag ; len--, last++ )
- ;
- // dont do anything if we havent read anything yet
- if( last != text ) {
- // draw the string
- DrawQ_String( x, y, first, last - first, scalex, scaley, color[0], color[1], color[2], color[3], flags );
- // update x to be at the new start position
- x += (last - first) * scalex;
- // if we have reached the end, we have finished
- if( !len )
- break;
- }
- first = last;
- // jump over the tag
- last++;
- len--;
- if( len && '0' <= *last && *last <= '9' ) {
- int index = 0;
-
- while( '0' <= *last && *last <= '9' && len ) {
- index = index * 10 + *last - '0';
- if( index < _con_colors_count ) {
- last++;
- len--;
- } else {
- index /= 10;
- break;
- }
- }
-
- color = _con_colors[index];
- // we dont want to display the color tag and the color index
- first = last;
- }
- }
-}
-
/*
================
Con_DrawInput
text += 1 + key_linepos - con_linewidth;
// draw it
- _Con_DrawString(0, con_vislines - 16, text, con_linewidth, 8, 8, 0);
+ DrawQ_ColoredString(0, con_vislines - 16, text, con_linewidth, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, NULL );
// remove cursor
// key_lines[edit_line][key_linepos] = 0;
float time;
extern char chat_buffer[];
char temptext[256];
+ int colorindex = -1; //-1 for default
if (con_notify.integer < 0)
Cvar_SetValueQuick(&con_notify, 0);
v = 0;
for (i= con_current-con_notify.integer+1 ; i<=con_current ; i++)
{
+
if (i < 0)
continue;
time = con_times[i % con_notify.integer];
int linewidth;
for (linewidth = con_linewidth; linewidth && text[linewidth-1] == ' '; linewidth--);
- x = (vid.conwidth - linewidth * 8) / 2;
+ x = (vid_conwidth.integer - linewidth * 8) / 2;
} else
x = 0;
- _Con_DrawString(x, v, text, con_linewidth, 8, 8, 0);
-
+ DrawQ_ColoredString( x, v, text, con_linewidth, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
+
v += 8;
}
if (key_dest == key_message)
{
+ int colorindex = -1;
+
x = 0;
// LordHavoc: speedup, and other improvements
sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1));
while (strlen(temptext) >= (size_t) con_linewidth)
{
- _Con_DrawString (0, v, temptext, con_linewidth, 8, 8, 0);
+ DrawQ_ColoredString( 0, v, temptext, con_linewidth, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
strcpy(temptext, &temptext[con_linewidth]);
v += 8;
}
if (strlen(temptext) > 0)
{
- _Con_DrawString (0, v, temptext, 0, 8, 8, 0);
+ DrawQ_ColoredString( 0, v, temptext, 0, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
v += 8;
}
}
{
int i, y, rows, j;
char *text;
+ int colorindex = -1;
if (lines <= 0)
return;
// draw the background
if (scr_conbrightness.value >= 0.01f)
- DrawQ_Pic(0, lines - vid.conheight, "gfx/conback", vid.conwidth, vid.conheight, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, scr_conalpha.value, 0);
+ DrawQ_Pic(0, lines - vid_conheight.integer, "gfx/conback", vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, scr_conalpha.value, 0);
else
- DrawQ_Fill(0, lines - vid.conheight, vid.conwidth, vid.conheight, 0, 0, 0, scr_conalpha.value, 0);
- DrawQ_String(vid.conwidth - strlen(engineversion) * 8 - 8, lines - 8, engineversion, 0, 8, 8, 1, 0, 0, 1, 0);
+ DrawQ_Fill(0, lines - vid_conheight.integer, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, scr_conalpha.value, 0);
+ DrawQ_String(vid_conwidth.integer - strlen(engineversion) * 8 - 8, lines - 8, engineversion, 0, 8, 8, 1, 0, 0, 1, 0);
// draw the text
con_vislines = lines;
j = max(i - con_backscroll, 0);
text = con_text + (j % con_totallines)*con_linewidth;
- _Con_DrawString(0, y, text, con_linewidth, 8, 8, 0);
+ DrawQ_ColoredString( 0, y, text, con_linewidth, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
}
// draw the input prompt, user text, and cursor if desired
projects / xonotic / darkplaces.git / blobdiff