X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=console.c;h=aeef3e6f414773c9b9639cc2f417e903e259fc91;hb=0dc77d61cf349a3fbe2994cce57f07faa99aab27;hp=33784a3ba93a2103072213f118c8e2f0c7c9336e;hpb=b6c497c1900525a18f5a51de9c02eea5ebc8d562;p=xonotic%2Fdarkplaces.git diff --git a/console.c b/console.c index 33784a3b..aeef3e6f 100644 --- a/console.c +++ b/console.c @@ -39,11 +39,19 @@ 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 con_notifytime = {CVAR_SAVE, "con_notifytime","3", "how long notify lines last, in seconds"}; +cvar_t con_notify = {CVAR_SAVE, "con_notify","4", "how many notify lines to show (0-32)"}; +cvar_t con_textsize = {CVAR_SAVE, "con_textsize","8", "console text size in virtual 2D pixels"}; + + +cvar_t sys_specialcharactertranslation = {0, "sys_specialcharactertranslation", "1", "terminal console conchars to ASCII translation (set to 0 if your conchars.tga is for an 8bit character set or if you want raw output)"}; +#ifdef WIN32 +cvar_t sys_colortranslation = {0, "sys_colortranslation", "0", "terminal console color translation (supported values: 0 = strip color codes, 1 = translate to ANSI codes, 2 = no translation)"}; +#else +cvar_t sys_colortranslation = {0, "sys_colortranslation", "1", "terminal console color translation (supported values: 0 = strip color codes, 1 = translate to ANSI codes, 2 = no translation)"}; +#endif #define MAX_NOTIFYLINES 32 // cl.time time the line was generated for transparent notify lines @@ -51,16 +59,12 @@ float con_times[MAX_NOTIFYLINES]; int con_vislines; -#define MAXCMDLINE 256 -extern char key_lines[32][MAXCMDLINE]; -extern int edit_line; -extern int key_linepos; -extern int key_insert; - - qboolean con_initialized; -mempool_t *console_mempool; +// used for server replies to rcon command +qboolean rcon_redirect = false; +int rcon_redirect_bufferpos = 0; +char rcon_redirect_buffer[1400]; /* @@ -71,12 +75,11 @@ LOGGING ============================================================================== */ -cvar_t log_file = {0, "log_file",""}; -cvar_t log_sync = {0, "log_sync","0"}; +cvar_t log_file = {0, "log_file","", "filename to log messages to"}; char crt_log_file [MAX_OSPATH] = ""; qfile_t* logfile = NULL; -qbyte* logqueue = NULL; +unsigned char* logqueue = NULL; size_t logq_ind = 0; size_t logq_size = 0; @@ -100,39 +103,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); - } -} - - /* ==================== Log_Open @@ -143,7 +121,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)); @@ -183,10 +161,11 @@ void Log_Start (void) // 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); + unsigned char *temp = logqueue; logqueue = NULL; + if (logfile != NULL && logq_ind != 0) + FS_Write (logfile, temp, logq_ind); + Mem_Free (temp); logq_ind = 0; logq_size = 0; } @@ -201,10 +180,12 @@ 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) @@ -215,11 +196,11 @@ void Log_ConPrint (const char *msg) // If we need to enlarge the log queue if (len > remain) { - unsigned int factor = ((logq_ind + len) / logq_size) + 1; - qbyte* newqueue; + size_t factor = ((logq_ind + len) / logq_size) + 1; + unsigned char* newqueue; logq_size *= factor; - newqueue = Mem_Alloc (tempmempool, logq_size); + newqueue = (unsigned char *)Mem_Alloc (tempmempool, logq_size); memcpy (newqueue, logqueue, logq_ind); Mem_Free (logqueue); logqueue = newqueue; @@ -241,31 +222,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 @@ -275,7 +236,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; @@ -369,56 +330,107 @@ If the line width has changed, reformat the buffer. void Con_CheckResize (void) { int i, j, width, oldwidth, oldtotallines, numlines, numchars; + float f; char tbuf[CON_TEXTSIZE]; - width = (vid.conwidth >> 3); + f = bound(1, con_textsize.value, 128); + if(f != con_textsize.value) + Cvar_SetValueQuick(&con_textsize, f); + width = (int)floor(vid_conwidth.value / con_textsize.value); + width = bound(1, width, CON_TEXTSIZE/4); 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 2) + { + Con_Printf("usage: maps [mapnameprefix]\n"); + return; + } + else if (Cmd_Argc() == 2) + GetMapList(Cmd_Argv(1), NULL, 0); + else + GetMapList("", NULL, 0); +} + +void Con_ConDump_f (void) +{ + int i, l; + qboolean allblankssofar; + const char *text; + qfile_t *file; + char temp[MAX_INPUTLINE+2]; + if (Cmd_Argc() != 2) + { + Con_Printf("usage: condump \n"); + return; + } + file = FS_Open(Cmd_Argv(1), "wb", false, false); + if (!file) + { + Con_Printf("condump: unable to write file \"%s\"\n", Cmd_Argv(1)); + return; + } + // iterate over the entire console history buffer line by line + allblankssofar = true; + for (i = 0;i < con_totallines;i++) + { + text = con_text + ((con_current + 1 + i) % con_totallines)*con_linewidth; + // count the used characters on this line + for (l = min(con_linewidth, (int)sizeof(temp));l > 0 && text[l-1] == ' ';l--); + // if not a blank line, begin output + if (l) + allblankssofar = false; + // output the current line to the file + if (!allblankssofar) + { + if (l) + memcpy(temp, text, l); + temp[l] = '\n'; + temp[l+1] = 0; + FS_Print(file, temp); + } + } + FS_Close(file); +} + /* ================ Con_Init @@ -426,21 +438,37 @@ Con_Init */ void Con_Init (void) { - console_mempool = Mem_AllocPool("console", 0, NULL); - 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; + + // Allocate a log queue, this will be freed after configs are parsed + logq_size = MAX_INPUTLINE; + logqueue = (unsigned char *)Mem_Alloc (tempmempool, logq_size); + logq_ind = 0; + + Cvar_RegisterVariable (&sys_colortranslation); + Cvar_RegisterVariable (&sys_specialcharactertranslation); + + 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"); // register our cvars Cvar_RegisterVariable (&con_notifytime); Cvar_RegisterVariable (&con_notify); + Cvar_RegisterVariable (&con_textsize); // register our commands - Cmd_AddCommand ("toggleconsole", Con_ToggleConsole_f); - Cmd_AddCommand ("messagemode", Con_MessageMode_f); - Cmd_AddCommand ("messagemode2", Con_MessageMode2_f); - Cmd_AddCommand ("clear", Con_Clear_f); + Cmd_AddCommand ("toggleconsole", Con_ToggleConsole_f, "opens or closes the console"); + Cmd_AddCommand ("messagemode", Con_MessageMode_f, "input a chat message to say to everyone"); + Cmd_AddCommand ("messagemode2", Con_MessageMode2_f, "input a chat message to say to only your team"); + Cmd_AddCommand ("clear", Con_Clear_f, "clear console history"); + Cmd_AddCommand ("maps", Con_Maps_f, "list information about available maps"); + Cmd_AddCommand ("condump", Con_ConDump_f, "output console history to a file (see also log_file)"); con_initialized = true; Con_Print("Console initialized.\n"); @@ -471,27 +499,11 @@ All console printing must go through this in order to be displayed 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 ("sound/misc/talk.wav"); - // 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 @@ -599,28 +611,50 @@ extern cvar_t timeformat; extern qboolean sys_nostdout; void Con_Print(const char *msg) { + int mask = 0; static int index = 0; - static char line[16384]; + static char line[MAX_INPUTLINE]; for (;*msg;msg++) { + // if this print is in response to an rcon command, add the character + // to the rcon redirect buffer + if (rcon_redirect && rcon_redirect_bufferpos < (int)sizeof(rcon_redirect_buffer) - 1) + rcon_redirect_buffer[rcon_redirect_bufferpos++] = *msg; + // if this is the beginning of a new line, print timestamp if (index == 0) { - // if this is the beginning of a new line, print timestamp - char *timestamp = timestamps.integer ? Sys_TimeString(timeformat.string) : ""; + 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) - line[index++] = *msg++; + if (*msg == 1 || *msg == 2) + { + // play talk wav + if (*msg == 1) + { + if (msg[1] == '(' && cl.foundtalk2wav) + S_LocalSound ("sound/misc/talk2.wav"); + else + S_LocalSound ("sound/misc/talk.wav"); + } + line[index++] = STRING_COLOR_TAG; + line[index++] = '3'; + msg++; + } // store timestamp for (;*timestamp;index++, timestamp++) - if (index < sizeof(line) - 2) + 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) + if (*msg == '\n' || index >= (int)sizeof(line) / 2) { // terminate the line line[index] = 0; @@ -628,14 +662,159 @@ void Con_Print(const char *msg) Log_ConPrint(line); // send to scrollable buffer if (con_initialized && cls.state != ca_dedicated) - Con_PrintToHistory(line); + 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); + if(sys_specialcharactertranslation.integer) + { + for (p = (unsigned char *) line;*p; p++) + *p = qfont_table[*p]; + } + + if(sys_colortranslation.integer == 1) // ANSI + { + static char printline[MAX_INPUTLINE * 4 + 3]; + // 2 can become 7 bytes, rounding that up to 8, and 3 bytes are added at the end + // a newline can transform into four bytes, but then prevents the three extra bytes from appearing + int lastcolor = 0; + const char *in; + char *out; + for(in = line, out = printline; *in; ++in) + { + switch(*in) + { + case STRING_COLOR_TAG: + switch(in[1]) + { + case STRING_COLOR_TAG: + ++in; + *out++ = STRING_COLOR_TAG; + break; + case '0': + case '7': + // normal color + ++in; + if(lastcolor == 0) break; else lastcolor = 0; + *out++ = 0x1B; *out++ = '['; *out++ = 'm'; + break; + case '1': + // light red + ++in; + if(lastcolor == 1) break; else lastcolor = 1; + *out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '1'; *out++ = 'm'; + break; + case '2': + // light green + ++in; + if(lastcolor == 2) break; else lastcolor = 2; + *out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '2'; *out++ = 'm'; + break; + case '3': + // yellow + ++in; + if(lastcolor == 3) break; else lastcolor = 3; + *out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '3'; *out++ = 'm'; + break; + case '4': + // light blue + ++in; + if(lastcolor == 4) break; else lastcolor = 4; + *out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '4'; *out++ = 'm'; + break; + case '5': + // light cyan + ++in; + if(lastcolor == 5) break; else lastcolor = 5; + *out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '6'; *out++ = 'm'; + break; + case '6': + // light magenta + ++in; + if(lastcolor == 6) break; else lastcolor = 6; + *out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '5'; *out++ = 'm'; + break; + // 7 handled above + case '8': + case '9': + // bold normal color + ++in; + if(lastcolor == 8) break; else lastcolor = 8; + *out++ = 0x1B; *out++ = '['; *out++ = '0'; *out++ = ';'; *out++ = '1'; *out++ = 'm'; + break; + default: + *out++ = STRING_COLOR_TAG; + break; + } + break; + case '\n': + if(lastcolor != 0) + { + *out++ = 0x1B; *out++ = '['; *out++ = 'm'; + lastcolor = 0; + } + *out++ = *in; + break; + default: + *out++ = *in; + break; + } + } + if(lastcolor != 0) + { + *out++ = 0x1B; + *out++ = '['; + *out++ = 'm'; + } + *out++ = 0; + Sys_PrintToTerminal(printline); + } + else if(sys_colortranslation.integer == 2) // Quake + { + Sys_PrintToTerminal(line); + } + else // strip + { + static char printline[MAX_INPUTLINE]; // it can only get shorter here + const char *in; + char *out; + for(in = line, out = printline; *in; ++in) + { + switch(*in) + { + case STRING_COLOR_TAG: + switch(in[1]) + { + case STRING_COLOR_TAG: + ++in; + *out++ = STRING_COLOR_TAG; + break; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + ++in; + break; + default: + *out++ = STRING_COLOR_TAG; + break; + } + break; + default: + *out++ = *in; + break; + } + } + *out++ = 0; + Sys_PrintToTerminal(printline); + } } // empty the line buffer index = 0; @@ -644,9 +823,6 @@ void Con_Print(const char *msg) } -// LordHavoc: increased from 4096 to 16384 -#define MAXPRINTMSG 16384 - /* ================ Con_Printf @@ -657,10 +833,10 @@ Prints to all appropriate console targets void Con_Printf(const char *fmt, ...) { va_list argptr; - char msg[MAXPRINTMSG]; + char msg[MAX_INPUTLINE]; va_start(argptr,fmt); - vsnprintf(msg,sizeof(msg),fmt,argptr); + dpvsnprintf(msg,sizeof(msg),fmt,argptr); va_end(argptr); Con_Print(msg); @@ -690,13 +866,13 @@ A Con_Printf that only shows up if the "developer" cvar is set void Con_DPrintf(const char *fmt, ...) { va_list argptr; - char msg[MAXPRINTMSG]; + char msg[MAX_INPUTLINE]; if (!developer.integer) return; // don't confuse non-developers with techie stuff... va_start(argptr,fmt); - vsnprintf(msg,sizeof(msg),fmt,argptr); + dpvsnprintf(msg,sizeof(msg),fmt,argptr); va_end(argptr); Con_Print(msg); @@ -711,7 +887,6 @@ DRAWING ============================================================================== */ - /* ================ Con_DrawInput @@ -725,22 +900,23 @@ void Con_DrawInput (void) { int y; int i; - char editlinecopy[257], *text; + char editlinecopy[MAX_INPUTLINE+1], *text; if (!key_consoleactive) return; // don't draw anything - text = strcpy(editlinecopy, key_lines[edit_line]); + strlcpy(editlinecopy, key_lines[edit_line], sizeof(editlinecopy)); + text = editlinecopy; // Advanced Console Editing by Radix radix@planetquake.com // Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com // use strlen of edit_line instead of key_linepos to allow editing // of early characters w/o erasing - y = strlen(text); + y = (int)strlen(text); // fill out remainder with spaces - for (i = y; i < 256; i++) + for (i = y; i < (int)sizeof(editlinecopy)-1; i++) text[i] = ' '; // add the cursor frame @@ -754,7 +930,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); + DrawQ_String(0, con_vislines - con_textsize.value*2, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, NULL, false ); // remove cursor // key_lines[edit_line][key_linepos] = 0; @@ -770,12 +946,12 @@ Draws the last few lines of output transparently over the game top */ void Con_DrawNotify (void) { - int x, v; + float x, v; char *text; - int i; + int i, stop; float time; - extern char chat_buffer[]; - char temptext[256]; + char temptext[MAX_INPUTLINE]; + int colorindex = -1; //-1 for default if (con_notify.integer < 0) Cvar_SetValueQuick(&con_notify, 0); @@ -785,8 +961,11 @@ void Con_DrawNotify (void) v = 8; else v = 0; - for (i= con_current-con_notify.integer+1 ; i<=con_current ; i++) + // make a copy of con_current here so that we can't get in a runaway loop printing new messages while drawing the notify text + stop = con_current; + for (i= stop-con_notify.integer+1 ; i<=stop ; i++) { + if (i < 0) continue; time = con_times[i % con_notify.integer]; @@ -797,14 +976,39 @@ void Con_DrawNotify (void) continue; text = con_text + (i % con_totallines)*con_linewidth; - DrawQ_String(0, v, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0); + if (gamemode == GAME_NEXUIZ) { + int chars = 0; + int finalchars = 0; + int j; - v += 8; + // count up to the last non-whitespace, and ignore color codes + for (j = 0;j < con_linewidth && text[j];j++) + { + if (text[j] == STRING_COLOR_TAG && (text[j+1] >= '0' && text[j+1] <= '9')) + { + j++; + continue; + } + chars++; + if (text[j] == ' ') + continue; + finalchars = chars; + } + // center the line using the calculated width + x = (vid_conwidth.integer - finalchars * con_textsize.value) * 0.5; + } else + x = 0; + + DrawQ_String( x, v, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false ); + + v += con_textsize.value; } if (key_dest == key_message) { + int colorindex = -1; + x = 0; // LordHavoc: speedup, and other improvements @@ -812,16 +1016,16 @@ 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); - strcpy(temptext, &temptext[con_linewidth]); - v += 8; + DrawQ_String( 0, v, temptext, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false ); + strlcpy(temptext, &temptext[con_linewidth], sizeof(temptext)); + v += con_textsize.value; } if (strlen(temptext) > 0) { - DrawQ_String (0, v, temptext, 0, 8, 8, 1, 1, 1, 1, 0); - v += 8; + DrawQ_String( 0, v, temptext, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false ); + v += con_textsize.value; } } } @@ -834,40 +1038,207 @@ 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; + int i, rows, j, stop; + float y; 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); - 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_Pic(0, lines - vid_conheight.integer, scr_conbrightness.value >= 0.01f ? Draw_CachePic("gfx/conback", true) : NULL, vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, scr_conalpha.value, 0); + DrawQ_String(vid_conwidth.integer - strlen(engineversion) * con_textsize.value - con_textsize.value, lines - con_textsize.value, engineversion, 0, con_textsize.value, con_textsize.value, 1, 0, 0, 1, 0, NULL, true); // draw the text con_vislines = lines; - rows = (lines-16)>>3; // rows of text to draw - y = lines - 16 - (rows<<3); // may start slightly negative + rows = (int)ceil((lines/con_textsize.value)-2); // rows of text to draw + y = lines - (rows+2)*con_textsize.value; // may start slightly negative - for (i = con_current - rows + 1;i <= con_current;i++, y += 8) + // make a copy of con_current here so that we can't get in a runaway loop printing new messages while drawing the notify text + stop = con_current; + for (i = stop - rows + 1;i <= stop;i++, y += con_textsize.value) { 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_String( 0, y, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false ); } // draw the input prompt, user text, and cursor if desired Con_DrawInput (); } +/* +GetMapList + +Made by [515] +Prints not only map filename, but also +its format (q1/q2/q3/hl) and even its message +*/ +//[515]: here is an ugly hack.. two gotos... oh my... *but it works* +//LordHavoc: rewrote bsp type detection, added mcbsp support and rewrote message extraction to do proper worldspawn parsing +//LordHavoc: added .ent file loading, and redesigned error handling to still try the .ent file even if the map format is not recognized, this also eliminated one goto +//LordHavoc: FIXME: man this GetMapList is STILL ugly code even after my cleanups... +qboolean GetMapList (const char *s, char *completedname, int completednamebufferlength) +{ + fssearch_t *t; + char message[64]; + int i, k, max, p, o, min; + unsigned char *len; + qfile_t *f; + unsigned char buf[1024]; + + sprintf(message, "maps/%s*.bsp", s); + t = FS_Search(message, 1, true); + if(!t) + return false; + if (t->numfilenames > 1) + Con_Printf("^1 %i maps found :\n", t->numfilenames); + len = (unsigned char *)Z_Malloc(t->numfilenames); + min = 666; + for(max=i=0;inumfilenames;i++) + { + k = (int)strlen(t->filenames[i]); + k -= 9; + if(max < k) + max = k; + else + if(min > k) + min = k; + len[i] = k; + } + o = (int)strlen(s); + for(i=0;inumfilenames;i++) + { + int lumpofs = 0, lumplen = 0; + char *entities = NULL; + const char *data = NULL; + char keyname[64]; + char entfilename[MAX_QPATH]; + strlcpy(message, "^1**ERROR**^7", sizeof(message)); + p = 0; + f = FS_Open(t->filenames[i], "rb", true, false); + if(f) + { + memset(buf, 0, 1024); + FS_Read(f, buf, 1024); + if (!memcmp(buf, "IBSP", 4)) + { + p = LittleLong(((int *)buf)[1]); + if (p == Q3BSPVERSION) + { + q3dheader_t *header = (q3dheader_t *)buf; + lumpofs = LittleLong(header->lumps[Q3LUMP_ENTITIES].fileofs); + lumplen = LittleLong(header->lumps[Q3LUMP_ENTITIES].filelen); + } + else if (p == Q2BSPVERSION) + { + q2dheader_t *header = (q2dheader_t *)buf; + lumpofs = LittleLong(header->lumps[Q2LUMP_ENTITIES].fileofs); + lumplen = LittleLong(header->lumps[Q2LUMP_ENTITIES].filelen); + } + } + else if (!memcmp(buf, "MCBSPpad", 8)) + { + p = LittleLong(((int *)buf)[2]); + if (p == MCBSPVERSION) + { + int numhulls = LittleLong(((int *)buf)[3]); + lumpofs = LittleLong(((int *)buf)[3 + numhulls + LUMP_ENTITIES*2+0]); + lumplen = LittleLong(((int *)buf)[3 + numhulls + LUMP_ENTITIES*2+1]); + } + } + else if((p = LittleLong(((int *)buf)[0])) == BSPVERSION || p == 30) + { + dheader_t *header = (dheader_t *)buf; + lumpofs = LittleLong(header->lumps[LUMP_ENTITIES].fileofs); + lumplen = LittleLong(header->lumps[LUMP_ENTITIES].filelen); + } + else + p = 0; + strlcpy(entfilename, t->filenames[i], sizeof(entfilename)); + memcpy(entfilename + strlen(entfilename) - 4, ".ent", 5); + entities = (char *)FS_LoadFile(entfilename, tempmempool, true, NULL); + if (!entities && lumplen >= 10) + { + FS_Seek(f, lumpofs, SEEK_SET); + entities = (char *)Z_Malloc(lumplen + 1); + FS_Read(f, entities, lumplen); + } + if (entities) + { + // if there are entities to parse, a missing message key just + // means there is no title, so clear the message string now + message[0] = 0; + data = entities; + for (;;) + { + int l; + if (!COM_ParseToken_Simple(&data, false)) + break; + if (com_token[0] == '{') + continue; + if (com_token[0] == '}') + break; + // skip leading whitespace + for (k = 0;com_token[k] && com_token[k] <= ' ';k++); + for (l = 0;l < (int)sizeof(keyname) - 1 && com_token[k+l] && com_token[k+l] > ' ';l++) + keyname[l] = com_token[k+l]; + keyname[l] = 0; + if (!COM_ParseToken_Simple(&data, false)) + break; + if (developer.integer >= 100) + Con_Printf("key: %s %s\n", keyname, com_token); + if (!strcmp(keyname, "message")) + { + // get the message contents + strlcpy(message, com_token, sizeof(message)); + break; + } + } + } + } + if (entities) + Z_Free(entities); + if(f) + FS_Close(f); + *(t->filenames[i]+len[i]+5) = 0; + switch(p) + { + case Q3BSPVERSION: strlcpy((char *)buf, "Q3", sizeof(buf));break; + case Q2BSPVERSION: strlcpy((char *)buf, "Q2", sizeof(buf));break; + case BSPVERSION: strlcpy((char *)buf, "Q1", sizeof(buf));break; + case MCBSPVERSION: strlcpy((char *)buf, "MC", sizeof(buf));break; + case 30: strlcpy((char *)buf, "HL", sizeof(buf));break; + default: strlcpy((char *)buf, "??", sizeof(buf));break; + } + Con_Printf("%16s (%s) %s\n", t->filenames[i]+5, buf, message); + } + Con_Print("\n"); + for(p=o;pfilenames[0]+5+p); + if(k == 0) + goto endcomplete; + for(i=1;inumfilenames;i++) + if(*(t->filenames[i]+5+p) != k) + goto endcomplete; + } +endcomplete: + if(p > o && completedname && completednamebufferlength > 0) + { + memset(completedname, 0, completednamebufferlength); + memcpy(completedname, (t->filenames[0]+5), min(p, completednamebufferlength - 1)); + } + Z_Free(len); + FS_FreeSearch(t); + return p > o; +} + /* Con_DisplayList @@ -882,7 +1253,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++; @@ -890,7 +1261,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; @@ -915,87 +1286,128 @@ void Con_DisplayList(const char **list) Added by EvilTypeGuy Thanks to Fett erich@heintz.com Thanks to taniwha + Enhanced to tab-complete map names by [515] */ void Con_CompleteCommandLine (void) { - const char *cmd = "", *s; + const char *cmd = ""; + char *s; const char **list[3] = {0, 0, 0}; - int c, v, a, i, cmd_len; + char s2[512]; + int c, v, a, i, cmd_len, pos, k; + + //find what we want to complete + pos = key_linepos; + while(--pos) + { + k = key_lines[edit_line][pos]; + if(k == '\"' || k == ';' || k == ' ' || k == '\'') + break; + } + pos++; + + s = key_lines[edit_line] + pos; + strlcpy(s2, key_lines[edit_line] + key_linepos, sizeof(s2)); //save chars after cursor + key_lines[edit_line][key_linepos] = 0; //hide them + + //maps search + for(k=pos-1;k>2;k--) + if(key_lines[edit_line][k] != ' ') + { + if(key_lines[edit_line][k] == '\"' || key_lines[edit_line][k] == ';' || key_lines[edit_line][k] == '\'') + break; + if ((pos+k > 2 && !strncmp(key_lines[edit_line]+k-2, "map", 3)) + || (pos+k > 10 && !strncmp(key_lines[edit_line]+k-10, "changelevel", 11))) + { + char t[MAX_QPATH]; + if (GetMapList(s, t, sizeof(t))) + { + // first move the cursor + key_linepos += (int)strlen(t) - (int)strlen(s); + + // and now do the actual work + *s = 0; + strlcat(key_lines[edit_line], t, MAX_INPUTLINE); + strlcat(key_lines[edit_line], s2, MAX_INPUTLINE); //add back chars after cursor + + // and fix the cursor + if(key_linepos > (int) strlen(key_lines[edit_line])) + key_linepos = (int) strlen(key_lines[edit_line]); + } + return; + } + } - s = key_lines[edit_line] + 1; - // Count number of possible matches + // Count number of possible matches and print them c = Cmd_CompleteCountPossible(s); + if (c) + { + Con_Printf("\n%i possible command%s\n", c, (c > 1) ? "s: " : ":"); + Cmd_CompleteCommandPrint(s); + } v = Cvar_CompleteCountPossible(s); + if (v) + { + Con_Printf("\n%i possible variable%s\n", v, (v > 1) ? "s: " : ":"); + Cvar_CompleteCvarPrint(s); + } a = Cmd_CompleteAliasCountPossible(s); + if (a) + { + Con_Printf("\n%i possible aliases%s\n", a, (a > 1) ? "s: " : ":"); + Cmd_CompleteAliasPrint(s); + } if (!(c + v + a)) // No possible matches + { + if(s2[0]) + strlcpy(&key_lines[edit_line][key_linepos], s2, sizeof(key_lines[edit_line]) - key_linepos); return; + } - if (c + v + a == 1) { - if (c) - list[0] = Cmd_CompleteBuildList(s); - else if (v) - list[0] = Cvar_CompleteBuildList(s); - else - list[0] = Cmd_CompleteAliasBuildList(s); - cmd = *list[0]; - cmd_len = strlen (cmd); - } else { - if (c) - cmd = *(list[0] = Cmd_CompleteBuildList(s)); - if (v) - cmd = *(list[1] = Cvar_CompleteBuildList(s)); - if (a) - cmd = *(list[2] = Cmd_CompleteAliasBuildList(s)); - - cmd_len = strlen (s); - do { - for (i = 0; i < 3; i++) { - char ch = cmd[cmd_len]; - const char **l = list[i]; - if (l) { - while (*l && (*l)[cmd_len] == ch) - l++; - if (*l) - break; - } - } - if (i == 3) - cmd_len++; - } while (i == 3); - // 'quakebar' - Con_Print("\n\35"); - for (i = 0; i < con_linewidth - 4; i++) - Con_Print("\36"); - Con_Print("\37\n"); - - // Print Possible Commands - if (c) { - Con_Printf("%i possible command%s\n", c, (c > 1) ? "s: " : ":"); - Con_DisplayList(list[0]); - } - - if (v) { - Con_Printf("%i possible variable%s\n", v, (v > 1) ? "s: " : ":"); - Con_DisplayList(list[1]); - } + if (c) + cmd = *(list[0] = Cmd_CompleteBuildList(s)); + if (v) + cmd = *(list[1] = Cvar_CompleteBuildList(s)); + if (a) + cmd = *(list[2] = Cmd_CompleteAliasBuildList(s)); - if (a) { - Con_Printf("%i possible aliases%s\n", a, (a > 1) ? "s: " : ":"); - Con_DisplayList(list[2]); + for (cmd_len = (int)strlen(s);;cmd_len++) + { + const char **l; + for (i = 0; i < 3; i++) + if (list[i]) + for (l = list[i];*l;l++) + if ((*l)[cmd_len] != cmd[cmd_len]) + goto done; + // all possible matches share this character, so we continue... + if (!cmd[cmd_len]) + { + // if all matches ended at the same position, stop + // (this means there is only one match) + break; } } +done: - if (cmd) { - strncpy(key_lines[edit_line] + 1, cmd, cmd_len); - key_linepos = cmd_len + 1; - if (c + v + a == 1) { - key_lines[edit_line][key_linepos] = ' '; - key_linepos++; - } - key_lines[edit_line][key_linepos] = 0; + // prevent a buffer overrun by limiting cmd_len according to remaining space + cmd_len = min(cmd_len, (int)sizeof(key_lines[edit_line]) - 1 - pos); + if (cmd) + { + key_linepos = pos; + memcpy(&key_lines[edit_line][key_linepos], cmd, cmd_len); + key_linepos += cmd_len; + // if there is only one match, add a space after it + if (c + v + a == 1 && key_linepos < (int)sizeof(key_lines[edit_line]) - 1) + key_lines[edit_line][key_linepos++] = ' '; } + + // use strlcat to avoid a buffer overrun + key_lines[edit_line][key_linepos] = 0; + strlcat(key_lines[edit_line], s2, sizeof(key_lines[edit_line])); + + // free the command, cvar, and alias lists for (i = 0; i < 3; i++) if (list[i]) Mem_Free((void *)list[i]);