X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=console.c;h=a2f850c0b0877a76f94b55b86d25b8353f93bbb8;hb=a8ae1121cb66ad41c49ea1a26d9651f48ae90497;hp=e4be3da32f3fa6cb5cd0629da6cbf2aadf691858;hpb=01f19c6c3ff8d4645b8589b3c8274d08a5775af6;p=xonotic%2Fdarkplaces.git diff --git a/console.c b/console.c index e4be3da3..a2f850c0 100644 --- a/console.c +++ b/console.c @@ -42,33 +42,33 @@ void *con_mutex = NULL; #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_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 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 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_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 = {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. " @@ -81,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; @@ -110,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 @@ -308,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; @@ -478,6 +569,7 @@ void Log_Start (void) } + /* ================ Log_ConPrint @@ -528,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; } @@ -570,7 +677,7 @@ 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)) @@ -600,14 +707,14 @@ void Con_ClearNotify (void) Con_MessageMode_f ================ */ -static void Con_MessageMode_f (void) +static void Con_MessageMode_f(cmd_state_t *cmd) { key_dest = key_message; chat_mode = 0; // "say" - 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); } } @@ -617,14 +724,14 @@ static void Con_MessageMode_f (void) Con_MessageMode2_f ================ */ -static void Con_MessageMode2_f (void) +static void Con_MessageMode2_f(cmd_state_t *cmd) { key_dest = key_message; chat_mode = 1; // "say_team" - 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); } } @@ -633,13 +740,13 @@ static void Con_MessageMode2_f (void) Con_CommandMode_f ================ */ -static 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 } @@ -674,46 +781,59 @@ 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); } -static 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_Printf("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); @@ -741,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 @@ -772,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"); @@ -847,43 +973,6 @@ static 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, qboolean proquakeprotocol) { rcon_redirect_sock = sock; @@ -897,7 +986,7 @@ void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest, qboolean rcon_redirect_buffer[2] = 0; rcon_redirect_buffer[3] = 0; // this is a reply to a CCREQ_RCON - rcon_redirect_buffer[4] = (char)CCREP_RCON; + rcon_redirect_buffer[4] = (unsigned char)CCREP_RCON; } else memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print @@ -1420,12 +1509,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; 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; @@ -1433,48 +1521,46 @@ static 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; - char charbuf16[16]; - curbuf = u8_encodech(0xE000 + 11 + 130 * key_insert, &len, charbuf16); - - 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); @@ -1485,31 +1571,25 @@ static 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; - 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); + 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 @@ -1587,7 +1667,7 @@ static int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, flo 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; @@ -1599,10 +1679,10 @@ static int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, flo 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; @@ -1737,7 +1817,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) @@ -1748,7 +1828,7 @@ void Con_DrawNotify (void) 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) @@ -1779,7 +1859,6 @@ static int Con_LineHeight(int lineno) { 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); @@ -1899,7 +1978,7 @@ void Con_DrawConsole (int lines) conbackpic = scr_conbrightness.value >= 0.01f ? Draw_CachePic_Flags("gfx/conback", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0) : 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, @@ -1916,7 +1995,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, @@ -1931,7 +2010,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, @@ -2000,9 +2079,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; @@ -2207,56 +2286,6 @@ void Con_DisplayList(const char **list) Con_Print("\n\n"); } -/* - 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; -} // Now it becomes TRICKY :D --blub static char Nicks_list[MAX_SCOREBOARD][MAX_SCOREBOARDNAME]; // contains the nicks with colors and all that @@ -2422,10 +2451,10 @@ 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; @@ -2464,7 +2493,7 @@ static 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') || @@ -2522,7 +2551,7 @@ static 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 @@ -2677,10 +2706,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; @@ -2691,7 +2720,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; @@ -2711,9 +2740,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]; @@ -2742,7 +2771,7 @@ void Con_CompleteCommandLine (void) { strlcpy(command, key_line + 1, min(sizeof(command), (unsigned int)(space - key_line))); - patterns = Cvar_VariableString(va(vabuf, sizeof(vabuf), "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 @@ -2913,23 +2942,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) @@ -2946,13 +2975,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++) { @@ -2960,10 +2989,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) @@ -2974,10 +3003,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) @@ -2985,7 +3014,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);