X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=console.c;h=6087f169124397d64fff298abc8f2d525d7d43a9;hb=78f404d63112abc53eac617c3b7ace1dec050ab2;hp=3a26df8f7eb5b15738ce143e2ca4f012ab957bd2;hpb=dafaf7b121521b45d07bd5295817a93dbe958255;p=xonotic%2Fdarkplaces.git diff --git a/console.c b/console.c index 3a26df8f..6087f169 100644 --- a/console.c +++ b/console.c @@ -96,13 +96,18 @@ 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"}; +cvar_t con_completion_timedemo = {CVAR_SAVE, "con_completion_timedemo", "*.dem"}; +cvar_t con_completion_exec = {CVAR_SAVE, "con_completion_exec", "*.cfg"}; + int con_linewidth; int con_vislines; qboolean con_initialized; // used for server replies to rcon command -qboolean rcon_redirect = false; +lhnetsocket_t *rcon_redirect_sock = NULL; +lhnetaddress_t *rcon_redirect_dest = NULL; int rcon_redirect_bufferpos = 0; char rcon_redirect_buffer[1400]; @@ -119,7 +124,7 @@ 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"}; char log_dest_buffer[1400]; // UDP packet size_t log_dest_buffer_pos; -qboolean log_dest_buffer_appending; +unsigned int log_dest_buffer_appending; char crt_log_file [MAX_OSPATH] = ""; qfile_t* logfile = NULL; @@ -188,13 +193,22 @@ const char* Log_Timestamp (const char *desc) { static char timestamp [128]; time_t crt_time; - const struct tm *crt_tm; +#if _MSC_VER >= 1400 + struct tm crt_tm; +#else + struct tm *crt_tm; +#endif char timestring [64]; // Build the time stamp (ex: "Wed Jun 30 21:49:08 1993"); time (&crt_time); +#if _MSC_VER >= 1400 + localtime_s (&crt_tm, &crt_time); + strftime (timestring, sizeof (timestring), "%a %b %d %H:%M:%S %Y", &crt_tm); +#else crt_tm = localtime (&crt_time); strftime (timestring, sizeof (timestring), "%a %b %d %H:%M:%S %Y", crt_tm); +#endif if (desc != NULL) dpsnprintf (timestamp, sizeof (timestamp), "====== %s (%s) ======\n", desc, timestring); @@ -215,7 +229,7 @@ void Log_Open (void) if (logfile != NULL || log_file.string[0] == '\0') return; - logfile = FS_Open (log_file.string, "ab", false, false); + logfile = FS_OpenRealFile(log_file.string, "a", false); if (logfile != NULL) { strlcpy (crt_log_file, log_file.string, sizeof (crt_log_file)); @@ -349,7 +363,7 @@ void Log_Printf (const char *logfilename, const char *fmt, ...) { qfile_t *file; - file = FS_Open (logfilename, "ab", true, false); + file = FS_OpenRealFile(logfilename, "a", true); if (file != NULL) { va_list argptr; @@ -417,7 +431,7 @@ Con_MessageMode_f void Con_MessageMode_f (void) { key_dest = key_message; - chat_team = false; + chat_mode = 0; // "say" } @@ -429,9 +443,24 @@ Con_MessageMode2_f void Con_MessageMode2_f (void) { key_dest = key_message; - chat_team = true; + chat_mode = 1; // "say_team" } +/* +================ +Con_CommandMode_f +================ +*/ +void Con_CommandMode_f (void) +{ + key_dest = key_message; + if(Cmd_Argc() > 1) + { + dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args()); + chat_bufferlen = strlen(chat_buffer); + } + chat_mode = -1; // command +} /* ================ @@ -487,7 +516,7 @@ void Con_ConDump_f (void) Con_Printf("usage: condump \n"); return; } - file = FS_Open(Cmd_Argv(1), "wb", false, false); + file = FS_OpenRealFile(Cmd_Argv(1), "w", false); if (!file) { Con_Printf("condump: unable to write file \"%s\"\n", Cmd_Argv(1)); @@ -544,16 +573,21 @@ void Con_Init (void) Cvar_RegisterVariable (&con_nickcompletion); Cvar_RegisterVariable (&con_nickcompletion_flags); + Cvar_RegisterVariable (&con_completion_playdemo); // *.dem + Cvar_RegisterVariable (&con_completion_timedemo); // *.dem + Cvar_RegisterVariable (&con_completion_exec); // *.cfg + // 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)"); con_initialized = true; - Con_Print("Console initialized.\n"); + Con_DPrint("Console initialized.\n"); } @@ -774,6 +808,35 @@ static char qfont_table[256] = { 'x', 'y', 'z', '{', '|', '}', '~', '<' }; +void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest) +{ + rcon_redirect_sock = sock; + rcon_redirect_dest = dest; + memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print + rcon_redirect_bufferpos = 5; +} + +void Con_Rcon_Redirect_Flush() +{ + rcon_redirect_buffer[rcon_redirect_bufferpos] = 0; + NetConn_WriteString(rcon_redirect_sock, rcon_redirect_buffer, rcon_redirect_dest); + memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print + rcon_redirect_bufferpos = 5; +} + +void Con_Rcon_Redirect_End() +{ + Con_Rcon_Redirect_Flush(); + rcon_redirect_dest = NULL; + rcon_redirect_sock = NULL; +} + +void Con_Rcon_Redirect_Abort() +{ + rcon_redirect_dest = NULL; + rcon_redirect_sock = NULL; +} + /* ================ Con_Rcon_AddChar @@ -781,7 +844,7 @@ Con_Rcon_AddChar Adds a character to the rcon buffer ================ */ -void Con_Rcon_AddChar(char c) +void Con_Rcon_AddChar(int c) { if(log_dest_buffer_appending) return; @@ -790,8 +853,12 @@ void Con_Rcon_AddChar(char c) // if this print is in response to an rcon command, add the character // to the rcon redirect buffer - if (rcon_redirect && rcon_redirect_bufferpos < (int)sizeof(rcon_redirect_buffer) - 1) + if (rcon_redirect_dest) + { rcon_redirect_buffer[rcon_redirect_bufferpos++] = c; + if(rcon_redirect_bufferpos >= (int)sizeof(rcon_redirect_buffer) - 1) + Con_Rcon_Redirect_Flush(); + } else if(*log_dest_udp.string) // don't duplicate rcon command responses here, these are sent another way { if(log_dest_buffer_pos == 0) @@ -806,6 +873,69 @@ void Con_Rcon_AddChar(char c) --log_dest_buffer_appending; } +/** + * Convert an RGB color to its nearest quake color. + * I'll cheat on this a bit by translating the colors to HSV first, + * S and V decide if it's black or white, otherwise, H will decide the + * actual color. + * @param _r Red (0-255) + * @param _g Green (0-255) + * @param _b Blue (0-255) + * @return A quake color character. + */ +static char Sys_Con_NearestColor(const unsigned char _r, const unsigned char _g, const unsigned char _b) +{ + float r = ((float)_r)/255.0; + float g = ((float)_g)/255.0; + float b = ((float)_b)/255.0; + float min = min(r, min(g, b)); + float max = max(r, max(g, b)); + + int h; ///< Hue angle [0,360] + float s; ///< Saturation [0,1] + float v = max; ///< In HSV v == max [0,1] + + if(max == min) + s = 0; + else + s = 1.0 - (min/max); + + // Saturation threshold. We now say 0.2 is the minimum value for a color! + if(s < 0.2) + { + // If the value is less than half, return a black color code. + // Otherwise return a white one. + if(v < 0.5) + return '0'; + return '7'; + } + + // Let's get the hue angle to define some colors: + if(max == min) + h = 0; + else if(max == r) + h = (int)(60.0 * (g-b)/(max-min))%360; + else if(max == g) + h = (int)(60.0 * (b-r)/(max-min) + 120); + else // if(max == b) redundant check + h = (int)(60.0 * (r-g)/(max-min) + 240); + + if(h < 36) // *red* to orange + return '1'; + else if(h < 80) // orange over *yellow* to evilish-bright-green + return '3'; + else if(h < 150) // evilish-bright-green over *green* to ugly bright blue + return '2'; + else if(h < 200) // ugly bright blue over *bright blue* to darkish blue + return '5'; + else if(h < 270) // darkish blue over *dark blue* to cool purple + return '4'; + else if(h < 330) // cool purple over *purple* to ugly swiny red + return '6'; + else // ugly red to red closes the circly + return '1'; +} + /* ================ Con_Print @@ -900,12 +1030,32 @@ void Con_Print(const char *msg) int lastcolor = 0; const char *in; char *out; + int color; for(in = line, out = printline; *in; ++in) { switch(*in) { case STRING_COLOR_TAG: - switch(in[1]) + if( in[1] == STRING_COLOR_RGB_TAG_CHAR && isxdigit(in[2]) && isxdigit(in[3]) && isxdigit(in[4]) ) + { + char r = tolower(in[2]); + char g = tolower(in[3]); + char b = tolower(in[4]); + // it's a hex digit already, so the else part needs no check --blub + if(isdigit(r)) r -= '0'; + else r -= 87; + if(isdigit(g)) g -= '0'; + else g -= 87; + if(isdigit(b)) b -= '0'; + else b -= 87; + + color = Sys_Con_NearestColor(r * 17, g * 17, b * 17); + in += 3; // 3 only, the switch down there does the fourth + } + else + color = in[1]; + + switch(color) { case STRING_COLOR_TAG: ++in; @@ -1005,6 +1155,16 @@ void Con_Print(const char *msg) case STRING_COLOR_TAG: switch(in[1]) { + case STRING_COLOR_RGB_TAG_CHAR: + if ( isxdigit(in[2]) && isxdigit(in[3]) && isxdigit(in[4]) ) + { + in+=4; + break; + } + *out++ = STRING_COLOR_TAG; + *out++ = STRING_COLOR_RGB_TAG_CHAR; + ++in; + break; case STRING_COLOR_TAG: ++in; *out++ = STRING_COLOR_TAG; @@ -1145,7 +1305,7 @@ void Con_DrawInput (void) // text[key_linepos + 1] = 0; - x = vid_conwidth.value * 0.95 - DrawQ_TextWidth_Font(text, key_linepos, con_textsize.value, con_textsize.value, false, FONT_CONSOLE); + x = vid_conwidth.value * 0.95 - DrawQ_TextWidth_Font(text, key_linepos, false, FONT_CONSOLE) * con_textsize.value; if(x >= 0) x = 0; @@ -1178,9 +1338,18 @@ float Con_WordWidthFunc(void *passthrough, const char *w, size_t *length, float if(w == NULL) { ti->colorindex = -1; - return ti->fontsize * ti->font->width_of[0]; + return ti->fontsize * ti->font->maxwidth; + } + if(maxWidth >= 0) + return DrawQ_TextWidth_Font_UntilWidth(w, length, false, ti->font, maxWidth / ti->fontsize) * ti->fontsize; + else if(maxWidth == -1) + return DrawQ_TextWidth_Font(w, *length, false, ti->font) * ti->fontsize; + else + { + 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; } - return DrawQ_TextWidth_Font_UntilWidth(w, length, ti->fontsize, ti->fontsize, false, ti->font, maxWidth); } int Con_CountLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation) @@ -1203,9 +1372,9 @@ int Con_DisplayLineFunc(void *passthrough, const char *line, size_t length, floa (void) 0; else { - int x = ti->x + (ti->width - width) * ti->alignment; + int x = (int) (ti->x + (ti->width - width) * ti->alignment); if(isContinuation && *ti->continuationString) - x += DrawQ_String_Font(x, ti->y, ti->continuationString, strlen(ti->continuationString), ti->fontsize, ti->fontsize, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, ti->font); + x += (int) DrawQ_String_Font(x, ti->y, ti->continuationString, strlen(ti->continuationString), ti->fontsize, ti->fontsize, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, ti->font); if(length > 0) DrawQ_String_Font(x, ti->y, line, length, ti->fontsize, ti->fontsize, 1.0, 1.0, 1.0, 1.0, 0, &(ti->colorindex), false, ti->font); } @@ -1238,7 +1407,7 @@ int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, float x, f l = 0; Con_WordWidthFunc(&ti, NULL, &l, -1); l = strlen(continuationString); - continuationWidth = Con_WordWidthFunc(&ti, continuationString, &l, -1); + continuationWidth = (int) Con_WordWidthFunc(&ti, continuationString, &l, -1); // first find the first line to draw by backwards iterating and word wrapping to find their length... startidx = con_lines_count; @@ -1360,7 +1529,7 @@ void Con_DrawNotify (void) if(numChatlines) { v = chatstart + numChatlines * con_chatsize.value; - Con_DrawNotifyRect(CON_MASK_CHAT, 0, con_chattime.value, 0, chatstart, vid_conwidth.value * con_chatwidth.value, v - chatstart, con_chatsize.value, 0.0, 1.0, "^3\014\014\014 "); // 015 is ·> character in conchars.tga + Con_DrawNotifyRect(CON_MASK_CHAT, 0, con_chattime.value, 0, chatstart, vid_conwidth.value * con_chatwidth.value, v - chatstart, con_chatsize.value, 0.0, 1.0, "^3\014\014\014 "); // 015 is ·> character in conchars.tga } if (key_dest == key_message) @@ -1368,14 +1537,16 @@ void Con_DrawNotify (void) int colorindex = -1; // LordHavoc: speedup, and other improvements - if (chat_team) - sprintf(temptext, "say_team:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); + if (chat_mode < 0) + dpsnprintf(temptext, sizeof(temptext), "]%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); + else if(chat_mode) + dpsnprintf(temptext, sizeof(temptext), "say_team:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); else - sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); + dpsnprintf(temptext, sizeof(temptext), "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1)); // FIXME word wrap inputsize = (numChatlines ? con_chatsize : con_notifysize).value; - x = vid_conwidth.value - DrawQ_TextWidth_Font(temptext, 0, inputsize, inputsize, false, FONT_CHAT); + x = vid_conwidth.value - DrawQ_TextWidth_Font(temptext, 0, false, FONT_CHAT) * inputsize; if(x > 0) x = 0; DrawQ_String_Font(x, v, temptext, 0, inputsize, inputsize, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false, FONT_CHAT); @@ -1500,8 +1671,8 @@ void Con_DrawConsole (int lines) con_vislines = lines; // draw the background - DrawQ_Pic(0, lines - vid_conheight.integer, scr_conbrightness.value >= 0.01f ? Draw_CachePic("gfx/conback", true) : NULL, vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, cls.signon == SIGNONS ? scr_conalpha.value : 1.0, 0); // always full alpha when not in game - DrawQ_String_Font(vid_conwidth.integer - DrawQ_TextWidth_Font(engineversion, 0, con_textsize.value, con_textsize.value, false, FONT_CONSOLE), lines - con_textsize.value, engineversion, 0, con_textsize.value, con_textsize.value, 1, 0, 0, 1, 0, NULL, true, FONT_CONSOLE); + DrawQ_Pic(0, lines - vid_conheight.integer, scr_conbrightness.value >= 0.01f ? Draw_CachePic ("gfx/conback") : NULL, vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, cls.signon == SIGNONS ? scr_conalpha.value : 1.0, 0); // always full alpha when not in game + DrawQ_String_Font(vid_conwidth.integer - DrawQ_TextWidth_Font(engineversion, 0, false, FONT_CONSOLE) * con_textsize.value, lines - con_textsize.value, engineversion, 0, con_textsize.value, con_textsize.value, 1, 0, 0, 1, 0, NULL, true, FONT_CONSOLE); // draw the text if(con_lines_count > 0) @@ -1538,19 +1709,19 @@ Prints not only map filename, but also its format (q1/q2/q3/hl) and even its message */ //[515]: here is an ugly hack.. two gotos... oh my... *but it works* -//LordHavoc: rewrote bsp type detection, added mcbsp support and rewrote message extraction to do proper worldspawn parsing +//LordHavoc: 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... qboolean GetMapList (const char *s, char *completedname, int completednamebufferlength) { fssearch_t *t; - char message[64]; + char message[1024]; int i, k, max, p, o, min; unsigned char *len; qfile_t *f; unsigned char buf[1024]; - sprintf(message, "maps/%s*.bsp", s); + dpsnprintf(message, sizeof(message), "maps/%s*.bsp", s); t = FS_Search(message, 1, true); if(!t) return false; @@ -1579,7 +1750,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer char entfilename[MAX_QPATH]; strlcpy(message, "^1**ERROR**^7", sizeof(message)); p = 0; - f = FS_Open(t->filenames[i], "rb", true, false); + f = FS_OpenVirtualFile(t->filenames[i], true); if(f) { memset(buf, 0, 1024); @@ -1600,16 +1771,6 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer lumplen = LittleLong(header->lumps[Q2LUMP_ENTITIES].filelen); } } - else if (!memcmp(buf, "MCBSPpad", 8)) - { - p = LittleLong(((int *)buf)[2]); - if (p == MCBSPVERSION) - { - int numhulls = LittleLong(((int *)buf)[3]); - lumpofs = LittleLong(((int *)buf)[3 + numhulls + LUMP_ENTITIES*2+0]); - lumplen = LittleLong(((int *)buf)[3 + numhulls + LUMP_ENTITIES*2+1]); - } - } else if((p = LittleLong(((int *)buf)[0])) == BSPVERSION || p == 30) { dheader_t *header = (dheader_t *)buf; @@ -1643,8 +1804,8 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer if (com_token[0] == '}') break; // skip leading whitespace - for (k = 0;com_token[k] && com_token[k] <= ' ';k++); - for (l = 0;l < (int)sizeof(keyname) - 1 && com_token[k+l] && com_token[k+l] > ' ';l++) + for (k = 0;com_token[k] && ISWHITESPACE(com_token[k]);k++); + 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)) @@ -1670,7 +1831,6 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer case Q3BSPVERSION: strlcpy((char *)buf, "Q3", sizeof(buf));break; case Q2BSPVERSION: strlcpy((char *)buf, "Q2", sizeof(buf));break; case BSPVERSION: strlcpy((char *)buf, "Q1", sizeof(buf));break; - case MCBSPVERSION: strlcpy((char *)buf, "MC", sizeof(buf));break; case 30: strlcpy((char *)buf, "HL", sizeof(buf));break; default: strlcpy((char *)buf, "??", sizeof(buf));break; } @@ -1737,11 +1897,10 @@ void Con_DisplayList(const char **list) Con_Print("\n\n"); } -/* Nicks_CompleteCountPossible - - Count the number of possible nicks to complete - */ -//qboolean COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out, qboolean escape_carets); +/* + SanitizeString strips color tags from the string in + and writes the result on string out +*/ void SanitizeString(char *in, char *out) { while(*in) @@ -1754,18 +1913,33 @@ void SanitizeString(char *in, char *out) out[0] = STRING_COLOR_TAG; out[1] = 0; return; - } else if(*in >= '0' && *in <= '9') + } + else if (*in >= '0' && *in <= '9') // ^[0-9] found { ++in; - if(!*in) // end + if(!*in) { *out = 0; return; - } else if (*in == STRING_COLOR_TAG) + } else if (*in == STRING_COLOR_TAG) // ^[0-9]^ found, don't print ^[0-9] continue; - } else if (*in != STRING_COLOR_TAG) { - --in; } + 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; @@ -1773,7 +1947,6 @@ void SanitizeString(char *in, char *out) } *out = 0; } -int Sbar_GetPlayer (int index); // <- safety? // Now it becomes TRICKY :D --blub static char Nicks_list[MAX_SCOREBOARD][MAX_SCOREBOARDNAME]; // contains the nicks with colors and all that @@ -1818,15 +1991,15 @@ int Nicks_strncasecmp(char *a, char *b, unsigned int a_len) return Nicks_strncasecmp_nospaces(a, b, a_len); return strncasecmp(a, b, a_len); } - + space_char = (con_nickcompletion_flags.integer & NICKS_NO_SPACES) ? 'a' : ' '; - + // ignore non alphanumerics of B // if A contains a non-alphanumeric, B must contain it as well though! while(a_len) { qboolean alnum_a, alnum_b; - + if(tolower(*a) == tolower(*b)) { if(*a == 0) // end of both strings, they're equal @@ -1855,6 +2028,11 @@ int Nicks_strncasecmp(char *a, char *b, unsigned int a_len) return 0; } + +/* Nicks_CompleteCountPossible + + Count the number of possible nicks to complete + */ int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon) { char name[128]; @@ -1863,33 +2041,30 @@ int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon) int match; int spos; int count = 0; - + if(!con_nickcompletion.integer) return 0; // changed that to 1 if(!line[0])// || !line[1]) // we want at least... 2 written characters return 0; - + for(i = 0; i < cl.maxclients; ++i) { - /*p = Sbar_GetPlayer(i); - if(p < 0) - break;*/ p = i; if(!cl.scores[p].name[0]) continue; SanitizeString(cl.scores[p].name, name); - //Con_Printf("Sanitized: %s^7 -> %s", cl.scores[p].name, name); - + //Con_Printf(" ^2Sanitized: ^7%s -> %s", cl.scores[p].name, name); + if(!name[0]) continue; - + length = strlen(name); match = -1; spos = pos - 1; // no need for a minimum of characters :) - + while(spos >= 0 && (spos - pos) < length) // search-string-length < name length { if(spos > 0 && line[spos-1] != ' ' && line[spos-1] != ';' && line[spos-1] != '\"' && line[spos-1] != '\'') @@ -1918,7 +2093,7 @@ int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon) { Nicks_matchpos = match; } - + Nicks_offset[count] = s - (&line[match]); //Con_Printf("offset for %s: %i\n", name, Nicks_offset[count]); @@ -1945,7 +2120,7 @@ void Nicks_CutMatchesNormal(int count) l = strlen(Nicks_sanlist[i]) - 1; if(l < c) c = l; - + for(l = 0; l <= c; ++l) if(tolower(Nicks_sanlist[0][l]) != tolower(Nicks_sanlist[i][l])) { @@ -1980,7 +2155,7 @@ void Nicks_CutMatchesAlphaNumeric(int count) char tempstr[sizeof(Nicks_sanlist[0])]; 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]); for(i = 0, l = 0; i < (int)c; ++i) { @@ -1992,7 +2167,7 @@ void Nicks_CutMatchesAlphaNumeric(int count) } } tempstr[l] = 0; - + for(i = 1; i < count; ++i) { a = tempstr; @@ -2038,7 +2213,7 @@ void Nicks_CutMatchesNoSpaces(int count) unsigned int c, l; char tempstr[sizeof(Nicks_sanlist[0])]; char *a, *b; - + c = strlen(Nicks_sanlist[0]); for(i = 0, l = 0; i < (int)c; ++i) { @@ -2048,7 +2223,7 @@ void Nicks_CutMatchesNoSpaces(int count) } } tempstr[l] = 0; - + for(i = 1; i < count; ++i) { a = tempstr; @@ -2108,40 +2283,83 @@ const char **Nicks_CompleteBuildList(int count) buf[bpos] = Nicks_sanlist[bpos] + Nicks_offset[bpos]; Nicks_CutMatches(count); - + buf[bpos] = NULL; return buf; } +/* + Nicks_AddLastColor + Restores the previous used color, after the autocompleted name. +*/ int Nicks_AddLastColor(char *buffer, int pos) { qboolean quote_added = false; int match; - char color = '7'; - + int color = STRING_COLOR_DEFAULT + '0'; + char r = 0, g = 0, b = 0; + if(con_nickcompletion_flags.integer & NICKS_ADD_QUOTE && buffer[Nicks_matchpos-1] == '\"') { // we'll have to add a quote :) buffer[pos++] = '\"'; quote_added = true; } - + if((!quote_added && con_nickcompletion_flags.integer & NICKS_ADD_COLOR) || con_nickcompletion_flags.integer & NICKS_FORCE_COLOR) { // add color when no quote was added, or when flags &4? // find last color for(match = Nicks_matchpos-1; match >= 0; --match) { - if(buffer[match] == STRING_COLOR_TAG && buffer[match+1] >= '0' && buffer[match+1] <= '9') + if(buffer[match] == STRING_COLOR_TAG) { - color = buffer[match+1]; - break; + if( isdigit(buffer[match+1]) ) + { + color = buffer[match+1]; + break; + } + else if(buffer[match+1] == STRING_COLOR_RGB_TAG_CHAR) + { + if ( isxdigit(buffer[match+2]) && isxdigit(buffer[match+3]) && isxdigit(buffer[match+4]) ) + { + r = buffer[match+2]; + g = buffer[match+3]; + b = buffer[match+4]; + color = -1; + break; + } + } + } + } + if(!quote_added) + { + if( buffer[pos-2] == STRING_COLOR_TAG && isdigit(buffer[pos-1]) ) // when thes use &4 + { + pos -= 2; + } + else if( pos >= 5 && buffer[pos-5] == STRING_COLOR_TAG && buffer[pos-4] == STRING_COLOR_RGB_TAG_CHAR) + { + if ( isxdigit(buffer[pos-3]) && isxdigit(buffer[pos-2]) && isxdigit(buffer[pos-1]) ) + { + pos -= 5; + color = -1; + } } } - if(!quote_added && buffer[pos-2] == STRING_COLOR_TAG && buffer[pos-1] >= '0' && buffer[pos-1] <= '9') // when thes use &4 - pos -= 2; - buffer[pos++] = STRING_COLOR_TAG; - buffer[pos++] = color; + if (color == -1) + { + buffer[pos++] = STRING_COLOR_TAG; + buffer[pos++] = STRING_COLOR_RGB_TAG_CHAR; + buffer[pos++] = r; + buffer[pos++] = g; + buffer[pos++] = b; + } + else + { + buffer[pos++] = STRING_COLOR_TAG; + buffer[pos++] = color; + } } return pos; } @@ -2156,11 +2374,11 @@ int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos) { 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 - 4) ) // space for color and space and \0 + if( len < (size - 7) ) // space for color (^[0-9] or ^xrgb) and space and \0 len = Nicks_AddLastColor(buffer, Nicks_matchpos+len); buffer[len++] = ' '; buffer[len] = 0; @@ -2201,9 +2419,11 @@ void Con_CompleteCommandLine (void) char *s; const char **list[4] = {0, 0, 0, 0}; char s2[512]; + char command[512]; int c, v, a, i, cmd_len, pos, k; int n; // nicks --blub - + const char *space, *patterns; + //find what we want to complete pos = key_linepos; while(--pos) @@ -2218,18 +2438,161 @@ void Con_CompleteCommandLine (void) strlcpy(s2, key_lines[edit_line] + key_linepos, sizeof(s2)); //save chars after cursor key_lines[edit_line][key_linepos] = 0; //hide them - //maps search - for(k=pos-1;k>2;k--) - if(key_lines[edit_line][k] != ' ') + space = strchr(key_lines[edit_line] + 1, ' '); + if(space && pos == (space - key_lines[edit_line]) + 1) + { + strlcpy(command, key_lines[edit_line] + 1, min(sizeof(command), (unsigned int)(space - key_lines[edit_line]))); + + patterns = Cvar_VariableString(va("con_completion_%s", command)); // TODO maybe use a better place for this? + if(patterns && !*patterns) + patterns = NULL; // get rid of the empty string + + if(!strcmp(command, "map") || !strcmp(command, "changelevel") || (patterns && !strcmp(patterns, "map"))) { - if(key_lines[edit_line][k] == '\"' || key_lines[edit_line][k] == ';' || key_lines[edit_line][k] == '\'') - break; - if ((pos+k > 2 && !strncmp(key_lines[edit_line]+k-2, "map", 3)) - || (pos+k > 10 && !strncmp(key_lines[edit_line]+k-10, "changelevel", 11))) + //maps search + char t[MAX_QPATH]; + if (GetMapList(s, t, sizeof(t))) + { + // first move the cursor + key_linepos += (int)strlen(t) - (int)strlen(s); + + // and now do the actual work + *s = 0; + strlcat(key_lines[edit_line], t, MAX_INPUTLINE); + strlcat(key_lines[edit_line], s2, MAX_INPUTLINE); //add back chars after cursor + + // and fix the cursor + if(key_linepos > (int) strlen(key_lines[edit_line])) + key_linepos = (int) strlen(key_lines[edit_line]); + } + return; + } + else + { + if(patterns) { char t[MAX_QPATH]; - if (GetMapList(s, t, sizeof(t))) + stringlist_t resultbuf, dirbuf; + + // Usage: + // // store completion patterns (space separated) for command foo in con_completion_foo + // set con_completion_foo "foodata/*.foodefault *.foo" + // foo + // + // Note: patterns with slash are always treated as absolute + // patterns; patterns without slash search in the innermost + // directory the user specified. There is no way to "complete into" + // a directory as of now, as directories seem to be unknown to the + // FS subsystem. + // + // Examples: + // set con_completion_playermodel "models/player/*.zym models/player/*.md3 models/player/*.psk models/player/*.dpm" + // set con_completion_playdemo "*.dem" + // set con_completion_play "*.wav *.ogg" + // + // TODO somehow add support for directories; these shall complete + // to their name + an appended slash. + + stringlistinit(&resultbuf); + stringlistinit(&dirbuf); + while(COM_ParseToken_Simple(&patterns, false, false)) + { + fssearch_t *search; + if(strchr(com_token, '/')) + { + search = FS_Search(com_token, true, true); + } + else + { + const char *slash = strrchr(s, '/'); + if(slash) + { + 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); + } + else + search = FS_Search(com_token, true, true); + } + if(search) + { + for(i = 0; i < search->numfilenames; ++i) + if(!strncmp(search->filenames[i], s, strlen(s))) + if(FS_FileType(search->filenames[i]) == FS_FILETYPE_FILE) + stringlistappend(&resultbuf, search->filenames[i]); + FS_FreeSearch(search); + } + } + + // In any case, add directory names + { + fssearch_t *search; + const char *slash = strrchr(s, '/'); + if(slash) + { + 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); + } + else + search = FS_Search("*", true, true); + if(search) + { + for(i = 0; i < search->numfilenames; ++i) + if(!strncmp(search->filenames[i], s, strlen(s))) + if(FS_FileType(search->filenames[i]) == FS_FILETYPE_DIRECTORY) + stringlistappend(&dirbuf, search->filenames[i]); + FS_FreeSearch(search); + } + } + + if(resultbuf.numstrings > 0 || dirbuf.numstrings > 0) { + const char *p, *q; + unsigned int matchchars; + if(resultbuf.numstrings == 0 && dirbuf.numstrings == 1) + { + dpsnprintf(t, sizeof(t), "%s/", dirbuf.strings[0]); + } + else + if(resultbuf.numstrings == 1 && dirbuf.numstrings == 0) + { + dpsnprintf(t, sizeof(t), "%s ", resultbuf.strings[0]); + } + else + { + stringlistsort(&resultbuf); // 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]); + } + for(i = 0; i < resultbuf.numstrings; ++i) + { + Con_Printf("%s\n", resultbuf.strings[i]); + } + matchchars = sizeof(t) - 1; + if(resultbuf.numstrings > 0) + { + p = resultbuf.strings[0]; + q = resultbuf.strings[resultbuf.numstrings - 1]; + for(; *p && *p == *q; ++p, ++q); + matchchars = (unsigned int)(p - resultbuf.strings[0]); + } + if(dirbuf.numstrings > 0) + { + p = dirbuf.strings[0]; + q = dirbuf.strings[dirbuf.numstrings - 1]; + for(; *p && *p == *q; ++p, ++q); + matchchars = min(matchchars, (unsigned int)(p - dirbuf.strings[0])); + } + // now p points to the first non-equal character, or to the end + // of resultbuf.strings[0]. We want to append the characters + // from resultbuf.strings[0] to (not including) p as these are + // the unique prefix + strlcpy(t, (resultbuf.numstrings > 0 ? resultbuf : dirbuf).strings[0], min(matchchars + 1, sizeof(t))); + } + // first move the cursor key_linepos += (int)strlen(t) - (int)strlen(s); @@ -2242,9 +2605,13 @@ void Con_CompleteCommandLine (void) if(key_linepos > (int) strlen(key_lines[edit_line])) key_linepos = (int) strlen(key_lines[edit_line]); } - return; + stringlistfreecontents(&resultbuf); + stringlistfreecontents(&dirbuf); + + return; // bail out, when we complete for a command that wants a file name } } + } // Count number of possible matches and print them c = Cmd_CompleteCountPossible(s); @@ -2273,7 +2640,7 @@ void Con_CompleteCommandLine (void) } if (!(c + v + a + n)) // No possible matches - { + { if(s2[0]) strlcpy(&key_lines[edit_line][key_linepos], s2, sizeof(key_lines[edit_line]) - key_linepos); return; @@ -2287,7 +2654,7 @@ void Con_CompleteCommandLine (void) cmd = *(list[2] = Cmd_CompleteAliasBuildList(s)); if (n) cmd = *(list[3] = Nicks_CompleteBuildList(n)); - + for (cmd_len = (int)strlen(s);;cmd_len++) { const char **l;