X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=console.c;h=034cac0c262cb83432dcb6d952d64ecd9da95bf1;hp=e88af147d42828289a42c7168c6df2b502011654;hb=0dfd3a30839fefb7c1d817618354350f4efd1131;hpb=0b11b24907f6a68f718b5b8d881d53bcf6be17dc diff --git a/console.c b/console.c index e88af147..034cac0c 100644 --- a/console.c +++ b/console.c @@ -1,5 +1,6 @@ /* Copyright (C) 1996-1997 Id Software, Inc. +Copyright (C) 2000-2020 DarkPlaces contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -42,35 +43,35 @@ 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_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 con_chatsound_file = {CVAR_CLIENT, "con_chatsound_file","sound/misc/talk.wav", "The sound to play for chat messages"}; -cvar_t con_chatsound_team_file = {CVAR_CLIENT, "con_chatsound_team_file","sound/misc/talk2.wav", "The sound to play for team chat messages"}; -cvar_t con_chatsound_team_mask = {CVAR_CLIENT | CVAR_READONLY, "con_chatsound_team_mask","40","Magic ASCII code that denotes a team chat 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)"}; +cvar_t con_notifytime = {CF_CLIENT | CF_ARCHIVE, "con_notifytime","3", "how long notify lines last, in seconds"}; +cvar_t con_notify = {CF_CLIENT | CF_ARCHIVE, "con_notify","4", "how many notify lines to show"}; +cvar_t con_notifyalign = {CF_CLIENT | CF_ARCHIVE, "con_notifyalign", "", "how to align notify lines: 0 = left, 0.5 = center, 1 = right, empty string = game default)"}; + +cvar_t con_chattime = {CF_CLIENT | CF_ARCHIVE, "con_chattime","30", "how long chat lines last, in seconds"}; +cvar_t con_chat = {CF_CLIENT | CF_ARCHIVE, "con_chat","0", "how many chat lines to show in a dedicated chat area"}; +cvar_t con_chatpos = {CF_CLIENT | CF_ARCHIVE, "con_chatpos","0", "where to put chat (negative: lines from bottom of screen, positive: lines below notify, 0: at top)"}; +cvar_t con_chatrect = {CF_CLIENT | CF_ARCHIVE, "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 = {CF_CLIENT | CF_ARCHIVE, "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 = {CF_CLIENT | CF_ARCHIVE, "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 = {CF_CLIENT | CF_ARCHIVE, "con_chatwidth","1.0", "relative chat window width"}; +cvar_t con_textsize = {CF_CLIENT | CF_ARCHIVE, "con_textsize","8", "console text size in virtual 2D pixels"}; +cvar_t con_notifysize = {CF_CLIENT | CF_ARCHIVE, "con_notifysize","8", "notify text size in virtual 2D pixels"}; +cvar_t con_chatsize = {CF_CLIENT | CF_ARCHIVE, "con_chatsize","8", "chat text size in virtual 2D pixels (if con_chat is enabled)"}; +cvar_t con_chatsound = {CF_CLIENT | CF_ARCHIVE, "con_chatsound","1", "enables chat sound to play on message"}; +cvar_t con_chatsound_file = {CF_CLIENT, "con_chatsound_file","sound/misc/talk.wav", "The sound to play for chat messages"}; +cvar_t con_chatsound_team_file = {CF_CLIENT, "con_chatsound_team_file","sound/misc/talk2.wav", "The sound to play for team chat messages"}; +cvar_t con_chatsound_team_mask = {CF_CLIENT, "con_chatsound_team_mask","40","Magic ASCII code that denotes a team chat message"}; + +cvar_t sys_specialcharactertranslation = {CF_CLIENT | CF_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 = {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)"}; +cvar_t sys_colortranslation = {CF_CLIENT | CF_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 = {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)"}; +cvar_t sys_colortranslation = {CF_CLIENT | CF_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_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: " +cvar_t con_nickcompletion = {CF_CLIENT | CF_ARCHIVE, "con_nickcompletion", "1", "tab-complete nicks in console and message input"}; +cvar_t con_nickcompletion_flags = {CF_CLIENT | CF_ARCHIVE, "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. " @@ -83,23 +84,28 @@ cvar_t con_nickcompletion_flags = {CVAR_CLIENT | CVAR_SAVE, "con_nickcompletion_ #define NICKS_ALPHANUMERICS_ONLY 8 #define NICKS_NO_SPACES 16 -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 con_completion_playdemo = {CF_CLIENT | CF_ARCHIVE, "con_completion_playdemo", "*.dem", "completion pattern for the playdemo command"}; +cvar_t con_completion_timedemo = {CF_CLIENT | CF_ARCHIVE, "con_completion_timedemo", "*.dem", "completion pattern for the timedemo command"}; +cvar_t con_completion_exec = {CF_CLIENT | CF_ARCHIVE, "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"}; +cvar_t condump_stripcolors = {CF_CLIENT | CF_SERVER| CF_ARCHIVE, "condump_stripcolors", "0", "strip color codes from console dumps"}; + +cvar_t rcon_password = {CF_CLIENT | CF_SERVER | CF_PRIVATE, "rcon_password", "", "password to authenticate rcon commands; NOTE: changing rcon_secure clears rcon_password, so set rcon_secure always before rcon_password; may be set to a string of the form user1:pass1 user2:pass2 user3:pass3 to allow multiple user accounts - the client then has to specify ONE of these combinations"}; +cvar_t rcon_secure = {CF_CLIENT | CF_SERVER, "rcon_secure", "0", "force secure rcon authentication (1 = time based, 2 = challenge based); NOTE: changing rcon_secure clears rcon_password, so set rcon_secure always before rcon_password"}; +cvar_t rcon_secure_challengetimeout = {CF_CLIENT, "rcon_secure_challengetimeout", "5", "challenge-based secure rcon: time out requests if no challenge came within this time interval"}; +cvar_t rcon_address = {CF_CLIENT, "rcon_address", "", "server address to send rcon commands to (when not connected to a server)"}; int con_linewidth; int con_vislines; -qboolean con_initialized; +qbool con_initialized; // used for server replies to rcon command 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; +qbool rcon_redirect_proquakeprotocol = false; // generic functions for console buffers @@ -400,9 +406,9 @@ LOGGING /// \name Logging //@{ -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"}; +cvar_t log_file = {CF_CLIENT | CF_SERVER, "log_file", "", "filename to log messages to"}; +cvar_t log_file_stripcolors = {CF_CLIENT | CF_SERVER, "log_file_stripcolors", "0", "strip color codes from log messages"}; +cvar_t log_dest_udp = {CF_CLIENT | CF_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; @@ -426,7 +432,7 @@ static void Log_DestBuffer_Flush_NoLock(void) lhnetaddress_t log_dest_addr; lhnetsocket_t *log_dest_socket; const char *s = log_dest_udp.string; - qboolean have_opened_temp_sockets = false; + qbool have_opened_temp_sockets = false; if(s) if(log_dest_buffer_pos > 5) { ++log_dest_buffer_appending; @@ -579,7 +585,7 @@ Log_ConPrint */ void Log_ConPrint (const char *msg) { - static qboolean inprogress = false; + static qbool inprogress = false; // don't allow feedback loops with memory error reports if (inprogress) @@ -681,7 +687,7 @@ Con_ToggleConsole_f */ void Con_ToggleConsole_f(cmd_state_t *cmd) { - if (COM_CheckParm ("-noconsole")) + if (Sys_CheckParm ("-noconsole")) if (!(key_consoleactive & KEY_CONSOLEACTIVE_USER)) return; // only allow the key bind to turn off console @@ -716,7 +722,7 @@ static void Con_MessageMode_f(cmd_state_t *cmd) if(Cmd_Argc(cmd) > 1) { dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args(cmd)); - chat_bufferlen = (unsigned int)strlen(chat_buffer); + chat_bufferpos = (unsigned int)strlen(chat_buffer); } } @@ -733,7 +739,7 @@ static void Con_MessageMode2_f(cmd_state_t *cmd) if(Cmd_Argc(cmd) > 1) { dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args(cmd)); - chat_bufferlen = (unsigned int)strlen(chat_buffer); + chat_bufferpos = (unsigned int)strlen(chat_buffer); } } @@ -748,7 +754,7 @@ static void Con_CommandMode_f(cmd_state_t *cmd) if(Cmd_Argc(cmd) > 1) { dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args(cmd)); - chat_bufferlen = (unsigned int)strlen(chat_buffer); + chat_bufferpos = (unsigned int)strlen(chat_buffer); } chat_mode = -1; // command } @@ -809,7 +815,7 @@ static void Con_ConDump_f(cmd_state_t *cmd) file = FS_OpenRealFile(Cmd_Argv(cmd, 1), "w", false); if (!file) { - Con_Errorf("condump: unable to write file \"%s\"\n", Cmd_Argv(cmd, 1)); + Con_Printf(CON_ERROR "condump: unable to write file \"%s\"\n", Cmd_Argv(cmd, 1)); return; } if (con_mutex) Thread_LockMutex(con_mutex); @@ -842,6 +848,15 @@ void Con_Clear_f(cmd_state_t *cmd) if (con_mutex) Thread_UnlockMutex(con_mutex); } +static void Con_RCon_ClearPassword_c(cvar_t *var) +{ + // whenever rcon_secure is changed to 0, clear rcon_password for + // security reasons (prevents a send-rcon-password-as-plaintext + // attack based on NQ protocol session takeover and svc_stufftext) + if(var->integer <= 0) + Cvar_SetQuick(&rcon_password, ""); +} + /* ================ Con_Init @@ -868,7 +883,7 @@ void Con_Init (void) // support for the classic Quake option // COMMANDLINEOPTION: Console: -condebug logs console messages to qconsole.log, see also log_file - if (COM_CheckParm ("-condebug") != 0) + if (Sys_CheckParm ("-condebug") != 0) Cvar_SetQuick (&log_file, "qconsole.log"); // register our cvars @@ -900,17 +915,24 @@ void Con_Init (void) Cvar_RegisterVariable (&condump_stripcolors); + Cvar_RegisterVariable(&rcon_address); + Cvar_RegisterVariable(&rcon_secure); + Cvar_RegisterCallback(&rcon_secure, Con_RCon_ClearPassword_c); + Cvar_RegisterVariable(&rcon_secure_challengetimeout); + Cvar_RegisterVariable(&rcon_password); + // register our commands - 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_SHARED, "clear", Con_Clear_f, "clear console history"); - Cmd_AddCommand(CMD_SHARED, "maps", Con_Maps_f, "list information about available maps"); - Cmd_AddCommand(CMD_SHARED, "condump", Con_ConDump_f, "output console history to a file (see also log_file)"); + Cmd_AddCommand(CF_CLIENT, "toggleconsole", Con_ToggleConsole_f, "opens or closes the console"); + Cmd_AddCommand(CF_CLIENT, "messagemode", Con_MessageMode_f, "input a chat message to say to everyone"); + Cmd_AddCommand(CF_CLIENT, "messagemode2", Con_MessageMode2_f, "input a chat message to say to only your team"); + Cmd_AddCommand(CF_CLIENT, "commandmode", Con_CommandMode_f, "input a console command"); + Cmd_AddCommand(CF_SHARED, "clear", Con_Clear_f, "clear console history"); + Cmd_AddCommand(CF_SHARED, "maps", Con_Maps_f, "list information about available maps"); + Cmd_AddCommand(CF_SHARED, "condump", Con_ConDump_f, "output console history to a file (see also log_file)"); con_initialized = true; - Con_DPrint("Console initialized.\n"); + + Con_Print("Console initialized.\n"); } void Con_Shutdown (void) @@ -975,7 +997,7 @@ static void Con_PrintToHistory(const char *txt, int mask) } } -void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest, qboolean proquakeprotocol) +void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest, qbool proquakeprotocol) { rcon_redirect_sock = sock; rcon_redirect_dest = dest; @@ -1130,7 +1152,7 @@ Con_MaskPrint */ extern cvar_t timestamps; extern cvar_t timeformat; -extern qboolean sys_nostdout; +extern qbool sys_nostdout; void Con_MaskPrint(int additionalmask, const char *msg) { static int mask = 0; @@ -1337,11 +1359,11 @@ void Con_MaskPrint(int additionalmask, const char *msg) *out++ = 'm'; } *out++ = 0; - Sys_PrintToTerminal(printline); + Sys_Print(printline); } else if(sys_colortranslation.integer == 2) // Quake { - Sys_PrintToTerminal(line); + Sys_Print(line); } else // strip { @@ -1392,7 +1414,7 @@ void Con_MaskPrint(int additionalmask, const char *msg) } } *out++ = 0; - Sys_PrintToTerminal(printline); + Sys_Print(printline); } } // empty the line buffer @@ -1449,61 +1471,6 @@ 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 @@ -1550,38 +1517,55 @@ DRAWING ================ Con_DrawInput +It draws either the console input line or the chat input line (if is_console is false) The input line scrolls horizontally if typing goes beyond the right edge Modified by EvilTypeGuy eviltypeguy@qeradiant.com ================ */ -static void Con_DrawInput (void) +static void Con_DrawInput(qbool is_console, float x, float v, float inputsize) { - int y; - int i; - char text[sizeof(key_line)+5+1]; // space for ^^xRGB too - float x, xo; + int y, i, col_out, linepos, text_start, prefix_start = 0; + char text[MAX_INPUTLINE + 5 + 9 + 1]; // space for ^xRGB, "say_team:" and \0 + float xo; size_t len_out; - int col_out; + const char *prefix; + dp_font_t *fnt; - if (!key_consoleactive) + if (is_console && !key_consoleactive) return; // don't draw anything - strlcpy(text, key_line, sizeof(text)); - - // Advanced Console Editing by Radix radix@planetquake.com - // Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com + if (is_console) + { + // empty prefix because ] is part of the console edit line + prefix = ""; + strlcpy(text, key_line, sizeof(text)); + linepos = key_linepos; + fnt = FONT_CONSOLE; + } + else + { + if (chat_mode < 0) + prefix = "]"; + else if(chat_mode) + prefix = "say_team:"; + else + prefix = "say:"; + strlcpy(text, chat_buffer, sizeof(text)); + linepos = chat_bufferpos; + fnt = FONT_CHAT; + } y = (int)strlen(text); // make the color code visible when the cursor is inside it - if(text[key_linepos] != 0) + if(text[linepos] != 0) { - for(i=1; i < 5 && key_linepos - i > 0; ++i) - if(text[key_linepos-i] == STRING_COLOR_TAG) + for(i=1; i < 5 && linepos - i > 0; ++i) + if(text[linepos-i] == STRING_COLOR_TAG) { int caret_pos, ofs = 0; - caret_pos = key_linepos - i; + caret_pos = linepos - i; if(i == 1 && text[caret_pos+1] == STRING_COLOR_TAG) ofs = 1; else if(i == 1 && isdigit(text[caret_pos+1])) @@ -1607,18 +1591,31 @@ static void Con_DrawInput (void) } } - len_out = key_linepos; + if (!is_console) + { + prefix_start = x; + x += DrawQ_TextWidth(prefix, 0, inputsize, inputsize, false, fnt); + } + + len_out = linepos; col_out = -1; - xo = DrawQ_TextWidth_UntilWidth_TrackColors(text, &len_out, con_textsize.value, con_textsize.value, &col_out, false, FONT_CONSOLE, 1000000000); - x = vid_conwidth.value * 0.95 - xo; // scroll - if(x >= 0) - x = 0; + xo = 0; + if (linepos > 0) + xo = DrawQ_TextWidth_UntilWidth_TrackColors(text, &len_out, inputsize, inputsize, &col_out, false, fnt, 1000000000); + + text_start = x + (vid_conwidth.value - x) * 0.95 - xo; // scroll + if(text_start >= x) + text_start = x; + else if (!is_console) + prefix_start -= (x - text_start); + + if (!is_console) + DrawQ_String(prefix_start, v, prefix, 0, inputsize, inputsize, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, fnt); - // 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 ); + DrawQ_String(text_start, v, text, y + 3, inputsize, inputsize, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, fnt); // draw a cursor on top of this - if ((int)(realtime*con_cursorspeed) & 1) // cursor is visible + if ((int)(host.realtime*con_cursorspeed) & 1) // cursor is visible { if (!utf8_enable.integer) { @@ -1634,7 +1631,7 @@ static void Con_DrawInput (void) 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); + DrawQ_String(text_start + xo, v, text, 0, inputsize, inputsize, 1.0, 1.0, 1.0, 1.0, 0, &col_out, false, fnt); } } @@ -1668,13 +1665,13 @@ static float Con_WordWidthFunc(void *passthrough, const char *w, size_t *length, return DrawQ_TextWidth(w, *length, ti->fontsize, ti->fontsize, false, ti->font); else { - Sys_PrintfToTerminal("Con_WordWidthFunc: can't get here (maxWidth should never be %f)\n", maxWidth); + Sys_Printf("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; } } -static 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, qbool isContinuation) { (void) passthrough; (void) line; @@ -1684,7 +1681,7 @@ static int Con_CountLineFunc(void *passthrough, const char *line, size_t length, return 1; } -static 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, qbool isContinuation) { con_text_info_t *ti = (con_text_info_t *) passthrough; @@ -1789,10 +1786,9 @@ Draws the last few lines of output transparently over the game top */ void Con_DrawNotify (void) { - float x, v, xr; + float x, v; float chatstart, notifystart, inputsize, height; float align; - char temptext[MAX_INPUTLINE]; int numChatlines; int chatpos; @@ -1868,26 +1864,12 @@ void Con_DrawNotify (void) } if (key_dest == key_message) { - //static char *cursor[2] = { "\xee\x80\x8a", "\xee\x80\x8b" }; // { off, on } - int colorindex = -1; - const char *cursor; - char charbuf16[16]; - cursor = u8_encodech(0xE00A + ((int)(realtime * con_cursorspeed)&1), NULL, charbuf16); - - // LadyHavoc: speedup, and other improvements - if (chat_mode < 0) - dpsnprintf(temptext, sizeof(temptext), "]%s%s", chat_buffer, cursor); - else if(chat_mode) - dpsnprintf(temptext, sizeof(temptext), "say_team:%s%s", chat_buffer, cursor); - else - dpsnprintf(temptext, sizeof(temptext), "say:%s%s", chat_buffer, cursor); - - // FIXME word wrap inputsize = (numChatlines ? con_chatsize : con_notifysize).value; - xr = vid_conwidth.value - DrawQ_TextWidth(temptext, 0, inputsize, inputsize, false, FONT_CHAT); - 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); + Con_DrawInput(false, x, v, inputsize); } + else + chat_bufferpos = 0; + if (con_mutex) Thread_UnlockMutex(con_mutex); } @@ -2026,7 +2008,7 @@ void Con_DrawConsole (int lines) 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 *= host.realtime; sy *= host.realtime; sx -= floor(sx); sy -= floor(sy); if (Draw_IsPicLoaded(conbackpic)) DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer, @@ -2043,7 +2025,7 @@ void Con_DrawConsole (int lines) sx = scr_conscroll2_x.value; sy = scr_conscroll2_y.value; conbackpic = Draw_CachePic_Flags("gfx/conback2", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0); - sx *= realtime; sy *= realtime; + sx *= host.realtime; sy *= host.realtime; sx -= floor(sx); sy -= floor(sy); if(Draw_IsPicLoaded(conbackpic)) DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer, @@ -2058,7 +2040,7 @@ void Con_DrawConsole (int lines) sx = scr_conscroll3_x.value; sy = scr_conscroll3_y.value; conbackpic = Draw_CachePic_Flags("gfx/conback3", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0); - sx *= realtime; sy *= realtime; + sx *= host.realtime; sy *= host.realtime; sx -= floor(sx); sy -= floor(sy); if(Draw_IsPicLoaded(conbackpic)) DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer, @@ -2115,7 +2097,7 @@ void Con_DrawConsole (int lines) #endif // draw the input prompt, user text, and cursor if desired - Con_DrawInput (); + Con_DrawInput(true, 0, con_vislines - con_textsize.value * 2, con_textsize.value); r_draw2d_force = false; if (con_mutex) Thread_UnlockMutex(con_mutex); @@ -2132,7 +2114,7 @@ its format (q1/q2/q3/hl) and even its message //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) +qbool GetMapList (const char *s, char *completedname, int completednamebufferlength) { fssearch_t *t; char message[1024]; @@ -2142,7 +2124,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer unsigned char buf[1024]; dpsnprintf(message, sizeof(message), "maps/%s*.bsp", s); - t = FS_Search(message, 1, true); + t = FS_Search(message, 1, true, NULL); if(!t) return false; if (t->numfilenames > 1) @@ -2222,10 +2204,15 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4); dpsnprintf(desc, sizeof(desc), "BSP2RMQe"); } - else + else if(!memcmp(buf, "VBSP", 4)) { - dpsnprintf(desc, sizeof(desc), "unknown%i", BuffLittleLong(buf)); + hl2dheader_t *header = (hl2dheader_t *)buf; + lumpofs = LittleLong(header->lumps[HL2LUMP_ENTITIES].fileofs); + lumplen = LittleLong(header->lumps[HL2LUMP_ENTITIES].filelen); + dpsnprintf(desc, sizeof(desc), "VBSP%i", LittleLong(((int *)buf)[1])); } + else + 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); @@ -2387,7 +2374,7 @@ static int Nicks_strncasecmp(char *a, char *b, unsigned int a_len) // if A contains a non-alphanumeric, B must contain it as well though! while(a_len) { - qboolean alnum_a, alnum_b; + qbool alnum_a, alnum_b; if(tolower(*a) == tolower(*b)) { @@ -2422,9 +2409,9 @@ static int Nicks_strncasecmp(char *a, char *b, unsigned int a_len) Count the number of possible nicks to complete */ -static int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon) +static int Nicks_CompleteCountPossible(char *line, int pos, char *s, qbool isCon) { - char name[128]; + char name[MAX_SCOREBOARDNAME]; int i, p; int match; int spos; @@ -2456,8 +2443,7 @@ static int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean is { if(spos > 0 && line[spos-1] != ' ' && line[spos-1] != ';' && line[spos-1] != '\"' && line[spos-1] != '\'') { - if(!(isCon && line[spos-1] == ']' && spos == 1) && // console start - !(spos > 1 && line[spos-1] >= '0' && line[spos-1] <= '9' && line[spos-2] == STRING_COLOR_TAG)) // color start + if(!(isCon && spos == 1)) // console start { --spos; continue; @@ -2681,7 +2667,7 @@ static const char **Nicks_CompleteBuildList(int count) */ static int Nicks_AddLastColor(char *buffer, int pos) { - qboolean quote_added = false; + qbool quote_added = false; int match; int color = STRING_COLOR_DEFAULT + '0'; char r = 0, g = 0, b = 0; @@ -2741,45 +2727,6 @@ static int Nicks_AddLastColor(char *buffer, int pos) return pos; } -int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos) -{ - int n; - /*if(!con_nickcompletion.integer) - return; is tested in Nicks_CompletionCountPossible */ - n = Nicks_CompleteCountPossible(buffer, pos, &buffer[pos], false); - if(n == 1) - { - size_t len; - char *msg; - - msg = Nicks_list[0]; - 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 = (int)Nicks_AddLastColor(buffer, Nicks_matchpos+(int)len); - buffer[len++] = ' '; - buffer[len] = 0; - return (int)len; - } else if(n > 1) - { - int len; - char *msg; - Con_Printf("\n%i possible nicks:\n", n); - Cmd_CompleteNicksPrint(n); - - Nicks_CutMatches(n); - - msg = Nicks_sanlist[0]; - len = (int)min(size - Nicks_matchpos, strlen(msg)); - memcpy(&buffer[Nicks_matchpos], msg, len); - buffer[Nicks_matchpos + len] = 0; - //pos += len; - return Nicks_matchpos + len; - } - return pos; -} - - /* Con_CompleteCommandLine @@ -2790,7 +2737,7 @@ int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos) Enhanced to tab-complete map names by [515] */ -void Con_CompleteCommandLine (cmd_state_t *cmd) +int Con_CompleteCommandLine(cmd_state_t *cmd, qbool is_console) { const char *text = ""; char *s; @@ -2802,26 +2749,48 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) const char *space, *patterns; char vabuf[1024]; + char *line; + int linestart, linepos; + unsigned int linesize; + if (is_console) + { + line = key_line; + linepos = key_linepos; + linesize = sizeof(key_line); + linestart = 1; + } + else + { + line = chat_buffer; + linepos = chat_bufferpos; + linesize = sizeof(chat_buffer); + linestart = 0; + } + //find what we want to complete - pos = key_linepos; - while(--pos) + pos = linepos; + while(--pos >= linestart) { - k = key_line[pos]; + k = line[pos]; if(k == '\"' || k == ';' || k == ' ' || k == '\'') break; } pos++; - s = key_line + pos; - strlcpy(s2, key_line + key_linepos, sizeof(s2)); //save chars after cursor - key_line[key_linepos] = 0; //hide them + s = line + pos; + strlcpy(s2, line + linepos, sizeof(s2)); //save chars after cursor + line[linepos] = 0; //hide them - space = strchr(key_line + 1, ' '); - if(space && pos == (space - key_line) + 1) + c = v = a = n = cmd_len = 0; + if (!is_console) + goto nicks; + + space = strchr(line + 1, ' '); + if(space && pos == (space - line) + 1) { - strlcpy(command, key_line + 1, min(sizeof(command), (unsigned int)(space - key_line))); + strlcpy(command, line + 1, min(sizeof(command), (unsigned int)(space - line))); - 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? + patterns = Cvar_VariableString(cmd->cvars, va(vabuf, sizeof(vabuf), "con_completion_%s", command), CF_CLIENT | CF_SERVER); // TODO maybe use a better place for this? if(patterns && !*patterns) patterns = NULL; // get rid of the empty string @@ -2832,18 +2801,18 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) if (GetMapList(s, t, sizeof(t))) { // first move the cursor - key_linepos += (int)strlen(t) - (int)strlen(s); + linepos += (int)strlen(t) - (int)strlen(s); // and now do the actual work *s = 0; - strlcat(key_line, t, MAX_INPUTLINE); - strlcat(key_line, s2, MAX_INPUTLINE); //add back chars after cursor + strlcat(line, t, MAX_INPUTLINE); + strlcat(line, s2, MAX_INPUTLINE); //add back chars after cursor // and fix the cursor - if(key_linepos > (int) strlen(key_line)) - key_linepos = (int) strlen(key_line); + if(linepos > (int) strlen(line)) + linepos = (int) strlen(line); } - return; + return linepos; } else { @@ -2878,7 +2847,7 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) fssearch_t *search; if(strchr(com_token, '/')) { - search = FS_Search(com_token, true, true); + search = FS_Search(com_token, true, true, NULL); } else { @@ -2887,10 +2856,10 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) { strlcpy(t, s, min(sizeof(t), (unsigned int)(slash - s + 2))); // + 2, because I want to include the slash strlcat(t, com_token, sizeof(t)); - search = FS_Search(t, true, true); + search = FS_Search(t, true, true, NULL); } else - search = FS_Search(com_token, true, true); + search = FS_Search(com_token, true, true, NULL); } if(search) { @@ -2910,10 +2879,10 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) { strlcpy(t, s, min(sizeof(t), (unsigned int)(slash - s + 2))); // + 2, because I want to include the slash strlcat(t, "*", sizeof(t)); - search = FS_Search(t, true, true); + search = FS_Search(t, true, true, NULL); } else - search = FS_Search("*", true, true); + search = FS_Search("*", true, true, NULL); if(search) { for(i = 0; i < search->numfilenames; ++i) @@ -2972,21 +2941,21 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) } // first move the cursor - key_linepos += (int)strlen(t) - (int)strlen(s); + linepos += (int)strlen(t) - (int)strlen(s); // and now do the actual work *s = 0; - strlcat(key_line, t, MAX_INPUTLINE); - strlcat(key_line, s2, MAX_INPUTLINE); //add back chars after cursor + strlcat(line, t, MAX_INPUTLINE); + strlcat(line, s2, MAX_INPUTLINE); //add back chars after cursor // and fix the cursor - if(key_linepos > (int) strlen(key_line)) - key_linepos = (int) strlen(key_line); + if(linepos > (int) strlen(line)) + linepos = (int) strlen(line); } stringlistfreecontents(&resultbuf); stringlistfreecontents(&dirbuf); - return; // bail out, when we complete for a command that wants a file name + return linepos; // bail out, when we complete for a command that wants a file name } } } @@ -2998,11 +2967,11 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) Con_Printf("\n%i possible command%s\n", c, (c > 1) ? "s: " : ":"); Cmd_CompleteCommandPrint(cmd, s); } - v = Cvar_CompleteCountPossible(cmd->cvars, s, CVAR_CLIENT | CVAR_SERVER); + v = Cvar_CompleteCountPossible(cmd->cvars, s, CF_CLIENT | CF_SERVER); if (v) { Con_Printf("\n%i possible variable%s\n", v, (v > 1) ? "s: " : ":"); - Cvar_CompleteCvarPrint(cmd->cvars, s, CVAR_CLIENT | CVAR_SERVER); + Cvar_CompleteCvarPrint(cmd->cvars, s, CF_CLIENT | CF_SERVER); } a = Cmd_CompleteAliasCountPossible(cmd, s); if (a) @@ -3010,7 +2979,9 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) Con_Printf("\n%i possible alias%s\n", a, (a > 1) ? "es: " : ":"); Cmd_CompleteAliasPrint(cmd, s); } - n = Nicks_CompleteCountPossible(key_line, key_linepos, s, true); + +nicks: + n = Nicks_CompleteCountPossible(line, linepos, s, is_console); if (n) { Con_Printf("\n%i possible nick%s\n", n, (n > 1) ? "s: " : ":"); @@ -3020,8 +2991,8 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) if (!(c + v + a + n)) // No possible matches { if(s2[0]) - strlcpy(&key_line[key_linepos], s2, sizeof(key_line) - key_linepos); - return; + strlcpy(&line[linepos], s2, linesize - linepos); + return linepos; } if (c) @@ -3031,7 +3002,12 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) if (a) text = *(list[2] = Cmd_CompleteAliasBuildList(cmd, s)); if (n) - text = *(list[3] = Nicks_CompleteBuildList(n)); + { + if (is_console) + text = *(list[3] = Nicks_CompleteBuildList(n)); + else + text = *(Nicks_CompleteBuildList(n)); + } for (cmd_len = (int)strlen(s);;cmd_len++) { @@ -3052,37 +3028,42 @@ void Con_CompleteCommandLine (cmd_state_t *cmd) done: // prevent a buffer overrun by limiting cmd_len according to remaining space - cmd_len = min(cmd_len, (int)sizeof(key_line) - 1 - pos); + cmd_len = min(cmd_len, (int)linesize - 1 - pos); if (text) { - key_linepos = pos; - memcpy(&key_line[key_linepos], text, cmd_len); - key_linepos += cmd_len; + linepos = pos; + memcpy(&line[linepos], text, cmd_len); + 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) + if (c + v + a + n == 1 && linepos < (int)linesize - 1) { if(n) { // was a nick, might have an offset, and needs colors ;) --blub - key_linepos = pos - Nicks_offset[0]; + linepos = pos - Nicks_offset[0]; cmd_len = (int)strlen(Nicks_list[0]); - cmd_len = min(cmd_len, (int)sizeof(key_line) - 3 - pos); + cmd_len = min(cmd_len, (int)linesize - 3 - pos); - memcpy(&key_line[key_linepos] , Nicks_list[0], cmd_len); - key_linepos += cmd_len; - if(key_linepos < (int)(sizeof(key_line)-4)) // space for ^, X and space and \0 - key_linepos = Nicks_AddLastColor(key_line, key_linepos); + memcpy(&line[linepos] , Nicks_list[0], cmd_len); + linepos += cmd_len; + if(linepos < (int)(linesize - 7)) // space for color code (^[0-9] or ^xrgb), space and \0 + linepos = Nicks_AddLastColor(line, linepos); } - key_line[key_linepos++] = ' '; + line[linepos++] = ' '; } } // use strlcat to avoid a buffer overrun - key_line[key_linepos] = 0; - strlcat(key_line, s2, sizeof(key_line)); + line[linepos] = 0; + strlcat(line, s2, linesize); + + if (!is_console) + return linepos; // free the command, cvar, and alias lists for (i = 0; i < 4; i++) if (list[i]) Mem_Free((void *)list[i]); + + return linepos; }