X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=console.c;h=ea394a1888e07c508aa8f4fe2ccfef7ef87496f8;hb=7584e8c2a5eac1d97cd9d1b74d0e52532e5cb8e0;hp=3ce37373d3067e5c1e017266b6176344529a8897;hpb=a892a876d60ec67da321e48e31dc80b95fd6d9aa;p=xonotic%2Fdarkplaces.git diff --git a/console.c b/console.c index 3ce37373..ea394a18 100644 --- a/console.c +++ b/console.c @@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include "quakedef.h" +#include "thread.h" // for u8_encodech #include "ft2.h" @@ -35,38 +36,39 @@ float con_cursorspeed = 4; int con_backscroll; conbuffer_t con; +void *con_mutex = NULL; #define CON_LINES(i) CONBUFFER_LINES(&con, i) #define CON_LINES_LAST CONBUFFER_LINES_LAST(&con) #define CON_LINES_COUNT CONBUFFER_LINES_COUNT(&con) -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"}; -cvar_t con_notifyalign = {CVAR_SAVE, "con_notifyalign", "", "how to align notify lines: 0 = left, 0.5 = center, 1 = right, empty string = game default)"}; +cvar_t con_notifytime = {CVAR_CLIENT | CVAR_SAVE, "con_notifytime","3", "how long notify lines last, in seconds"}; +cvar_t con_notify = {CVAR_CLIENT | CVAR_SAVE, "con_notify","4", "how many notify lines to show"}; +cvar_t con_notifyalign = {CVAR_CLIENT | CVAR_SAVE, "con_notifyalign", "", "how to align notify lines: 0 = left, 0.5 = center, 1 = right, empty string = game default)"}; -cvar_t con_chattime = {CVAR_SAVE, "con_chattime","30", "how long chat lines last, in seconds"}; -cvar_t con_chat = {CVAR_SAVE, "con_chat","0", "how many chat lines to show in a dedicated chat area"}; -cvar_t con_chatpos = {CVAR_SAVE, "con_chatpos","0", "where to put chat (negative: lines from bottom of screen, positive: lines below notify, 0: at top)"}; -cvar_t con_chatrect = {CVAR_SAVE, "con_chatrect","0", "use con_chatrect_x and _y to position con_notify and con_chat freely instead of con_chatpos"}; -cvar_t con_chatrect_x = {CVAR_SAVE, "con_chatrect_x","", "where to put chat, relative x coordinate of left edge on screen (use con_chatwidth for width)"}; -cvar_t con_chatrect_y = {CVAR_SAVE, "con_chatrect_y","", "where to put chat, relative y coordinate of top edge on screen (use con_chat for line count)"}; -cvar_t con_chatwidth = {CVAR_SAVE, "con_chatwidth","1.0", "relative chat window width"}; -cvar_t con_textsize = {CVAR_SAVE, "con_textsize","8", "console text size in virtual 2D pixels"}; -cvar_t con_notifysize = {CVAR_SAVE, "con_notifysize","8", "notify text size in virtual 2D pixels"}; -cvar_t con_chatsize = {CVAR_SAVE, "con_chatsize","8", "chat text size in virtual 2D pixels (if con_chat is enabled)"}; -cvar_t con_chatsound = {CVAR_SAVE, "con_chatsound","1", "enables chat sound to play on message"}; +cvar_t con_chattime = {CVAR_CLIENT | CVAR_SAVE, "con_chattime","30", "how long chat lines last, in seconds"}; +cvar_t con_chat = {CVAR_CLIENT | CVAR_SAVE, "con_chat","0", "how many chat lines to show in a dedicated chat area"}; +cvar_t con_chatpos = {CVAR_CLIENT | CVAR_SAVE, "con_chatpos","0", "where to put chat (negative: lines from bottom of screen, positive: lines below notify, 0: at top)"}; +cvar_t con_chatrect = {CVAR_CLIENT | CVAR_SAVE, "con_chatrect","0", "use con_chatrect_x and _y to position con_notify and con_chat freely instead of con_chatpos"}; +cvar_t con_chatrect_x = {CVAR_CLIENT | CVAR_SAVE, "con_chatrect_x","", "where to put chat, relative x coordinate of left edge on screen (use con_chatwidth for width)"}; +cvar_t con_chatrect_y = {CVAR_CLIENT | CVAR_SAVE, "con_chatrect_y","", "where to put chat, relative y coordinate of top edge on screen (use con_chat for line count)"}; +cvar_t con_chatwidth = {CVAR_CLIENT | CVAR_SAVE, "con_chatwidth","1.0", "relative chat window width"}; +cvar_t con_textsize = {CVAR_CLIENT | CVAR_SAVE, "con_textsize","8", "console text size in virtual 2D pixels"}; +cvar_t con_notifysize = {CVAR_CLIENT | CVAR_SAVE, "con_notifysize","8", "notify text size in virtual 2D pixels"}; +cvar_t con_chatsize = {CVAR_CLIENT | CVAR_SAVE, "con_chatsize","8", "chat text size in virtual 2D pixels (if con_chat is enabled)"}; +cvar_t con_chatsound = {CVAR_CLIENT | CVAR_SAVE, "con_chatsound","1", "enables chat sound to play on message"}; -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)"}; +cvar_t sys_specialcharactertranslation = {CVAR_CLIENT | CVAR_SERVER, "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)"}; +cvar_t sys_colortranslation = {CVAR_CLIENT | CVAR_SERVER, "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)"}; +cvar_t sys_colortranslation = {CVAR_CLIENT | CVAR_SERVER, "sys_colortranslation", "1", "terminal console color translation (supported values: 0 = strip color codes, 1 = translate to ANSI codes, 2 = no translation)"}; #endif -cvar_t con_nickcompletion = {CVAR_SAVE, "con_nickcompletion", "1", "tab-complete nicks in console and message input"}; -cvar_t con_nickcompletion_flags = {CVAR_SAVE, "con_nickcompletion_flags", "11", "Bitfield: " +cvar_t con_nickcompletion = {CVAR_CLIENT | CVAR_SAVE, "con_nickcompletion", "1", "tab-complete nicks in console and message input"}; +cvar_t con_nickcompletion_flags = {CVAR_CLIENT | CVAR_SAVE, "con_nickcompletion_flags", "11", "Bitfield: " "0: add nothing after completion. " "1: add the last color after completion. " "2: add a quote when starting a quote instead of the color. " @@ -79,9 +81,11 @@ cvar_t con_nickcompletion_flags = {CVAR_SAVE, "con_nickcompletion_flags", "11", #define NICKS_ALPHANUMERICS_ONLY 8 #define NICKS_NO_SPACES 16 -cvar_t con_completion_playdemo = {CVAR_SAVE, "con_completion_playdemo", "*.dem", "completion pattern for the playdemo command"}; -cvar_t con_completion_timedemo = {CVAR_SAVE, "con_completion_timedemo", "*.dem", "completion pattern for the timedemo command"}; -cvar_t con_completion_exec = {CVAR_SAVE, "con_completion_exec", "*.cfg", "completion pattern for the exec command"}; +cvar_t con_completion_playdemo = {CVAR_CLIENT | CVAR_SAVE, "con_completion_playdemo", "*.dem", "completion pattern for the playdemo command"}; +cvar_t con_completion_timedemo = {CVAR_CLIENT | CVAR_SAVE, "con_completion_timedemo", "*.dem", "completion pattern for the timedemo command"}; +cvar_t con_completion_exec = {CVAR_CLIENT | CVAR_SAVE, "con_completion_exec", "*.cfg", "completion pattern for the exec command"}; + +cvar_t condump_stripcolors = {CVAR_CLIENT | CVAR_SERVER| CVAR_SAVE, "condump_stripcolors", "0", "strip color codes from console dumps"}; int con_linewidth; int con_vislines; @@ -93,6 +97,7 @@ lhnetsocket_t *rcon_redirect_sock = NULL; lhnetaddress_t *rcon_redirect_dest = NULL; int rcon_redirect_bufferpos = 0; char rcon_redirect_buffer[1400]; +qboolean rcon_redirect_proquakeprotocol = false; // generic functions for console buffers @@ -107,6 +112,94 @@ void ConBuffer_Init(conbuffer_t *buf, int textsize, int maxlines, mempool_t *mem buf->lines_count = 0; } +/*! 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', '{', '|', '}', '~', '<' +}; + +/* + SanitizeString strips color tags from the string in + and writes the result on string out +*/ +static void SanitizeString(char *in, char *out) +{ + while(*in) + { + if(*in == STRING_COLOR_TAG) + { + ++in; + if(!*in) + { + out[0] = STRING_COLOR_TAG; + out[1] = 0; + return; + } + else if (*in >= '0' && *in <= '9') // ^[0-9] found + { + ++in; + if(!*in) + { + *out = 0; + return; + } else if (*in == STRING_COLOR_TAG) // ^[0-9]^ found, don't print ^[0-9] + continue; + } + else if (*in == STRING_COLOR_RGB_TAG_CHAR) // ^x found + { + if ( isxdigit(in[1]) && isxdigit(in[2]) && isxdigit(in[3]) ) + { + in+=4; + if (!*in) + { + *out = 0; + return; + } else if (*in == STRING_COLOR_TAG) // ^xrgb^ found, don't print ^xrgb + continue; + } + else in--; + } + else if (*in != STRING_COLOR_TAG) + --in; + } + *out = qfont_table[*(unsigned char*)in]; + ++in; + ++out; + } + *out = 0; +} + /* ================ ConBuffer_Clear @@ -125,8 +218,10 @@ ConBuffer_Shutdown void ConBuffer_Shutdown(conbuffer_t *buf) { buf->active = false; - Mem_Free(buf->text); - Mem_Free(buf->lines); + if (buf->text) + Mem_Free(buf->text); + if (buf->lines) + Mem_Free(buf->lines); buf->text = NULL; buf->lines = NULL; } @@ -284,27 +379,9 @@ int ConBuffer_FindPrevLine(conbuffer_t *buf, int mask_must, int mask_mustnot, in return -1; } -int Con_FindNextLine(conbuffer_t *buf, int mask_must, int mask_mustnot, int start) -{ - int i; - for(i = start + 1; i < buf->lines_count; ++i) - { - con_lineinfo_t *l = &CONBUFFER_LINES(buf, i); - - if((l->mask & mask_must) != mask_must) - continue; - if(l->mask & mask_mustnot) - continue; - - return i; - } - - return -1; -} - const char *ConBuffer_GetLine(conbuffer_t *buf, int i) { - static char copybuf[MAX_INPUTLINE]; + static char copybuf[MAX_INPUTLINE]; // client only con_lineinfo_t *l = &CONBUFFER_LINES(buf, i); size_t sz = l->len+1 > sizeof(copybuf) ? sizeof(copybuf) : l->len+1; strlcpy(copybuf, l->start, sz); @@ -321,8 +398,9 @@ LOGGING /// \name Logging //@{ -cvar_t log_file = {0, "log_file","", "filename to log messages to"}; -cvar_t log_dest_udp = {0, "log_dest_udp","", "UDP address to log messages to (in QW rcon compatible format); multiple destinations can be separated by spaces; DO NOT SPECIFY DNS NAMES HERE"}; +cvar_t log_file = {CVAR_CLIENT | CVAR_SERVER, "log_file", "", "filename to log messages to"}; +cvar_t log_file_stripcolors = {CVAR_CLIENT | CVAR_SERVER, "log_file_stripcolors", "0", "strip color codes from log messages"}; +cvar_t log_dest_udp = {CVAR_CLIENT | CVAR_SERVER, "log_dest_udp", "", "UDP address to log messages to (in QW rcon compatible format); multiple destinations can be separated by spaces; DO NOT SPECIFY DNS NAMES HERE"}; char log_dest_buffer[1400]; // UDP packet size_t log_dest_buffer_pos; unsigned int log_dest_buffer_appending; @@ -335,23 +413,13 @@ size_t logq_size = 0; void Log_ConPrint (const char *msg); //@} -/* -==================== -Log_DestBuffer_Init -==================== -*/ static void Log_DestBuffer_Init(void) { memcpy(log_dest_buffer, "\377\377\377\377n", 5); // QW rcon print log_dest_buffer_pos = 5; } -/* -==================== -Log_DestBuffer_Flush -==================== -*/ -void Log_DestBuffer_Flush(void) +static void Log_DestBuffer_Flush_NoLock(void) { lhnetaddress_t log_dest_addr; lhnetsocket_t *log_dest_socket; @@ -387,12 +455,21 @@ void Log_DestBuffer_Flush(void) /* ==================== -Log_Timestamp +Log_DestBuffer_Flush ==================== */ -const char* Log_Timestamp (const char *desc) +void Log_DestBuffer_Flush(void) { - static char timestamp [128]; + if (con_mutex) + Thread_LockMutex(con_mutex); + Log_DestBuffer_Flush_NoLock(); + if (con_mutex) + Thread_UnlockMutex(con_mutex); +} + +static const char* Log_Timestamp (const char *desc) +{ + static char timestamp [128]; // init/shutdown only time_t crt_time; #if _MSC_VER >= 1400 struct tm crt_tm; @@ -419,13 +496,7 @@ const char* Log_Timestamp (const char *desc) return timestamp; } - -/* -==================== -Log_Open -==================== -*/ -void Log_Open (void) +static void Log_Open (void) { if (logfile != NULL || log_file.string[0] == '\0') return; @@ -438,7 +509,6 @@ void Log_Open (void) } } - /* ==================== Log_Close @@ -487,7 +557,7 @@ void Log_Start (void) n = min(sizeof(log_dest_buffer) - log_dest_buffer_pos - 1, logq_ind - pos); memcpy(log_dest_buffer + log_dest_buffer_pos, temp + pos, n); log_dest_buffer_pos += n; - Log_DestBuffer_Flush(); + Log_DestBuffer_Flush_NoLock(); pos += n; } } @@ -499,6 +569,7 @@ void Log_Start (void) } + /* ================ Log_ConPrint @@ -549,7 +620,22 @@ void Log_ConPrint (const char *msg) // If a log file is available if (logfile != NULL) - FS_Print (logfile, msg); + { + if (log_file_stripcolors.integer) + { + // sanitize msg + size_t len = strlen(msg); + char* sanitizedmsg = (char*)Mem_Alloc(tempmempool, len + 1); + memcpy (sanitizedmsg, msg, len); + SanitizeString(sanitizedmsg, sanitizedmsg); // SanitizeString's in pointer is always ahead of the out pointer, so this should work. + FS_Print (logfile, sanitizedmsg); + Mem_Free(sanitizedmsg); + } + else + { + FS_Print (logfile, msg); + } + } inprogress = false; } @@ -591,8 +677,12 @@ CONSOLE Con_ToggleConsole_f ================ */ -void Con_ToggleConsole_f (void) +void Con_ToggleConsole_f(cmd_state_t *cmd) { + if (COM_CheckParm ("-noconsole")) + if (!(key_consoleactive & KEY_CONSOLEACTIVE_USER)) + return; // only allow the key bind to turn off console + // toggle the 'user wants console' bit key_consoleactive ^= KEY_CONSOLEACTIVE_USER; Con_ClearNotify(); @@ -607,7 +697,8 @@ void Con_ClearNotify (void) { int i; for(i = 0; i < CON_LINES_COUNT; ++i) - CON_LINES(i).mask |= CON_MASK_HIDENOTIFY; + if(!(CON_LINES(i).mask & CON_MASK_CHAT)) + CON_LINES(i).mask |= CON_MASK_HIDENOTIFY; } @@ -616,12 +707,15 @@ void Con_ClearNotify (void) Con_MessageMode_f ================ */ -void Con_MessageMode_f (void) +static void Con_MessageMode_f(cmd_state_t *cmd) { key_dest = key_message; chat_mode = 0; // "say" - chat_bufferlen = 0; - chat_buffer[0] = 0; + if(Cmd_Argc(cmd) > 1) + { + dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args(cmd)); + chat_bufferlen = (unsigned int)strlen(chat_buffer); + } } @@ -630,12 +724,15 @@ void Con_MessageMode_f (void) Con_MessageMode2_f ================ */ -void Con_MessageMode2_f (void) +static void Con_MessageMode2_f(cmd_state_t *cmd) { key_dest = key_message; chat_mode = 1; // "say_team" - chat_bufferlen = 0; - chat_buffer[0] = 0; + if(Cmd_Argc(cmd) > 1) + { + dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args(cmd)); + chat_bufferlen = (unsigned int)strlen(chat_buffer); + } } /* @@ -643,13 +740,13 @@ void Con_MessageMode2_f (void) Con_CommandMode_f ================ */ -void Con_CommandMode_f (void) +static void Con_CommandMode_f(cmd_state_t *cmd) { key_dest = key_message; - if(Cmd_Argc() > 1) + if(Cmd_Argc(cmd) > 1) { - dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args()); - chat_bufferlen = strlen(chat_buffer); + dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args(cmd)); + chat_bufferlen = (unsigned int)strlen(chat_buffer); } chat_mode = -1; // command } @@ -684,46 +781,63 @@ void Con_CheckResize (void) } //[515]: the simplest command ever -//LordHavoc: not so simple after I made it print usage... -static void Con_Maps_f (void) +//LadyHavoc: not so simple after I made it print usage... +static void Con_Maps_f(cmd_state_t *cmd) { - if (Cmd_Argc() > 2) + if (Cmd_Argc(cmd) > 2) { Con_Printf("usage: maps [mapnameprefix]\n"); return; } - else if (Cmd_Argc() == 2) - GetMapList(Cmd_Argv(1), NULL, 0); + else if (Cmd_Argc(cmd) == 2) + GetMapList(Cmd_Argv(cmd, 1), NULL, 0); else GetMapList("", NULL, 0); } -void Con_ConDump_f (void) +static void Con_ConDump_f(cmd_state_t *cmd) { int i; qfile_t *file; - if (Cmd_Argc() != 2) + if (Cmd_Argc(cmd) != 2) { Con_Printf("usage: condump \n"); return; } - file = FS_OpenRealFile(Cmd_Argv(1), "w", false); + file = FS_OpenRealFile(Cmd_Argv(cmd, 1), "w", false); if (!file) { - Con_Printf("condump: unable to write file \"%s\"\n", Cmd_Argv(1)); + Con_Errorf("condump: unable to write file \"%s\"\n", Cmd_Argv(cmd, 1)); return; } + if (con_mutex) Thread_LockMutex(con_mutex); for(i = 0; i < CON_LINES_COUNT; ++i) { - FS_Write(file, CON_LINES(i).start, CON_LINES(i).len); + if (condump_stripcolors.integer) + { + // sanitize msg + size_t len = CON_LINES(i).len; + char* sanitizedmsg = (char*)Mem_Alloc(tempmempool, len + 1); + memcpy (sanitizedmsg, CON_LINES(i).start, len); + SanitizeString(sanitizedmsg, sanitizedmsg); // SanitizeString's in pointer is always ahead of the out pointer, so this should work. + FS_Write(file, sanitizedmsg, strlen(sanitizedmsg)); + Mem_Free(sanitizedmsg); + } + else + { + FS_Write(file, CON_LINES(i).start, CON_LINES(i).len); + } FS_Write(file, "\n", 1); } + if (con_mutex) Thread_UnlockMutex(con_mutex); FS_Close(file); } -void Con_Clear_f (void) +void Con_Clear_f(cmd_state_t *cmd) { + if (con_mutex) Thread_LockMutex(con_mutex); ConBuffer_Clear(&con); + if (con_mutex) Thread_UnlockMutex(con_mutex); } /* @@ -735,6 +849,8 @@ void Con_Init (void) { con_linewidth = 80; ConBuffer_Init(&con, CON_TEXTSIZE, CON_MAXLINES, zonemempool); + if (Thread_HasThreads()) + con_mutex = Thread_CreateMutex(); // Allocate a log queue, this will be freed after configs are parsed logq_size = MAX_INPUTLINE; @@ -745,6 +861,7 @@ void Con_Init (void) Cvar_RegisterVariable (&sys_specialcharactertranslation); Cvar_RegisterVariable (&log_file); + Cvar_RegisterVariable (&log_file_stripcolors); Cvar_RegisterVariable (&log_dest_udp); // support for the classic Quake option @@ -776,14 +893,19 @@ void Con_Init (void) Cvar_RegisterVariable (&con_completion_timedemo); // *.dem Cvar_RegisterVariable (&con_completion_exec); // *.cfg + Cvar_RegisterVariable (&condump_stripcolors); + // register our commands - 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 ("commandmode", Con_CommandMode_f, "input a console command"); - 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)"); + Cmd_AddCommand(&cmd_client, "toggleconsole", Con_ToggleConsole_f, "opens or closes the console"); + Cmd_AddCommand(&cmd_client, "messagemode", Con_MessageMode_f, "input a chat message to say to everyone"); + Cmd_AddCommand(&cmd_client, "messagemode2", Con_MessageMode2_f, "input a chat message to say to only your team"); + Cmd_AddCommand(&cmd_client, "commandmode", Con_CommandMode_f, "input a console command"); + Cmd_AddCommand(&cmd_client, "clear", Con_Clear_f, "clear console history"); + Cmd_AddCommand(&cmd_client, "maps", Con_Maps_f, "list information about available maps"); + Cmd_AddCommand(&cmd_client, "condump", Con_ConDump_f, "output console history to a file (see also log_file)"); + + Cmd_AddCommand(&cmd_server, "maps", Con_Maps_f, "list information about available maps"); + Cmd_AddCommand(&cmd_server, "condump", Con_ConDump_f, "output console history to a file (see also log_file)"); con_initialized = true; Con_DPrint("Console initialized.\n"); @@ -791,7 +913,10 @@ void Con_Init (void) void Con_Shutdown (void) { + if (con_mutex) Thread_LockMutex(con_mutex); ConBuffer_Shutdown(&con); + if (con_mutex) Thread_UnlockMutex(con_mutex); + if (con_mutex) Thread_DestroyMutex(con_mutex);con_mutex = NULL; } /* @@ -803,14 +928,14 @@ 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, int mask) +static void Con_PrintToHistory(const char *txt, int mask) { // process: // \n goes to next line // \r deletes current line and makes a new one static int cr_pending = 0; - static char buf[CON_TEXTSIZE]; + static char buf[CON_TEXTSIZE]; // con_mutex static int bufpos = 0; if(!con.text) // FIXME uses a non-abstracted property of con @@ -848,57 +973,41 @@ void Con_PrintToHistory(const char *txt, int mask) } } -/*! 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', '{', '|', '}', '~', '<' -}; - -void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest) +void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest, qboolean proquakeprotocol) { rcon_redirect_sock = sock; rcon_redirect_dest = dest; - memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print + rcon_redirect_proquakeprotocol = proquakeprotocol; + if (rcon_redirect_proquakeprotocol) + { + // reserve space for the packet header + rcon_redirect_buffer[0] = 0; + rcon_redirect_buffer[1] = 0; + rcon_redirect_buffer[2] = 0; + rcon_redirect_buffer[3] = 0; + // this is a reply to a CCREQ_RCON + rcon_redirect_buffer[4] = (unsigned char)CCREP_RCON; + } + else + memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print rcon_redirect_bufferpos = 5; } -void Con_Rcon_Redirect_Flush(void) +static void Con_Rcon_Redirect_Flush(void) { - rcon_redirect_buffer[rcon_redirect_bufferpos] = 0; - NetConn_WriteString(rcon_redirect_sock, rcon_redirect_buffer, rcon_redirect_dest); + if(rcon_redirect_sock) + { + rcon_redirect_buffer[rcon_redirect_bufferpos] = 0; + if (rcon_redirect_proquakeprotocol) + { + // update the length in the packet header + StoreBigLong((unsigned char *)rcon_redirect_buffer, NETFLAG_CTL | (rcon_redirect_bufferpos & NETFLAG_LENGTH_MASK)); + } + NetConn_Write(rcon_redirect_sock, rcon_redirect_buffer, rcon_redirect_bufferpos, rcon_redirect_dest); + } memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print rcon_redirect_bufferpos = 5; + rcon_redirect_proquakeprotocol = false; } void Con_Rcon_Redirect_End(void) @@ -920,7 +1029,7 @@ Con_Rcon_AddChar ================ */ /// Adds a character to the rcon buffer. -void Con_Rcon_AddChar(int c) +static void Con_Rcon_AddChar(int c) { if(log_dest_buffer_appending) return; @@ -941,7 +1050,7 @@ void Con_Rcon_AddChar(int c) Log_DestBuffer_Init(); log_dest_buffer[log_dest_buffer_pos++] = c; if(log_dest_buffer_pos >= sizeof(log_dest_buffer) - 1) // minus one, to allow for terminating zero - Log_DestBuffer_Flush(); + Log_DestBuffer_Flush_NoLock(); } else log_dest_buffer_pos = 0; @@ -1026,11 +1135,12 @@ void Con_MaskPrint(int additionalmask, const char *msg) static int index = 0; static char line[MAX_INPUTLINE]; + if (con_mutex) + Thread_LockMutex(con_mutex); + for (;*msg;msg++) { Con_Rcon_AddChar(*msg); - if (index == 0) - mask |= additionalmask; // if this is the beginning of a new line, print timestamp if (index == 0) { @@ -1042,14 +1152,14 @@ void Con_MaskPrint(int additionalmask, const char *msg) line[index++] = STRING_COLOR_DEFAULT + '0'; // special color codes for chat messages must always come first // for Con_PrintToHistory to work properly - if (*msg == 1 || *msg == 2) + if (*msg == 1 || *msg == 2 || *msg == 3) { // play talk wav if (*msg == 1) { if (con_chatsound.value) { - if(gamemode == GAME_NEXUIZ) + if(IS_NEXUIZ_DERIVED(gamemode)) { if(msg[1] == '\r' && cl.foundtalk2wav) S_LocalSound ("sound/misc/talk2.wav"); @@ -1064,8 +1174,13 @@ void Con_MaskPrint(int additionalmask, const char *msg) S_LocalSound ("sound/misc/talk.wav"); } } - mask = CON_MASK_CHAT; } + + // Send to chatbox for say/tell (1) and messages (3) + // 3 is just so that a message can be sent to the chatbox without a sound. + if (*msg == 1 || *msg == 3) + mask = CON_MASK_CHAT; + line[index++] = STRING_COLOR_TAG; line[index++] = '3'; msg++; @@ -1075,6 +1190,8 @@ void Con_MaskPrint(int additionalmask, const char *msg) for (;*timestamp;index++, timestamp++) if (index < (int)sizeof(line) - 2) line[index] = *timestamp; + // add the mask + mask |= additionalmask; } // append the character line[index++] = *msg; @@ -1089,16 +1206,29 @@ void Con_MaskPrint(int additionalmask, const char *msg) if (con_initialized && cls.state != ca_dedicated) { Con_PrintToHistory(line, mask); - mask = 0; } // send to terminal or dedicated server window if (!sys_nostdout) + if (developer.integer || !(mask & CON_MASK_DEVELOPER)) { - unsigned char *p; if(sys_specialcharactertranslation.integer) { - for (p = (unsigned char *) line;*p; p++) - *p = qfont_table[*p]; + char *p; + const char *q; + p = line; + while(*p) + { + int ch = u8_getchar(p, &q); + if(ch >= 0xE000 && ch <= 0xE0FF && ((unsigned char) qfont_table[ch - 0xE000]) >= 0x20) + { + *p = qfont_table[ch - 0xE000]; + if(q > p+1) + memmove(p+1, q, strlen(q)+1); + p = p + 1; + } + else + p = p + (q - p); + } } if(sys_colortranslation.integer == 1) // ANSI @@ -1276,8 +1406,12 @@ void Con_MaskPrint(int additionalmask, const char *msg) } // empty the line buffer index = 0; + mask = 0; } } + + if (con_mutex) + Thread_UnlockMutex(con_mutex); } /* @@ -1324,6 +1458,61 @@ void Con_Printf(const char *fmt, ...) Con_MaskPrint(CON_MASK_PRINT, msg); } +/* +================ +Con_Warn +================ +*/ +void Con_Warn(const char *msg) +{ + Con_Printf("^3%s",msg); +} + +/* +================ +Con_Warnf +================ +*/ +void Con_Warnf(const char *fmt, ...) +{ + va_list argptr; + char msg[MAX_INPUTLINE]; + + va_start(argptr,fmt); + dpvsnprintf(msg,sizeof(msg),fmt,argptr); + va_end(argptr); + + Con_Printf("^3%s",msg); +} + +/* +================ +Con_Error +================ +*/ +void Con_Error(const char *msg) +{ + Con_Printf("^1%s",msg); +} + +/* +================ +Con_Errorf +================ +*/ +void Con_Errorf(const char *fmt, ...) +{ + va_list argptr; + char msg[MAX_INPUTLINE]; + + va_start(argptr,fmt); + dpvsnprintf(msg,sizeof(msg),fmt,argptr); + va_end(argptr); + + Con_Printf("^1%s",msg); + +} + /* ================ Con_DPrint @@ -1375,12 +1564,11 @@ The input line scrolls horizontally if typing goes beyond the right edge Modified by EvilTypeGuy eviltypeguy@qeradiant.com ================ */ -extern cvar_t r_font_disable_freetype; -void Con_DrawInput (void) +static void Con_DrawInput (void) { int y; int i; - char editlinecopy[MAX_INPUTLINE+1], *text; + char text[sizeof(key_line)+5+1]; // space for ^^xRGB too float x, xo; size_t len_out; int col_out; @@ -1388,47 +1576,46 @@ void Con_DrawInput (void) if (!key_consoleactive) return; // don't draw anything - strlcpy(editlinecopy, key_line, sizeof(editlinecopy)); - text = editlinecopy; + strlcpy(text, key_line, sizeof(text)); // 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 = (int)strlen(text); - // append enoug nul-bytes to cover the utf8-versions of the cursor too - for (i = y; i < y + 4 && i < (int)sizeof(editlinecopy); ++i) - text[i] = 0; - - // add the cursor frame - if (r_font_disable_freetype.integer) + // make the color code visible when the cursor is inside it + if(text[key_linepos] != 0) { - // this code is freetype incompatible! - if ((int)(realtime*con_cursorspeed) & 1) // cursor is visible - { - if (!utf8_enable.integer) - text[key_linepos] = 11 + 130 * key_insert; // either solid or triangle facing right - else if (y + 3 < (int)sizeof(editlinecopy)-1) + for(i=1; i < 5 && key_linepos - i > 0; ++i) + if(text[key_linepos-i] == STRING_COLOR_TAG) { - int ofs = u8_bytelen(text + key_linepos, 1); - size_t len; - const char *curbuf; - curbuf = u8_encodech(0xE000 + 11 + 130 * key_insert, &len); - - if (curbuf) + int caret_pos, ofs = 0; + caret_pos = key_linepos - i; + if(i == 1 && text[caret_pos+1] == STRING_COLOR_TAG) + ofs = 1; + else if(i == 1 && isdigit(text[caret_pos+1])) + ofs = 2; + else if(text[caret_pos+1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(text[caret_pos+2]) && isxdigit(text[caret_pos+3]) && isxdigit(text[caret_pos+4])) + ofs = 5; + if(ofs && (size_t)(y + ofs + 1) < sizeof(text)) { - memmove(text + key_linepos + len, text + key_linepos + ofs, sizeof(editlinecopy) - key_linepos - len); - memcpy(text + key_linepos, curbuf, len); + int carets = 1; + while(caret_pos - carets >= 1 && text[caret_pos - carets] == STRING_COLOR_TAG) + ++carets; + if(carets & 1) + { + // str^2ing (displayed as string) --> str^2^^2ing (displayed as str^2ing) + // str^^ing (displayed as str^ing) --> str^^^^ing (displayed as str^^ing) + memmove(&text[caret_pos + ofs + 1], &text[caret_pos], y - caret_pos); + text[caret_pos + ofs] = STRING_COLOR_TAG; + y += ofs + 1; + text[y] = 0; + } } - } else - text[key_linepos] = '-' + ('+' - '-') * key_insert; - } + break; + } } -// text[key_linepos + 1] = 0; - len_out = key_linepos; col_out = -1; xo = DrawQ_TextWidth_UntilWidth_TrackColors(text, &len_out, con_textsize.value, con_textsize.value, &col_out, false, FONT_CONSOLE, 1000000000); @@ -1439,30 +1626,25 @@ void Con_DrawInput (void) // draw it DrawQ_String(x, con_vislines - con_textsize.value*2, text, y + 3, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, FONT_CONSOLE ); - // add a cursor on top of this (when using freetype) - if (!r_font_disable_freetype.integer) + // draw a cursor on top of this + if ((int)(realtime*con_cursorspeed) & 1) // cursor is visible { - if ((int)(realtime*con_cursorspeed) & 1) // cursor is visible + if (!utf8_enable.integer) { - if (!utf8_enable.integer) - { - text[0] = 11 + 130 * key_insert; // either solid or triangle facing right - text[1] = 0; - } - else - { - size_t len; - const char *curbuf; - curbuf = u8_encodech(0xE000 + 11 + 130 * key_insert, &len); - memcpy(text, curbuf, len); - text[len] = 0; - } - DrawQ_String(x + xo, con_vislines - con_textsize.value*2, text, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &col_out, false, FONT_CONSOLE); + text[0] = 11 + 130 * key_insert; // either solid or triangle facing right + text[1] = 0; } + else + { + size_t len; + const char *curbuf; + char charbuf16[16]; + curbuf = u8_encodech(0xE000 + 11 + 130 * key_insert, &len, charbuf16); + memcpy(text, curbuf, len); + text[len] = 0; + } + DrawQ_String(x + xo, con_vislines - con_textsize.value*2, text, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &col_out, false, FONT_CONSOLE); } - - // remove cursor -// key_line[key_linepos] = 0; } typedef struct @@ -1481,7 +1663,7 @@ typedef struct } con_text_info_t; -float Con_WordWidthFunc(void *passthrough, const char *w, size_t *length, float maxWidth) +static float Con_WordWidthFunc(void *passthrough, const char *w, size_t *length, float maxWidth) { con_text_info_t *ti = (con_text_info_t *) passthrough; if(w == NULL) @@ -1495,13 +1677,13 @@ float Con_WordWidthFunc(void *passthrough, const char *w, size_t *length, float return DrawQ_TextWidth(w, *length, ti->fontsize, ti->fontsize, false, ti->font); else { - printf("Con_WordWidthFunc: can't get here (maxWidth should never be %f)\n", maxWidth); + Sys_PrintfToTerminal("Con_WordWidthFunc: can't get here (maxWidth should never be %f)\n", maxWidth); // Note: this is NOT a Con_Printf, as it could print recursively return 0; } } -int Con_CountLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation) +static int Con_CountLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation) { (void) passthrough; (void) line; @@ -1511,7 +1693,7 @@ int Con_CountLineFunc(void *passthrough, const char *line, size_t length, float return 1; } -int Con_DisplayLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation) +static int Con_DisplayLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation) { con_text_info_t *ti = (con_text_info_t *) passthrough; @@ -1532,7 +1714,7 @@ int Con_DisplayLineFunc(void *passthrough, const char *line, size_t length, floa return 1; } -int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, float x, float y, float width, float height, float fontsize, float alignment_x, float alignment_y, const char *continuationString) +static int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, float x, float y, float width, float height, float fontsize, float alignment_x, float alignment_y, const char *continuationString) { int i; int lines = 0; @@ -1540,7 +1722,7 @@ int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, float x, f int startidx; int nskip = 0; int continuationWidth = 0; - size_t l; + size_t len; double t = cl.time; // saved so it won't change con_text_info_t ti; @@ -1552,10 +1734,10 @@ int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, float x, f ti.ymax = y + height; ti.continuationString = continuationString; - l = 0; - Con_WordWidthFunc(&ti, NULL, &l, -1); - l = strlen(continuationString); - continuationWidth = (int) Con_WordWidthFunc(&ti, continuationString, &l, -1); + len = 0; + Con_WordWidthFunc(&ti, NULL, &len, -1); + len = strlen(continuationString); + continuationWidth = (int) Con_WordWidthFunc(&ti, continuationString, &len, -1); // first find the first line to draw by backwards iterating and word wrapping to find their length... startidx = CON_LINES_COUNT; @@ -1623,6 +1805,7 @@ void Con_DrawNotify (void) int numChatlines; int chatpos; + if (con_mutex) Thread_LockMutex(con_mutex); ConBuffer_FixTimes(&con); numChatlines = con_chat.integer; @@ -1640,7 +1823,7 @@ void Con_DrawNotify (void) align = con_notifyalign.value; if(!*con_notifyalign.string) // empty string, evaluated to 0 above { - if(gamemode == GAME_NEXUIZ) + if(IS_OLDNEXUIZ_DERIVED(gamemode)) align = 0.5; } @@ -1689,7 +1872,7 @@ void Con_DrawNotify (void) if(numChatlines) { - Con_DrawNotifyRect(CON_MASK_CHAT, CON_MASK_INPUT, con_chattime.value, x, v, vid_conwidth.value * con_chatwidth.value, height, con_chatsize.value, 0.0, 1.0, (utf8_enable.integer ? "^3\xee\x80\x8c\xee\x80\x8c\xee\x80\x8c " : "^3\014\014\014 ")); // 015 is ·> character in conchars.tga + Con_DrawNotifyRect(CON_MASK_CHAT, CON_MASK_INPUT, con_chattime.value, x, v, vid_conwidth.value * con_chatwidth.value, height, con_chatsize.value, 0.0, 1.0, "^3 ... "); v += height; } if (key_dest == key_message) @@ -1697,9 +1880,10 @@ void Con_DrawNotify (void) //static char *cursor[2] = { "\xee\x80\x8a", "\xee\x80\x8b" }; // { off, on } int colorindex = -1; const char *cursor; - cursor = u8_encodech(0xE00A + ((int)(realtime * con_cursorspeed)&1), NULL); + char charbuf16[16]; + cursor = u8_encodech(0xE00A + ((int)(realtime * con_cursorspeed)&1), NULL, charbuf16); - // LordHavoc: speedup, and other improvements + // LadyHavoc: speedup, and other improvements if (chat_mode < 0) dpsnprintf(temptext, sizeof(temptext), "]%s%s", chat_buffer, cursor); else if(chat_mode) @@ -1713,6 +1897,7 @@ void Con_DrawNotify (void) x = min(xr, x); DrawQ_String(x, v, temptext, 0, inputsize, inputsize, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false, FONT_CHAT); } + if (con_mutex) Thread_UnlockMutex(con_mutex); } /* @@ -1722,14 +1907,13 @@ Con_LineHeight Returns the height of a given console line; calculates it if necessary. ================ */ -int Con_LineHeight(int lineno) +static int Con_LineHeight(int lineno) { con_lineinfo_t *li = &CON_LINES(lineno); if(li->height == -1) { float width = vid_conwidth.value; con_text_info_t ti; - con_lineinfo_t *li = &CON_LINES(lineno); ti.fontsize = con_textsize.value; ti.font = FONT_CONSOLE; li->height = COM_Wordwrap(li->start, li->len, 0, width, Con_WordWidthFunc, &ti, Con_CountLineFunc, NULL); @@ -1746,7 +1930,7 @@ If alpha is 0, the line is not drawn, but still wrapped and its height returned. ================ */ -int Con_DrawConsoleLine(int mask_must, int mask_mustnot, float y, int lineno, float ymin, float ymax) +static int Con_DrawConsoleLine(int mask_must, int mask_mustnot, float y, int lineno, float ymin, float ymax) { float width = vid_conwidth.value; con_text_info_t ti; @@ -1827,10 +2011,13 @@ void Con_DrawConsole (int lines) int mask_must = 0; int mask_mustnot = (developer.integer>0) ? 0 : CON_MASK_DEVELOPER; cachepic_t *conbackpic; + unsigned int conbackflags; if (lines <= 0) return; + if (con_mutex) Thread_LockMutex(con_mutex); + if (con_backscroll < 0) con_backscroll = 0; @@ -1844,10 +2031,13 @@ void Con_DrawConsole (int lines) { sx = scr_conscroll_x.value; sy = scr_conscroll_y.value; - conbackpic = scr_conbrightness.value >= 0.01f ? Draw_CachePic_Flags("gfx/conback", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0) : NULL; + conbackflags = CACHEPICFLAG_FAILONMISSING; // So console is readable when game content is missing + if (sx != 0 || sy != 0) + conbackflags &= CACHEPICFLAG_NOCLAMP; + conbackpic = scr_conbrightness.value >= 0.01f ? Draw_CachePic_Flags("gfx/conback", conbackflags) : NULL; sx *= realtime; sy *= realtime; sx -= floor(sx); sy -= floor(sy); - if (conbackpic && conbackpic->tex != r_texture_notexture) + if (Draw_IsPicLoaded(conbackpic)) DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer, 0 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, 1 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, @@ -1864,7 +2054,7 @@ void Con_DrawConsole (int lines) conbackpic = Draw_CachePic_Flags("gfx/conback2", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0); sx *= realtime; sy *= realtime; sx -= floor(sx); sy -= floor(sy); - if(conbackpic && conbackpic->tex != r_texture_notexture) + if(Draw_IsPicLoaded(conbackpic)) DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer, 0 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, 1 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, @@ -1879,7 +2069,7 @@ void Con_DrawConsole (int lines) conbackpic = Draw_CachePic_Flags("gfx/conback3", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0); sx *= realtime; sy *= realtime; sx -= floor(sx); sy -= floor(sy); - if(conbackpic && conbackpic->tex != r_texture_notexture) + if(Draw_IsPicLoaded(conbackpic)) DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer, 0 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, 1 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha, @@ -1937,6 +2127,7 @@ void Con_DrawConsole (int lines) Con_DrawInput (); r_draw2d_force = false; + if (con_mutex) Thread_UnlockMutex(con_mutex); } /* @@ -1947,9 +2138,9 @@ 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, 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... +//LadyHavoc: rewrote bsp type detection, rewrote message extraction to do proper worldspawn parsing +//LadyHavoc: 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 +//LadyHavoc: FIXME: man this GetMapList is STILL ugly code even after my cleanups... qboolean GetMapList (const char *s, char *completedname, int completednamebufferlength) { fssearch_t *t; @@ -1986,11 +2177,14 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer const char *data = NULL; char keyname[64]; char entfilename[MAX_QPATH]; - strlcpy(message, "^1**ERROR**^7", sizeof(message)); + char desc[64]; + desc[0] = 0; + strlcpy(message, "^1ERROR: open failed^7", sizeof(message)); p = 0; f = FS_OpenVirtualFile(t->filenames[i], true); if(f) { + strlcpy(message, "^1ERROR: not a known map format^7", sizeof(message)); memset(buf, 0, 1024); FS_Read(f, buf, 1024); if (!memcmp(buf, "IBSP", 4)) @@ -2001,22 +2195,46 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer q3dheader_t *header = (q3dheader_t *)buf; lumpofs = LittleLong(header->lumps[Q3LUMP_ENTITIES].fileofs); lumplen = LittleLong(header->lumps[Q3LUMP_ENTITIES].filelen); + dpsnprintf(desc, sizeof(desc), "Q3BSP%i", p); } else if (p == Q2BSPVERSION) { q2dheader_t *header = (q2dheader_t *)buf; lumpofs = LittleLong(header->lumps[Q2LUMP_ENTITIES].fileofs); lumplen = LittleLong(header->lumps[Q2LUMP_ENTITIES].filelen); + dpsnprintf(desc, sizeof(desc), "Q2BSP%i", p); } + else + dpsnprintf(desc, sizeof(desc), "IBSP%i", p); + } + else if (BuffLittleLong(buf) == BSPVERSION) + { + lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES); + lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4); + dpsnprintf(desc, sizeof(desc), "BSP29"); + } + else if (BuffLittleLong(buf) == 30) + { + lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES); + lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4); + dpsnprintf(desc, sizeof(desc), "BSPHL"); } - else if((p = BuffLittleLong(buf)) == BSPVERSION || p == 30) + else if (!memcmp(buf, "BSP2", 4)) { - dheader_t *header = (dheader_t *)buf; - lumpofs = LittleLong(header->lumps[LUMP_ENTITIES].fileofs); - lumplen = LittleLong(header->lumps[LUMP_ENTITIES].filelen); + lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES); + lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4); + dpsnprintf(desc, sizeof(desc), "BSP2"); + } + else if (!memcmp(buf, "2PSB", 4)) + { + lumpofs = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES); + lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4); + dpsnprintf(desc, sizeof(desc), "BSP2RMQe"); } else - p = 0; + { + dpsnprintf(desc, sizeof(desc), "unknown%i", BuffLittleLong(buf)); + } strlcpy(entfilename, t->filenames[i], sizeof(entfilename)); memcpy(entfilename + strlen(entfilename) - 4, ".ent", 5); entities = (char *)FS_LoadFile(entfilename, tempmempool, true, NULL); @@ -2035,7 +2253,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer for (;;) { int l; - if (!COM_ParseToken_Simple(&data, false, false)) + if (!COM_ParseToken_Simple(&data, false, false, true)) break; if (com_token[0] == '{') continue; @@ -2046,7 +2264,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer for (l = 0;l < (int)sizeof(keyname) - 1 && com_token[k+l] && !ISWHITESPACE(com_token[k+l]);l++) keyname[l] = com_token[k+l]; keyname[l] = 0; - if (!COM_ParseToken_Simple(&data, false, false)) + if (!COM_ParseToken_Simple(&data, false, false, true)) break; if (developer_extra.integer) Con_DPrintf("key: %s %s\n", keyname, com_token); @@ -2064,15 +2282,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer 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 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_Printf("%16s (%-8s) %s\n", t->filenames[i]+5, desc, message); } Con_Print("\n"); for(p=o;p= '0' && *in <= '9') // ^[0-9] found - { - ++in; - if(!*in) - { - *out = 0; - return; - } else if (*in == STRING_COLOR_TAG) // ^[0-9]^ found, don't print ^[0-9] - continue; - } - else if (*in == STRING_COLOR_RGB_TAG_CHAR) // ^x found - { - if ( isxdigit(in[1]) && isxdigit(in[2]) && isxdigit(in[3]) ) - { - in+=4; - if (!*in) - { - *out = 0; - return; - } else if (*in == STRING_COLOR_TAG) // ^xrgb^ found, don't print ^xrgb - continue; - } - else in--; - } - else if (*in != STRING_COLOR_TAG) - --in; - } - *out = qfont_table[*(unsigned char*)in]; - ++in; - ++out; - } - *out = 0; -} // Now it becomes TRICKY :D --blub static char Nicks_list[MAX_SCOREBOARD][MAX_SCOREBOARDNAME]; // contains the nicks with colors and all that @@ -2194,7 +2354,7 @@ static int Nicks_offset[MAX_SCOREBOARD]; // when nicks use a space, we need this static int Nicks_matchpos; // co against <<:BLASTER:>> is true!? -int Nicks_strncasecmp_nospaces(char *a, char *b, unsigned int a_len) +static int Nicks_strncasecmp_nospaces(char *a, char *b, unsigned int a_len) { while(a_len) { @@ -2220,7 +2380,7 @@ int Nicks_strncasecmp_nospaces(char *a, char *b, unsigned int a_len) } return 0; } -int Nicks_strncasecmp(char *a, char *b, unsigned int a_len) +static int Nicks_strncasecmp(char *a, char *b, unsigned int a_len) { char space_char; if(!(con_nickcompletion_flags.integer & NICKS_ALPHANUMERICS_ONLY)) @@ -2271,7 +2431,7 @@ int Nicks_strncasecmp(char *a, char *b, unsigned int a_len) Count the number of possible nicks to complete */ -int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon) +static int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon) { char name[128]; int i, p; @@ -2338,22 +2498,22 @@ int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon) return count; } -void Cmd_CompleteNicksPrint(int count) +static void Cmd_CompleteNicksPrint(int count) { int i; for(i = 0; i < count; ++i) Con_Printf("%s\n", Nicks_list[i]); } -void Nicks_CutMatchesNormal(int count) +static void Nicks_CutMatchesNormal(int count) { // cut match 0 down to the longest possible completion int i; unsigned int c, l; - c = strlen(Nicks_sanlist[0]) - 1; + c = (unsigned int)strlen(Nicks_sanlist[0]) - 1; for(i = 1; i < count; ++i) { - l = strlen(Nicks_sanlist[i]) - 1; + l = (unsigned int)strlen(Nicks_sanlist[i]) - 1; if(l < c) c = l; @@ -2368,7 +2528,7 @@ void Nicks_CutMatchesNormal(int count) //Con_Printf("List0: %s\n", Nicks_sanlist[0]); } -unsigned int Nicks_strcleanlen(const char *s) +static unsigned int Nicks_strcleanlen(const char *s) { unsigned int l = 0; while(*s) @@ -2383,7 +2543,7 @@ unsigned int Nicks_strcleanlen(const char *s) return l; } -void Nicks_CutMatchesAlphaNumeric(int count) +static void Nicks_CutMatchesAlphaNumeric(int count) { // cut match 0 down to the longest possible completion int i; @@ -2392,7 +2552,7 @@ void Nicks_CutMatchesAlphaNumeric(int count) char *a, *b; char space_char = (con_nickcompletion_flags.integer & NICKS_NO_SPACES) ? 'a' : ' '; // yes this is correct, we want NO spaces when no spaces - c = strlen(Nicks_sanlist[0]); + c = (unsigned int)strlen(Nicks_sanlist[0]); for(i = 0, l = 0; i < (int)c; ++i) { if( (Nicks_sanlist[0][i] >= 'a' && Nicks_sanlist[0][i] <= 'z') || @@ -2438,11 +2598,11 @@ void Nicks_CutMatchesAlphaNumeric(int count) if(Nicks_strcleanlen(Nicks_sanlist[0]) < strlen(tempstr)) { // if the clean sanitized one is longer than the current one, use it, it has crap chars which definitely are in there - strlcpy(Nicks_sanlist[0], tempstr, sizeof(tempstr)); + strlcpy(Nicks_sanlist[0], tempstr, sizeof(Nicks_sanlist[0])); } } -void Nicks_CutMatchesNoSpaces(int count) +static void Nicks_CutMatchesNoSpaces(int count) { // cut match 0 down to the longest possible completion int i; @@ -2450,7 +2610,7 @@ void Nicks_CutMatchesNoSpaces(int count) char tempstr[sizeof(Nicks_sanlist[0])]; char *a, *b; - c = strlen(Nicks_sanlist[0]); + c = (unsigned int)strlen(Nicks_sanlist[0]); for(i = 0, l = 0; i < (int)c; ++i) { if(Nicks_sanlist[0][i] != ' ') // here it's what's NOT copied @@ -2494,11 +2654,11 @@ void Nicks_CutMatchesNoSpaces(int count) if(Nicks_strcleanlen(Nicks_sanlist[0]) < strlen(tempstr)) { // if the clean sanitized one is longer than the current one, use it, it has crap chars which definitely are in there - strlcpy(Nicks_sanlist[0], tempstr, sizeof(tempstr)); + strlcpy(Nicks_sanlist[0], tempstr, sizeof(Nicks_sanlist[0])); } } -void Nicks_CutMatches(int count) +static void Nicks_CutMatches(int count) { if(con_nickcompletion_flags.integer & NICKS_ALPHANUMERICS_ONLY) Nicks_CutMatchesAlphaNumeric(count); @@ -2508,7 +2668,7 @@ void Nicks_CutMatches(int count) Nicks_CutMatchesNormal(count); } -const char **Nicks_CompleteBuildList(int count) +static const char **Nicks_CompleteBuildList(int count) { const char **buf; int bpos = 0; @@ -2528,7 +2688,7 @@ const char **Nicks_CompleteBuildList(int count) Nicks_AddLastColor Restores the previous used color, after the autocompleted name. */ -int Nicks_AddLastColor(char *buffer, int pos) +static int Nicks_AddLastColor(char *buffer, int pos) { qboolean quote_added = false; int match; @@ -2605,10 +2765,10 @@ int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos) len = min(size - Nicks_matchpos - 3, strlen(msg)); memcpy(&buffer[Nicks_matchpos], msg, len); if( len < (size - 7) ) // space for color (^[0-9] or ^xrgb) and space and \0 - len = Nicks_AddLastColor(buffer, Nicks_matchpos+len); + len = (int)Nicks_AddLastColor(buffer, Nicks_matchpos+(int)len); buffer[len++] = ' '; buffer[len] = 0; - return len; + return (int)len; } else if(n > 1) { int len; @@ -2619,7 +2779,7 @@ int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos) Nicks_CutMatches(n); msg = Nicks_sanlist[0]; - len = min(size - Nicks_matchpos, strlen(msg)); + len = (int)min(size - Nicks_matchpos, strlen(msg)); memcpy(&buffer[Nicks_matchpos], msg, len); buffer[Nicks_matchpos + len] = 0; //pos += len; @@ -2639,9 +2799,9 @@ int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos) Enhanced to tab-complete map names by [515] */ -void Con_CompleteCommandLine (void) +void Con_CompleteCommandLine (cmd_state_t *cmd) { - const char *cmd = ""; + const char *text = ""; char *s; const char **list[4] = {0, 0, 0, 0}; char s2[512]; @@ -2649,6 +2809,7 @@ void Con_CompleteCommandLine (void) int c, v, a, i, cmd_len, pos, k; int n; // nicks --blub const char *space, *patterns; + char vabuf[1024]; //find what we want to complete pos = key_linepos; @@ -2669,7 +2830,7 @@ void Con_CompleteCommandLine (void) { strlcpy(command, key_line + 1, min(sizeof(command), (unsigned int)(space - key_line))); - patterns = Cvar_VariableString(va("con_completion_%s", command)); // TODO maybe use a better place for this? + patterns = Cvar_VariableString(cmd->cvars, va(vabuf, sizeof(vabuf), "con_completion_%s", command), CVAR_CLIENT | CVAR_SERVER); // TODO maybe use a better place for this? if(patterns && !*patterns) patterns = NULL; // get rid of the empty string @@ -2721,7 +2882,7 @@ void Con_CompleteCommandLine (void) stringlistinit(&resultbuf); stringlistinit(&dirbuf); - while(COM_ParseToken_Simple(&patterns, false, false)) + while(COM_ParseToken_Simple(&patterns, false, false, true)) { fssearch_t *search; if(strchr(com_token, '/')) @@ -2787,11 +2948,11 @@ void Con_CompleteCommandLine (void) } else { - stringlistsort(&resultbuf); // dirbuf is already sorted + stringlistsort(&resultbuf, true); // dirbuf is already sorted Con_Printf("\n%i possible filenames\n", resultbuf.numstrings + dirbuf.numstrings); for(i = 0; i < dirbuf.numstrings; ++i) { - Con_Printf("%s/\n", dirbuf.strings[i]); + Con_Printf("^4%s^7/\n", dirbuf.strings[i]); } for(i = 0; i < resultbuf.numstrings; ++i) { @@ -2840,23 +3001,23 @@ void Con_CompleteCommandLine (void) } // Count number of possible matches and print them - c = Cmd_CompleteCountPossible(s); + c = Cmd_CompleteCountPossible(cmd, s); if (c) { Con_Printf("\n%i possible command%s\n", c, (c > 1) ? "s: " : ":"); - Cmd_CompleteCommandPrint(s); + Cmd_CompleteCommandPrint(cmd, s); } - v = Cvar_CompleteCountPossible(s); + v = Cvar_CompleteCountPossible(cmd->cvars, s, CVAR_CLIENT | CVAR_SERVER); if (v) { Con_Printf("\n%i possible variable%s\n", v, (v > 1) ? "s: " : ":"); - Cvar_CompleteCvarPrint(s); + Cvar_CompleteCvarPrint(cmd->cvars, s, CVAR_CLIENT | CVAR_SERVER); } - a = Cmd_CompleteAliasCountPossible(s); + a = Cmd_CompleteAliasCountPossible(cmd, s); if (a) { Con_Printf("\n%i possible alias%s\n", a, (a > 1) ? "es: " : ":"); - Cmd_CompleteAliasPrint(s); + Cmd_CompleteAliasPrint(cmd, s); } n = Nicks_CompleteCountPossible(key_line, key_linepos, s, true); if (n) @@ -2873,13 +3034,13 @@ void Con_CompleteCommandLine (void) } if (c) - cmd = *(list[0] = Cmd_CompleteBuildList(s)); + text = *(list[0] = Cmd_CompleteBuildList(cmd, s)); if (v) - cmd = *(list[1] = Cvar_CompleteBuildList(s)); + text = *(list[1] = Cvar_CompleteBuildList(cmd->cvars, s, cmd->cvars_flagsmask)); if (a) - cmd = *(list[2] = Cmd_CompleteAliasBuildList(s)); + text = *(list[2] = Cmd_CompleteAliasBuildList(cmd, s)); if (n) - cmd = *(list[3] = Nicks_CompleteBuildList(n)); + text = *(list[3] = Nicks_CompleteBuildList(n)); for (cmd_len = (int)strlen(s);;cmd_len++) { @@ -2887,10 +3048,10 @@ void Con_CompleteCommandLine (void) for (i = 0; i < 3; i++) if (list[i]) for (l = list[i];*l;l++) - if ((*l)[cmd_len] != cmd[cmd_len]) + if ((*l)[cmd_len] != text[cmd_len]) goto done; // all possible matches share this character, so we continue... - if (!cmd[cmd_len]) + if (!text[cmd_len]) { // if all matches ended at the same position, stop // (this means there is only one match) @@ -2901,10 +3062,10 @@ done: // prevent a buffer overrun by limiting cmd_len according to remaining space cmd_len = min(cmd_len, (int)sizeof(key_line) - 1 - pos); - if (cmd) + if (text) { key_linepos = pos; - memcpy(&key_line[key_linepos], cmd, cmd_len); + memcpy(&key_line[key_linepos], text, cmd_len); key_linepos += cmd_len; // if there is only one match, add a space after it if (c + v + a + n == 1 && key_linepos < (int)sizeof(key_line) - 1) @@ -2912,7 +3073,7 @@ done: if(n) { // was a nick, might have an offset, and needs colors ;) --blub key_linepos = pos - Nicks_offset[0]; - cmd_len = strlen(Nicks_list[0]); + cmd_len = (int)strlen(Nicks_list[0]); cmd_len = min(cmd_len, (int)sizeof(key_line) - 3 - pos); memcpy(&key_line[key_linepos] , Nicks_list[0], cmd_len);