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;
-
/*
==============================================================================
*/
cvar_t log_file = {0, "log_file",""};
-cvar_t log_sync = {0, "log_sync","0"};
char crt_log_file [MAX_OSPATH] = "";
qfile_t* logfile = NULL;
strftime (timestring, sizeof (timestring), "%a %b %d %H:%M:%S %Y", crt_tm);
if (desc != NULL)
- snprintf (timestamp, sizeof (timestamp), "====== %s (%s) ======\n", desc, timestring);
+ dpsnprintf (timestamp, sizeof (timestamp), "====== %s (%s) ======\n", desc, timestring);
else
- snprintf (timestamp, sizeof (timestamp), "====== %s ======\n", timestring);
+ dpsnprintf (timestamp, sizeof (timestamp), "====== %s ======\n", timestring);
return timestamp;
}
-/*
-====================
-Log_Init
-====================
-*/
-void Log_Init (void)
-{
- Cvar_RegisterVariable (&log_file);
- Cvar_RegisterVariable (&log_sync);
-
- // support for the classic Quake option
- if (COM_CheckParm ("-condebug") != 0)
- {
- Cvar_SetQuick (&log_file, "qconsole.log");
- Cvar_SetValueQuick (&log_sync, 1);
- unlink (va("%s/qconsole.log", fs_gamedir));
- }
-
- // Allocate a log queue
- logq_size = 512;
- logqueue = Mem_Alloc (tempmempool, logq_size);
- logq_ind = 0;
-}
-
-
/*
====================
Log_Open
if (logfile != NULL || log_file.string[0] == '\0')
return;
- logfile = FS_Open (log_file.string, "at", false);
+ logfile = FS_Open (log_file.string, "ab", false, false);
if (logfile != NULL)
{
strlcpy (crt_log_file, log_file.string, sizeof (crt_log_file));
*/
void Log_ConPrint (const char *msg)
{
+ static qboolean inprogress = false;
+
+ // don't allow feedback loops with memory error reports
+ if (inprogress)
+ return;
+ inprogress = true;
+
// Until the host is completely initialized, we maintain a log queue
// to store the messages, since the log can't be started before
if (logqueue != NULL)
memcpy (&logqueue[logq_ind], msg, len);
logq_ind += len;
+ inprogress = false;
return;
}
// If a log file is available
if (logfile != NULL)
- {
FS_Print (logfile, msg);
- if (log_sync.integer)
- FS_Flush (logfile);
- }
+ inprogress = false;
}
-/*
-================
-Log_Print
-================
-*/
-void Log_Print (const char *logfilename, const char *msg)
-{
- qfile_t *file;
- file = FS_Open(logfilename, "at", true);
- if (file)
- {
- FS_Print(file, msg);
- FS_Close(file);
- }
-}
-
/*
================
Log_Printf
{
qfile_t *file;
- file = FS_Open (logfilename, "at", true);
+ file = FS_Open (logfilename, "ab", true, false);
if (file != NULL)
{
va_list argptr;
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");
- 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;
- Con_Print("Console initialized.\n");
+ // 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);
Cmd_AddCommand ("messagemode", Con_MessageMode_f);
Cmd_AddCommand ("messagemode2", Con_MessageMode2_f);
Cmd_AddCommand ("clear", Con_Clear_f);
+
con_initialized = true;
+ Con_Print("Console initialized.\n");
}
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 ("misc/talk.wav", true);
- // 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
}
}
+/* The translation table between the graphical font and plain ASCII --KB */
+static char qfont_table[256] = {
+ '\0', '#', '#', '#', '#', '.', '#', '#',
+ '#', 9, 10, '#', ' ', 13, '.', '.',
+ '[', ']', '0', '1', '2', '3', '4', '5',
+ '6', '7', '8', '9', '.', '<', '=', '>',
+ ' ', '!', '"', '#', '$', '%', '&', '\'',
+ '(', ')', '*', '+', ',', '-', '.', '/',
+ '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', ':', ';', '<', '=', '>', '?',
+ '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+ 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+ 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+ 'X', 'Y', 'Z', '[', '\\', ']', '^', '_',
+ '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+ 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+ 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
+ 'x', 'y', 'z', '{', '|', '}', '~', '<',
+
+ '<', '=', '>', '#', '#', '.', '#', '#',
+ '#', '#', ' ', '#', ' ', '>', '.', '.',
+ '[', ']', '0', '1', '2', '3', '4', '5',
+ '6', '7', '8', '9', '.', '<', '=', '>',
+ ' ', '!', '"', '#', '$', '%', '&', '\'',
+ '(', ')', '*', '+', ',', '-', '.', '/',
+ '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', ':', ';', '<', '=', '>', '?',
+ '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+ 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+ 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+ 'X', 'Y', 'Z', '[', '\\', ']', '^', '_',
+ '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+ 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+ 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
+ 'x', 'y', 'z', '{', '|', '}', '~', '<'
+};
+
/*
================
Con_Print
-Prints to all appropriate console targets
+Prints to all appropriate console targets, and adds timestamps
================
*/
+extern cvar_t timestamps;
+extern cvar_t timeformat;
+extern qboolean sys_nostdout;
void Con_Print(const char *msg)
{
- // also echo to debugging console
- Sys_Print(msg);
-
- // log all messages to file
- Log_ConPrint (msg);
-
- if (!con_initialized)
- return;
+ int mask = 0;
+ static int index = 0;
+ static char line[16384];
- if (cls.state == ca_dedicated)
- return; // no graphics mode
-
- // write it to the scrollable buffer
- Con_PrintToHistory(msg);
+ for (;*msg;msg++)
+ {
+ if (index == 0)
+ {
+ // 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)
+ {
+ 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)
+ line[index] = *timestamp;
+ }
+ // append the character
+ line[index++] = *msg;
+ // if this is a newline character, we have a complete line to print
+ if (*msg == '\n' || index >= 16000)
+ {
+ // terminate the line
+ line[index] = 0;
+ // send to log file
+ Log_ConPrint(line);
+ // send to scrollable buffer
+ if (con_initialized && cls.state != ca_dedicated)
+ Con_PrintToHistory(line, mask);
+ // send to terminal or dedicated server window
+ if (!sys_nostdout)
+ {
+ unsigned char *p;
+ for (p = (unsigned char *) line;*p; p++)
+ *p = qfont_table[*p];
+ Sys_PrintToTerminal(line);
+ }
+ // empty the line buffer
+ index = 0;
+ }
+ }
}
char msg[MAXPRINTMSG];
va_start(argptr,fmt);
- vsprintf(msg,fmt,argptr);
+ dpvsnprintf(msg,sizeof(msg),fmt,argptr);
va_end(argptr);
Con_Print(msg);
return; // don't confuse non-developers with techie stuff...
va_start(argptr,fmt);
- vsprintf(msg,fmt,argptr);
- va_end(argptr);
-
- Con_Print(msg);
-}
-
-
-/*
-================
-Con_SafePrint
-
-Okay to call even when the screen can't be updated
-==================
-*/
-void Con_SafePrint(const char *msg)
-{
- Con_Print(msg);
-}
-
-/*
-==================
-Con_SafePrintf
-
-Okay to call even when the screen can't be updated
-==================
-*/
-void Con_SafePrintf(const char *fmt, ...)
-{
- va_list argptr;
- char msg[MAXPRINTMSG];
-
- va_start(argptr,fmt);
- vsprintf(msg,fmt,argptr);
+ dpvsnprintf(msg,sizeof(msg),fmt,argptr);
va_end(argptr);
Con_Print(msg);
==============================================================================
*/
-
/*
================
Con_DrawInput
text += 1 + key_linepos - con_linewidth;
// draw it
- DrawQ_String(0, con_vislines - 16, text, con_linewidth, 8, 8, 1, 1, 1, 1, 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];
continue;
text = con_text + (i % con_totallines)*con_linewidth;
- clearnotify = 0;
+ if (gamemode == GAME_NEXUIZ) {
+ int linewidth;
- DrawQ_String(0, v, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
+ for (linewidth = con_linewidth; linewidth && text[linewidth-1] == ' '; linewidth--);
+ x = (vid_conwidth.integer - linewidth * 8) / 2;
+ } else
+ x = 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)
{
- clearnotify = 0;
+ int colorindex = -1;
x = 0;
sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1));
while (strlen(temptext) >= (size_t) con_linewidth)
{
- DrawQ_String (0, v, temptext, con_linewidth, 8, 8, 1, 1, 1, 1, 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)
{
- DrawQ_String (0, v, temptext, 0, 8, 8, 1, 1, 1, 1, 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;
- DrawQ_String(0, y, text, con_linewidth, 8, 8, 1, 1, 1, 1, 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