X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=console.c;h=d5a1b31029ea1f61c9f517b7b28f5d81277fe675;hb=bdb63282edaaa746a60ce4f9ddcdd914a4c4395f;hp=a30796b132c9503e50aab464f9c77b30529bcc6e;hpb=a0f50a719fce55819b2cc03da7684ddfc38e0aa9;p=xonotic%2Fdarkplaces.git diff --git a/console.c b/console.c index a30796b1..d5a1b310 100644 --- a/console.c +++ b/console.c @@ -19,18 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // console.c -#ifdef NeXT -#include +#if !defined(WIN32) || defined(__MINGW32__) +# include #endif -#ifndef _MSC_VER -#ifndef __BORLANDC__ -#include -#endif -#endif -#ifdef WIN32 -#include -#endif -#include +#include #include "quakedef.h" int con_linewidth; @@ -47,12 +39,11 @@ 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"}; cvar_t con_notify = {CVAR_SAVE, "con_notify","4"}; -cvar_t logfile = {0, "logfile","0"}; #define MAX_NOTIFYLINES 32 // cl.time time the line was generated for transparent notify lines @@ -60,8 +51,6 @@ float con_times[MAX_NOTIFYLINES]; int con_vislines; -qboolean con_debuglog; - #define MAXCMDLINE 256 extern char key_lines[32][MAXCMDLINE]; extern int edit_line; @@ -71,9 +60,196 @@ extern int key_insert; qboolean con_initialized; -mempool_t *console_mempool; -extern void M_Menu_Main_f (void); +/* +============================================================================== + +LOGGING + +============================================================================== +*/ + +cvar_t log_file = {0, "log_file",""}; +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_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")); + } +} + + +/* +==================== +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'; +} + + +/* +==================== +Log_Start +==================== +*/ +void Log_Start (void) +{ + Log_Open (); + + // Dump the contents of the log queue into the log file and free it + if (logqueue != NULL) + { + if (logfile != NULL && logq_ind != 0) + FS_Write (logfile, logqueue, logq_ind); + Mem_Free (logqueue); + logqueue = NULL; + logq_ind = 0; + logq_size = 0; + } +} + + +/* +================ +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) + { + size_t remain = logq_size - logq_ind; + size_t len = strlen (msg); + + // If we need to enlarge the log queue + if (len > remain) + { + unsigned int factor = ((logq_ind + len) / logq_size) + 1; + qbyte* newqueue; + + logq_size *= factor; + newqueue = Mem_Alloc (tempmempool, logq_size); + memcpy (newqueue, logqueue, logq_ind); + Mem_Free (logqueue); + logqueue = newqueue; + remain = logq_size - logq_ind; + } + memcpy (&logqueue[logq_ind], msg, len); + logq_ind += len; + + inprogress = false; + return; + } + + // Check if log_file has changed + if (strcmp (crt_log_file, log_file.string) != 0) + { + Log_Close (); + Log_Open (); + } + + // If a log file is available + if (logfile != NULL) + FS_Print (logfile, msg); + inprogress = false; +} + + +/* +================ +Log_Printf +================ +*/ +void Log_Printf (const char *logfilename, const char *fmt, ...) +{ + qfile_t *file; + + file = FS_Open (logfilename, "ab", true, false); + if (file != NULL) + { + va_list argptr; + + va_start (argptr, fmt); + FS_VPrintf (file, fmt, argptr); + va_end (argptr); + + FS_Close (file); + } +} + + +/* +============================================================================== + +CONSOLE + +============================================================================== +*/ /* ================ @@ -154,68 +330,39 @@ void Con_CheckResize (void) 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_DebugLog +Con_Print + +Prints to all appropriate console targets, and adds timestamps ================ */ -void Con_DebugLog (const char *msg) +extern cvar_t timestamps; +extern cvar_t timeformat; +extern qboolean sys_nostdout; +void Con_Print(const char *msg) { - qfile_t* file; + int mask = 0; + static int index = 0; + static char line[16384]; - file = FS_Open ("qconsole.log", "at", true); - if (file) + for (;*msg;msg++) { - FS_Printf (file, "%s", msg); - FS_Close (file); + 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; + } } } +// LordHavoc: increased from 4096 to 16384 +#define MAXPRINTMSG 16384 + /* ================ Con_Printf -Handles cursor positioning, line wrapping, etc +Prints to all appropriate console targets ================ */ -// LordHavoc: increased from 4096 to 16384 -#define MAXPRINTMSG 16384 -// FIXME: make a buffer size safe vsprintf? -void Con_Printf (const char *fmt, ...) +void Con_Printf(const char *fmt, ...) { va_list argptr; char msg[MAXPRINTMSG]; - va_start (argptr,fmt); - vsprintf (msg,fmt,argptr); - va_end (argptr); + va_start(argptr,fmt); + dpvsnprintf(msg,sizeof(msg),fmt,argptr); + va_end(argptr); - // also echo to debugging console - Sys_Printf ("%s", msg); - - // log all messages to file - if (con_debuglog) - Con_DebugLog (msg); - - if (!con_initialized) - return; + Con_Print(msg); +} - if (cls.state == ca_dedicated) - return; // no graphics mode +/* +================ +Con_DPrint - // write it to the scrollable buffer - Con_Print (msg); +A Con_Print that only shows up if the "developer" cvar is set +================ +*/ +void Con_DPrint(const char *msg) +{ + if (!developer.integer) + return; // don't confuse non-developers with techie stuff... + Con_Print(msg); } /* @@ -411,7 +646,7 @@ Con_DPrintf A Con_Printf that only shows up if the "developer" cvar is set ================ */ -void Con_DPrintf (const char *fmt, ...) +void Con_DPrintf(const char *fmt, ...) { va_list argptr; char msg[MAXPRINTMSG]; @@ -419,31 +654,11 @@ void Con_DPrintf (const char *fmt, ...) if (!developer.integer) return; // don't confuse non-developers with techie stuff... - va_start (argptr,fmt); - vsprintf (msg,fmt,argptr); - va_end (argptr); + va_start(argptr,fmt); + dpvsnprintf(msg,sizeof(msg),fmt,argptr); + va_end(argptr); - Con_Printf ("%s", 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[1024]; - - va_start (argptr,fmt); - vsprintf (msg,fmt,argptr); - va_end (argptr); - - Con_Printf ("%s", msg); + Con_Print(msg); } @@ -455,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; + } + } +} /* ================ @@ -467,6 +761,8 @@ Modified by EvilTypeGuy eviltypeguy@qeradiant.com */ void Con_DrawInput (void) { + int y; + int i; char editlinecopy[257], *text; if (!key_consoleactive) @@ -479,21 +775,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; } @@ -517,7 +819,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) @@ -530,9 +835,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; } @@ -540,8 +851,6 @@ void Con_DrawNotify (void) if (key_dest == key_message) { - clearnotify = 0; - x = 0; // LordHavoc: speedup, and other improvements @@ -551,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; } } @@ -598,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 @@ -629,20 +938,20 @@ void Con_DisplayList(const char **list) while (*list) { len = strlen(*list); if (pos + maxlen >= width) { - Con_Printf("\n"); + Con_Print("\n"); pos = 0; } - Con_Printf("%s", *list); + Con_Print(*list); for (i = 0; i < (maxlen - len); i++) - Con_Printf(" "); + Con_Print(" "); pos += maxlen; list++; } if (pos) - Con_Printf("\n\n"); + Con_Print("\n\n"); } /* @@ -702,10 +1011,10 @@ void Con_CompleteCommandLine (void) cmd_len++; } while (i == 3); // 'quakebar' - Con_Printf("\n\35"); + Con_Print("\n\35"); for (i = 0; i < con_linewidth - 4; i++) - Con_Printf("\36"); - Con_Printf("\37\n"); + Con_Print("\36"); + Con_Print("\37\n"); // Print Possible Commands if (c) {