X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=console.c;h=c218a1defd848557fad8b7bc8a7204caf2c75e53;hb=5eadf077b1314f28fd88f831ec5310cc8cdff7af;hp=0a1936024d8064c49e9f062b95e694db9ee6df13;hpb=47f95d0ef17b9bce5cc7da446a22c1ea7f2f5824;p=xonotic%2Fdarkplaces.git diff --git a/console.c b/console.c index 0a193602..c218a1de 100644 --- a/console.c +++ b/console.c @@ -19,9 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // console.c -#ifndef WIN32 +#if !defined(WIN32) || defined(__MINGW32__) # include #endif +#include #include "quakedef.h" int con_linewidth; @@ -38,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"}; @@ -59,8 +60,6 @@ extern int key_insert; qboolean con_initialized; -mempool_t *console_mempool; - /* ============================================================================== @@ -71,13 +70,41 @@ 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; qbyte* logqueue = NULL; size_t logq_ind = 0; size_t logq_size = 0; +void Log_ConPrint (const char *msg); + +/* +==================== +Log_Timestamp +==================== +*/ +const char* Log_Timestamp (const char *desc) +{ + static char timestamp [128]; + time_t crt_time; + const struct tm *crt_tm; + char timestring [64]; + + // Build the time stamp (ex: "Wed Jun 30 21:49:08 1993"); + time (&crt_time); + crt_tm = localtime (&crt_time); + strftime (timestring, sizeof (timestring), "%a %b %d %H:%M:%S %Y", crt_tm); + + if (desc != NULL) + dpsnprintf (timestamp, sizeof (timestamp), "====== %s (%s) ======\n", desc, timestring); + else + dpsnprintf (timestamp, sizeof (timestamp), "====== %s ======\n", timestring); + + return timestamp; +} + + /* ==================== Log_Init @@ -85,20 +112,55 @@ 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, see also log_file if (COM_CheckParm ("-condebug") != 0) - { Cvar_SetQuick (&log_file, "qconsole.log"); - Cvar_SetValueQuick (&log_sync, 1); +} + + +/* +==================== +Log_Open +==================== +*/ +void Log_Open (void) +{ + if (logfile != NULL || log_file.string[0] == '\0') + return; + + logfile = FS_Open (log_file.string, "ab", false, false); + if (logfile != NULL) + { + strlcpy (crt_log_file, log_file.string, sizeof (crt_log_file)); + FS_Print (logfile, Log_Timestamp ("Log started")); } +} - // Allocate a log queue - logq_size = 256; - logqueue = Mem_Alloc (tempmempool, logq_size); - logq_ind = 0; + +/* +==================== +Log_Close +==================== +*/ +void Log_Close (void) +{ + if (logfile == NULL) + return; + + FS_Print (logfile, Log_Timestamp ("Log stopped")); + FS_Print (logfile, "\n"); + FS_Close (logfile); + + logfile = NULL; + crt_log_file[0] = '\0'; } @@ -109,8 +171,7 @@ Log_Start */ void Log_Start (void) { - if (log_file.string[0] != '\0') - logfile = FS_Open (log_file.string, "wt", false); + Log_Open (); // Dump the contents of the log queue into the log file and free it if (logqueue != NULL) @@ -132,14 +193,12 @@ Log_ConPrint */ void Log_ConPrint (const char *msg) { - // Easy case: a log has been started - if (logfile != NULL) - { - FS_Print (logfile, msg); - if (log_sync.integer) - FS_Flush (logfile); + 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 @@ -163,26 +222,25 @@ void Log_ConPrint (const char *msg) } memcpy (&logqueue[logq_ind], msg, len); logq_ind += len; - } -} + inprogress = false; + return; + } -/* -================ -Log_Print -================ -*/ -void Log_Print (const char *logfilename, const char *msg) -{ - qfile_t *file; - file = FS_Open(logfilename, "at", true); - if (file) + // Check if log_file has changed + if (strcmp (crt_log_file, log_file.string) != 0) { - FS_Print(file, msg); - FS_Close(file); + Log_Close (); + Log_Open (); } + + // If a log file is available + if (logfile != NULL) + FS_Print (logfile, msg); + inprogress = false; } + /* ================ Log_Printf @@ -192,7 +250,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; @@ -343,14 +401,10 @@ Con_Init */ 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_Print("Console initialized.\n"); - // register our cvars Cvar_RegisterVariable (&con_notifytime); Cvar_RegisterVariable (&con_notify); @@ -360,7 +414,9 @@ void Con_Init (void) 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"); } @@ -371,6 +427,9 @@ Con_Linefeed */ void Con_Linefeed (void) { + if (con_backscroll) + con_backscroll++; + con_x = 0; con_current++; memset (&con_text[(con_current%con_totallines)*con_linewidth], ' ', con_linewidth); @@ -390,18 +449,12 @@ void Con_PrintToHistory(const char *txt) int y, c, l, mask; static int cr; - con_backscroll = 0; - - if (txt[0] == 1) - { - mask = 128; // go to colored text - S_LocalSound ("misc/talk.wav"); - // play talk wav - txt++; - } - else if (txt[0] == 2) + if (txt[0] == 1 || txt[0] == 2) { - mask = 128; // go to colored text + if (gamemode == GAME_NEXUIZ) + mask = 0; + else + mask = 128; // go to colored text txt++; } else @@ -464,31 +517,113 @@ void Con_PrintToHistory(const char *txt) } } + + if( txt[0] == 1 ) { + // play talk wav + S_LocalSound ("sound/misc/talk.wav"); + } } +/* 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; + 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) : ""; + // special color codes for chat messages must always come first + // for Con_PrintToHistory to work properly + if (*msg <= 2) + { + if (gamemode == GAME_NEXUIZ) + { + line[index++] = '^'; + line[index++] = '3'; + msg++; + } + else + line[index++] = *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); + // 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; + } + } } @@ -508,7 +643,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); @@ -544,39 +679,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); @@ -591,6 +694,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; + } + } +} /* ================ @@ -603,6 +785,8 @@ Modified by EvilTypeGuy eviltypeguy@qeradiant.com */ void Con_DrawInput (void) { + int y; + int i; char editlinecopy[257], *text; if (!key_consoleactive) @@ -615,21 +799,27 @@ void Con_DrawInput (void) // use strlen of edit_line instead of key_linepos to allow editing // of early characters w/o erasing + y = strlen(text); + +// fill out remainder with spaces + for (i = y; i < 256; i++) + text[i] = ' '; + // add the cursor frame if ((int)(realtime*con_cursorspeed) & 1) // cursor is visible text[key_linepos] = 11 + 130 * key_insert; // either solid or triangle facing right - text[key_linepos + 1] = 0; +// text[key_linepos + 1] = 0; // prestep if horizontally scrolling if (key_linepos >= con_linewidth) 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; +// key_lines[edit_line][key_linepos] = 0; } @@ -653,7 +843,10 @@ void Con_DrawNotify (void) Cvar_SetValueQuick(&con_notify, 0); if (con_notify.integer > MAX_NOTIFYLINES) Cvar_SetValueQuick(&con_notify, MAX_NOTIFYLINES); - v = 0; + if (gamemode == GAME_TRANSFUSION) + v = 8; + else + v = 0; for (i= con_current-con_notify.integer+1 ; i<=con_current ; i++) { if (i < 0) @@ -666,9 +859,15 @@ void Con_DrawNotify (void) 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 - linewidth * 8) / 2; + } else + x = 0; + + _Con_DrawString(x, v, text, con_linewidth, 8, 8, 0); v += 8; } @@ -676,8 +875,6 @@ void Con_DrawNotify (void) if (key_dest == key_message) { - clearnotify = 0; - x = 0; // LordHavoc: speedup, and other improvements @@ -687,13 +884,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; } } @@ -734,7 +931,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