X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=console.c;h=7fbe3056183fd40e25f417cfc1757a15f9503e45;hp=e27c3d728177f6fb7ebefb107c5a5542985b7e28;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hpb=92c22498b38d6ea208ab23d7978a274fad877950 diff --git a/console.c b/console.c index e27c3d72..7fbe3056 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"}; @@ -50,20 +51,198 @@ float con_times[MAX_NOTIFYLINES]; int con_vislines; -qboolean con_debuglog; +qboolean con_initialized; -#define MAXCMDLINE 256 -extern char key_lines[32][MAXCMDLINE]; -extern int edit_line; -extern int key_linepos; -extern int key_insert; +/* +============================================================================== -qboolean con_initialized; +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; +} -mempool_t *console_mempool; -extern void M_Menu_Main_f (void); +/* +==================== +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) + { + size_t factor = ((logq_ind + len) / logq_size) + 1; + qbyte* newqueue; + + logq_size *= factor; + newqueue = (qbyte *)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 + +============================================================================== +*/ /* ================ @@ -139,72 +318,44 @@ 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); + int mask = 0; + static int index = 0; + static char line[16384]; - // log all messages to file - if (con_debuglog) - Con_LogPrint("qconsole.log", msg); - - if (!con_initialized) - return; + for (;*msg;msg++) + { + if (index == 0) + { + // if this is the beginning of a new line, print timestamp + const 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++] = STRING_COLOR_TAG; + // assert( STRING_COLOR_DEFAULT < 10 ) + line[index++] = STRING_COLOR_DEFAULT + '0'; + // 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 < (int)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; + } + } +} - if (cls.state == ca_dedicated) - return; // no graphics mode - // write it to the scrollable buffer - Con_PrintToHistory(msg); -} +// LordHavoc: increased from 4096 to 16384 +#define MAXPRINTMSG 16384 /* ================ @@ -411,7 +617,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); @@ -447,39 +653,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); @@ -494,7 +668,6 @@ DRAWING ============================================================================== */ - /* ================ Con_DrawInput @@ -506,6 +679,8 @@ Modified by EvilTypeGuy eviltypeguy@qeradiant.com */ void Con_DrawInput (void) { + int y; + int i; char editlinecopy[257], *text; if (!key_consoleactive) @@ -518,21 +693,27 @@ void Con_DrawInput (void) // use strlen of edit_line instead of key_linepos to allow editing // of early characters w/o erasing + y = (int)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); + 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; +// key_lines[edit_line][key_linepos] = 0; } @@ -549,16 +730,21 @@ void Con_DrawNotify (void) char *text; int i; float time; - extern char chat_buffer[]; + extern char chat_buffer[256]; char temptext[256]; + int colorindex = -1; //-1 for default if (con_notify.integer < 0) 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) continue; time = con_times[i % con_notify.integer]; @@ -569,9 +755,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); + DrawQ_ColoredString( x, v, text, con_linewidth, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, &colorindex ); v += 8; } @@ -579,7 +771,7 @@ void Con_DrawNotify (void) if (key_dest == key_message) { - clearnotify = 0; + int colorindex = -1; x = 0; @@ -588,15 +780,15 @@ void Con_DrawNotify (void) sprintf(temptext, "say_team:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); else sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); - while (strlen(temptext) >= (size_t) con_linewidth) + while ((int)strlen(temptext) >= 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; } } @@ -610,21 +802,21 @@ Draws the console with the solid background The typing input line at the bottom should only be drawn if typing is allowed ================ */ -extern char engineversion[40]; void Con_DrawConsole (int lines) { 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; @@ -637,7 +829,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); + 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 @@ -658,7 +850,7 @@ void Con_DisplayList(const char **list) const char **walk = list; while (*walk) { - len = strlen(*walk); + len = (int)strlen(*walk); if (len > maxlen) maxlen = len; walk++; @@ -666,7 +858,7 @@ void Con_DisplayList(const char **list) maxlen += 1; while (*list) { - len = strlen(*list); + len = (int)strlen(*list); if (pos + maxlen >= width) { Con_Print("\n"); pos = 0; @@ -716,7 +908,7 @@ void Con_CompleteCommandLine (void) else list[0] = Cmd_CompleteAliasBuildList(s); cmd = *list[0]; - cmd_len = strlen (cmd); + cmd_len = (int)strlen (cmd); } else { if (c) cmd = *(list[0] = Cmd_CompleteBuildList(s)); @@ -725,7 +917,7 @@ void Con_CompleteCommandLine (void) if (a) cmd = *(list[2] = Cmd_CompleteAliasBuildList(s)); - cmd_len = strlen (s); + cmd_len = (int)strlen (s); do { for (i = 0; i < 3; i++) { char ch = cmd[cmd_len];