X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=console.c;h=97c2bd224b0aa5d1a2cd1ea1c582521811e0a7a8;hp=8020de1baaab8863f89136e2c2239f18ab5a2a0f;hb=b96a22554e71b618bfc62d2f30cc0392cb34305c;hpb=3b7db4cb67e7468650e039c7ea8dac854e4deae6 diff --git a/console.c b/console.c index 8020de1b..97c2bd22 100644 --- a/console.c +++ b/console.c @@ -39,7 +39,7 @@ int con_backscroll; 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"}; @@ -60,8 +60,6 @@ extern int key_insert; qboolean con_initialized; -mempool_t *console_mempool; - /* ============================================================================== @@ -72,7 +70,6 @@ LOGGING */ 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; @@ -100,40 +97,14 @@ const char* Log_Timestamp (const char *desc) 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) -{ - // Allocate a log queue - logq_size = 512; - logqueue = Mem_Alloc (tempmempool, logq_size); - logq_ind = 0; - - Cvar_RegisterVariable (&log_file); - Cvar_RegisterVariable (&log_sync); - - // support for the classic Quake option -// COMMANDLINEOPTION: Console: -condebug logs console messages to qconsole.log with sync on (so it keeps every message up to a crash), see also log_file and log_sync - if (COM_CheckParm ("-condebug") != 0) - { - Cvar_SetQuick (&log_file, "qconsole.log"); - Cvar_SetValueQuick (&log_sync, 1); - unlink (va("%s/qconsole.log", fs_gamedir)); - } -} - - /* ==================== Log_Open @@ -144,7 +115,7 @@ void Log_Open (void) 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)); @@ -201,6 +172,13 @@ Log_ConPrint */ 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) @@ -224,6 +202,7 @@ void Log_ConPrint (const char *msg) memcpy (&logqueue[logq_ind], msg, len); logq_ind += len; + inprogress = false; return; } @@ -236,30 +215,11 @@ void Log_ConPrint (const char *msg) // 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 @@ -269,7 +229,7 @@ void Log_Printf (const char *logfilename, const char *fmt, ...) { qfile_t *file; - file = FS_Open (logfilename, "at", true); + file = FS_Open (logfilename, "ab", true, false); if (file != NULL) { va_list argptr; @@ -365,50 +325,40 @@ void Con_CheckResize (void) 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', + ' ', '!', '"', '#', '$', '%', '&', '\'', + '(', ')', '*', '+', ',', '-', '.', '/', + '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; - - if (cls.state == ca_dedicated) - return; // no graphics mode + int mask = 0; + static int index = 0; + static char line[16384]; - // 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) : ""; + // 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 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); + } + // send to scrollable buffer + if (con_initialized && cls.state != ca_dedicated) + Con_PrintToHistory(line, mask); + // empty the line buffer + index = 0; + } + } } @@ -586,7 +619,7 @@ void Con_Printf(const char *fmt, ...) char msg[MAXPRINTMSG]; va_start(argptr,fmt); - vsprintf(msg,fmt,argptr); + dpvsnprintf(msg,sizeof(msg),fmt,argptr); va_end(argptr); Con_Print(msg); @@ -622,39 +655,7 @@ void Con_DPrintf(const char *fmt, ...) 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); @@ -669,6 +670,85 @@ DRAWING ============================================================================== */ +static vec4_t _con_colors[] = +{ + // Quake3 colors + // LordHavoc: why on earth is cyan before magenta in Quake3? + // LordHavoc: note: Doom3 uses white for [0] and [7] + {0.0, 0.0, 0.0, 1.0}, // black + {1.0, 0.0, 0.0, 1.0}, // red + {0.0, 1.0, 0.0, 1.0}, // green + {1.0, 1.0, 0.0, 1.0}, // yellow + {0.0, 0.0, 1.0, 1.0}, // blue + {0.0, 1.0, 1.0, 1.0}, // cyan + {1.0, 0.0, 1.0, 1.0}, // magenta + {1.0, 1.0, 1.0, 1.0} // white + // Black's color table + //{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[7]; + 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++ ) + ; + // only draw the partial string if we have read anything + if( last != first ) { + // 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; + } + } +} /* ================ @@ -712,7 +792,7 @@ void Con_DrawInput (void) text += 1 + key_linepos - con_linewidth; // draw it - DrawQ_String(0, con_vislines - 16, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0); + _Con_DrawString(0, con_vislines - 16, text, con_linewidth, 8, 8, 0); // remove cursor // key_lines[edit_line][key_linepos] = 0; @@ -755,9 +835,15 @@ void Con_DrawNotify (void) continue; text = con_text + (i % con_totallines)*con_linewidth; - clearnotify = 0; + if (gamemode == GAME_NEXUIZ) { + int linewidth; + + for (linewidth = con_linewidth; linewidth && text[linewidth-1] == ' '; linewidth--); + x = (vid_conwidth.integer - linewidth * 8) / 2; + } else + x = 0; - DrawQ_String(0, v, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0); + _Con_DrawString(x, v, text, con_linewidth, 8, 8, 0); v += 8; } @@ -765,8 +851,6 @@ void Con_DrawNotify (void) if (key_dest == key_message) { - clearnotify = 0; - x = 0; // LordHavoc: speedup, and other improvements @@ -776,13 +860,13 @@ void Con_DrawNotify (void) 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); + _Con_DrawString (0, v, temptext, con_linewidth, 8, 8, 0); strcpy(temptext, &temptext[con_linewidth]); v += 8; } if (strlen(temptext) > 0) { - DrawQ_String (0, v, temptext, 0, 8, 8, 1, 1, 1, 1, 0); + _Con_DrawString (0, v, temptext, 0, 8, 8, 0); v += 8; } } @@ -807,10 +891,10 @@ void Con_DrawConsole (int lines) // 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; @@ -823,7 +907,7 @@ void Con_DrawConsole (int 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); + _Con_DrawString(0, y, text, con_linewidth, 8, 8, 0); } // draw the input prompt, user text, and cursor if desired