]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - console.c
some work on SV_TestEntityPosition and entity unsticking, now only checks against...
[xonotic/darkplaces.git] / console.c
index b99f7c4b02b0f8a6dde2dba2959d7d873ec668fe..5c798f56f2c77a882260abd38d7bff8ced006c58 100644 (file)
--- a/console.c
+++ b/console.c
@@ -41,9 +41,9 @@ int con_current;
 int con_x;
 char con_text[CON_TEXTSIZE];
 
-//seconds
-cvar_t con_notifytime = {CVAR_SAVE, "con_notifytime","3"};
-cvar_t con_notify = {CVAR_SAVE, "con_notify","4"};
+cvar_t con_notifytime = {CVAR_SAVE, "con_notifytime","3", "how long notify lines last, in seconds"};
+cvar_t con_notify = {CVAR_SAVE, "con_notify","4", "how many notify lines to show (0-32)"};
+cvar_t con_textsize = {CVAR_SAVE, "con_textsize","8", "console text size in virtual 2D pixels"};       //[515]: console text size in pixels
 
 #define MAX_NOTIFYLINES 32
 // cl.time time the line was generated for transparent notify lines
@@ -53,6 +53,11 @@ int con_vislines;
 
 qboolean con_initialized;
 
+// used for server replies to rcon command
+qboolean rcon_redirect = false;
+int rcon_redirect_bufferpos = 0;
+char rcon_redirect_buffer[1400];
+
 
 /*
 ==============================================================================
@@ -62,11 +67,11 @@ LOGGING
 ==============================================================================
 */
 
-cvar_t log_file = {0, "log_file",""};
+cvar_t log_file = {0, "log_file","", "filename to log messages to"};
 char crt_log_file [MAX_OSPATH] = "";
 qfile_t* logfile = NULL;
 
-qbyte* logqueue = NULL;
+unsigned char* logqueue = NULL;
 size_t logq_ind = 0;
 size_t logq_size = 0;
 
@@ -183,10 +188,10 @@ void Log_ConPrint (const char *msg)
                if (len > remain)
                {
                        size_t factor = ((logq_ind + len) / logq_size) + 1;
-                       qbyte* newqueue;
+                       unsigned char* newqueue;
 
                        logq_size *= factor;
-                       newqueue = Mem_Alloc (tempmempool, logq_size);
+                       newqueue = (unsigned char *)Mem_Alloc (tempmempool, logq_size);
                        memcpy (newqueue, logqueue, logq_ind);
                        Mem_Free (logqueue);
                        logqueue = newqueue;
@@ -316,9 +321,14 @@ If the line width has changed, reformat the buffer.
 void Con_CheckResize (void)
 {
        int i, j, width, oldwidth, oldtotallines, numlines, numchars;
+       float f;
        char tbuf[CON_TEXTSIZE];
 
-       width = (vid_conwidth.integer >> 3);
+       f = bound(1, con_textsize.value, 128);
+       if(f != con_textsize.value)
+               Cvar_SetValueQuick(&con_textsize, f);
+       width = (int)floor(vid_conwidth.value / con_textsize.value);
+       width = bound(1, width, CON_TEXTSIZE/4);
 
        if (width == con_linewidth)
                return;
@@ -356,6 +366,21 @@ void Con_CheckResize (void)
        con_current = con_totallines - 1;
 }
 
+//[515]: the simplest command ever
+//LordHavoc: not so simple after I made it print usage...
+static void Con_Maps_f (void)
+{
+       if (Cmd_Argc() > 2)
+       {
+               Con_Printf("usage: maps [mapnameprefix]\n");
+               return;
+       }
+       else if (Cmd_Argc() == 2)
+               GetMapList(Cmd_Argv(1), NULL, 0);
+       else
+               GetMapList("", NULL, 0);
+}
+
 /*
 ================
 Con_Init
@@ -368,8 +393,8 @@ void Con_Init (void)
        con_totallines = CON_TEXTSIZE / con_linewidth;
 
        // Allocate a log queue
-       logq_size = 512;
-       logqueue = Mem_Alloc (tempmempool, logq_size);
+       logq_size = MAX_INPUTLINE;
+       logqueue = (unsigned char *)Mem_Alloc (tempmempool, logq_size);
        logq_ind = 0;
 
        Cvar_RegisterVariable (&log_file);
@@ -385,12 +410,14 @@ void Con_Init_Commands (void)
        // register our cvars
        Cvar_RegisterVariable (&con_notifytime);
        Cvar_RegisterVariable (&con_notify);
+       Cvar_RegisterVariable (&con_textsize);
 
        // register our commands
-       Cmd_AddCommand ("toggleconsole", Con_ToggleConsole_f);
-       Cmd_AddCommand ("messagemode", Con_MessageMode_f);
-       Cmd_AddCommand ("messagemode2", Con_MessageMode2_f);
-       Cmd_AddCommand ("clear", Con_Clear_f);
+       Cmd_AddCommand ("toggleconsole", Con_ToggleConsole_f, "opens or closes the console");
+       Cmd_AddCommand ("messagemode", Con_MessageMode_f, "input a chat message to say to everyone");
+       Cmd_AddCommand ("messagemode2", Con_MessageMode2_f, "input a chat message to say to only your team");
+       Cmd_AddCommand ("clear", Con_Clear_f, "clear console history");
+       Cmd_AddCommand ("maps", Con_Maps_f, "list information about available maps");   // By [515]
 
        con_initialized = true;
        Con_Print("Console initialized.\n");
@@ -535,14 +562,18 @@ void Con_Print(const char *msg)
 {
        int mask = 0;
        static int index = 0;
-       static char line[16384];
+       static char line[MAX_INPUTLINE];
 
        for (;*msg;msg++)
        {
+               // if this print is in response to an rcon command, add the character
+               // to the rcon redirect buffer
+               if (rcon_redirect && rcon_redirect_bufferpos < (int)sizeof(rcon_redirect_buffer) - 1)
+                       rcon_redirect_buffer[rcon_redirect_bufferpos++] = *msg;
+               // if this is the beginning of a new line, print timestamp
                if (index == 0)
                {
-                       // if this is the beginning of a new line, print timestamp
-                       char *timestamp = timestamps.integer ? Sys_TimeString(timeformat.string) : "";
+                       const char *timestamp = timestamps.integer ? Sys_TimeString(timeformat.string) : "";
                        // reset the color
                        // FIXME: 1. perhaps we should use a terminal system 2. use a constant instead of 7!
                        line[index++] = STRING_COLOR_TAG;
@@ -557,16 +588,16 @@ void Con_Print(const char *msg)
                                        // play talk wav
                                        S_LocalSound ("sound/misc/talk.wav");
                                }
-                               if (gamemode == GAME_NEXUIZ)
-                               {
-                                       line[index++] = '^';
+                               //if (gamemode == GAME_NEXUIZ)
+                               //{
+                                       line[index++] = STRING_COLOR_TAG;
                                        line[index++] = '3';
-                               }
-                               else
-                               {
-                                       // go to colored text
-                                       mask = 128;
-                               }
+                               //}
+                               //else
+                               //{
+                               //      // go to colored text
+                               //      mask = 128;
+                               //}
                                msg++;
                        }
                        // store timestamp
@@ -577,7 +608,7 @@ void Con_Print(const char *msg)
                // append the character
                line[index++] = *msg;
                // if this is a newline character, we have a complete line to print
-               if (*msg == '\n' || index >= 16000)
+               if (*msg == '\n' || index >= (int)sizeof(line) / 2)
                {
                        // terminate the line
                        line[index] = 0;
@@ -601,9 +632,6 @@ void Con_Print(const char *msg)
 }
 
 
-// LordHavoc: increased from 4096 to 16384
-#define        MAXPRINTMSG     16384
-
 /*
 ================
 Con_Printf
@@ -614,7 +642,7 @@ Prints to all appropriate console targets
 void Con_Printf(const char *fmt, ...)
 {
        va_list argptr;
-       char msg[MAXPRINTMSG];
+       char msg[MAX_INPUTLINE];
 
        va_start(argptr,fmt);
        dpvsnprintf(msg,sizeof(msg),fmt,argptr);
@@ -647,7 +675,7 @@ A Con_Printf that only shows up if the "developer" cvar is set
 void Con_DPrintf(const char *fmt, ...)
 {
        va_list argptr;
-       char msg[MAXPRINTMSG];
+       char msg[MAX_INPUTLINE];
 
        if (!developer.integer)
                return;                 // don't confuse non-developers with techie stuff...
@@ -681,7 +709,7 @@ void Con_DrawInput (void)
 {
        int             y;
        int             i;
-       char editlinecopy[257], *text;
+       char editlinecopy[MAX_INPUTLINE+1], *text;
 
        if (!key_consoleactive)
                return;         // don't draw anything
@@ -696,7 +724,7 @@ void Con_DrawInput (void)
        y = (int)strlen(text);
 
 // fill out remainder with spaces
-       for (i = y; i < 256; i++)
+       for (i = y; i < (int)sizeof(editlinecopy)-1; i++)
                text[i] = ' ';
 
        // add the cursor frame
@@ -710,7 +738,7 @@ void Con_DrawInput (void)
                text += 1 + key_linepos - con_linewidth;
 
        // draw it
-       DrawQ_ColoredString(0, con_vislines - 16, text, con_linewidth, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, NULL );
+       DrawQ_ColoredString(0, con_vislines - con_textsize.value*2, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, NULL );
 
        // remove cursor
 //     key_lines[edit_line][key_linepos] = 0;
@@ -726,12 +754,11 @@ Draws the last few lines of output transparently over the game top
 */
 void Con_DrawNotify (void)
 {
-       int             x, v;
+       float   x, v;
        char    *text;
        int             i;
        float   time;
-       extern char chat_buffer[];
-       char    temptext[256];
+       char    temptext[MAX_INPUTLINE];
        int colorindex = -1; //-1 for default
 
        if (con_notify.integer < 0)
@@ -759,13 +786,13 @@ void Con_DrawNotify (void)
                        int linewidth;
 
                        for (linewidth = con_linewidth; linewidth && text[linewidth-1] == ' '; linewidth--);
-                       x = (vid_conwidth.integer - linewidth * 8) / 2;
+                       x = (vid_conwidth.integer - linewidth * con_textsize.value) * 0.5;
                } else
                        x = 0;
 
-               DrawQ_ColoredString( x, v, text, con_linewidth, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
+               DrawQ_ColoredString( x, v, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
 
-               v += 8;
+               v += con_textsize.value;
        }
 
 
@@ -782,14 +809,14 @@ void Con_DrawNotify (void)
                        sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1));
                while ((int)strlen(temptext) >= con_linewidth)
                {
-                       DrawQ_ColoredString( 0, v, temptext, con_linewidth, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
+                       DrawQ_ColoredString( 0, v, temptext, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
                        strcpy(temptext, &temptext[con_linewidth]);
-                       v += 8;
+                       v += con_textsize.value;
                }
                if (strlen(temptext) > 0)
                {
-                       DrawQ_ColoredString( 0, v, temptext, 0, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
-                       v += 8;
+                       DrawQ_ColoredString( 0, v, temptext, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
+                       v += con_textsize.value;
                }
        }
 }
@@ -802,10 +829,10 @@ Draws the console with the solid background
 The typing input line at the bottom should only be drawn if typing is allowed
 ================
 */
-extern char engineversion[40];
 void Con_DrawConsole (int lines)
 {
-       int i, y, rows, j;
+       int i, rows, j;
+       float y;
        char *text;
        int colorindex = -1;
 
@@ -813,30 +840,194 @@ void Con_DrawConsole (int lines)
                return;
 
 // draw the background
-       if (scr_conbrightness.value >= 0.01f)
-               DrawQ_Pic(0, lines - vid_conheight.integer, "gfx/conback", vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, scr_conalpha.value, 0);
-       else
-               DrawQ_Fill(0, lines - vid_conheight.integer, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, scr_conalpha.value, 0);
-       DrawQ_String(vid_conwidth.integer - strlen(engineversion) * 8 - 8, lines - 8, engineversion, 0, 8, 8, 1, 0, 0, 1, 0);
+       DrawQ_Pic(0, lines - vid_conheight.integer, scr_conbrightness.value >= 0.01f ? Draw_CachePic("gfx/conback", false) : NULL, vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, scr_conalpha.value, 0);
+       DrawQ_String(vid_conwidth.integer - strlen(engineversion) * con_textsize.value - con_textsize.value, lines - con_textsize.value, engineversion, 0, con_textsize.value, con_textsize.value, 1, 0, 0, 1, 0);
 
 // draw the text
        con_vislines = lines;
 
-       rows = (lines-16)>>3;           // rows of text to draw
-       y = lines - 16 - (rows<<3);     // may start slightly negative
+       rows = (int)ceil((lines/con_textsize.value)-2);         // rows of text to draw
+       y = lines - (rows+2)*con_textsize.value;        // may start slightly negative
 
-       for (i = con_current - rows + 1;i <= con_current;i++, y += 8)
+       for (i = con_current - rows + 1;i <= con_current;i++, y += con_textsize.value)
        {
                j = max(i - con_backscroll, 0);
                text = con_text + (j % con_totallines)*con_linewidth;
 
-               DrawQ_ColoredString( 0, y, text, con_linewidth, 8, 8, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
+               DrawQ_ColoredString( 0, y, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
        }
 
 // draw the input prompt, user text, and cursor if desired
        Con_DrawInput ();
 }
 
+/*
+GetMapList
+
+Made by [515]
+Prints not only map filename, but also
+its format (q1/q2/q3/hl) and even its message
+*/
+//[515]: here is an ugly hack.. two gotos... oh my... *but it works*
+//LordHavoc: rewrote bsp type detection, added mcbsp support and rewrote message extraction to do proper worldspawn parsing
+//LordHavoc: added .ent file loading, and redesigned error handling to still try the .ent file even if the map format is not recognized, this also eliminated one goto
+//LordHavoc: FIXME: man this GetMapList is STILL ugly code even after my cleanups...
+qboolean GetMapList (const char *s, char *completedname, int completednamebufferlength)
+{
+       fssearch_t      *t;
+       char            message[64];
+       int                     i, k, max, p, o, min;
+       unsigned char *len;
+       qfile_t         *f;
+       unsigned char buf[1024];
+
+       sprintf(message, "maps/%s*.bsp", s);
+       t = FS_Search(message, 1, true);
+       if(!t)
+               return false;
+       if (t->numfilenames > 1)
+               Con_Printf("^1 %i maps found :\n", t->numfilenames);
+       len = Z_Malloc(t->numfilenames);
+       min = 666;
+       for(max=i=0;i<t->numfilenames;i++)
+       {
+               k = (int)strlen(t->filenames[i]);
+               k -= 9;
+               if(max < k)
+                       max = k;
+               else
+               if(min > k)
+                       min = k;
+               len[i] = k;
+       }
+       o = (int)strlen(s);
+       for(i=0;i<t->numfilenames;i++)
+       {
+               int lumpofs = 0, lumplen = 0;
+               char *entities = NULL;
+               const char *data = NULL;
+               char keyname[64];
+               char entfilename[MAX_QPATH];
+               strcpy(message, "^1**ERROR**^7");
+               p = 0;
+               f = FS_Open(t->filenames[i], "rb", true, false);
+               if(f)
+               {
+                       memset(buf, 0, 1024);
+                       FS_Read(f, buf, 1024);
+                       if (!memcmp(buf, "IBSP", 4))
+                       {
+                               p = LittleLong(((int *)buf)[1]);
+                               if (p == Q3BSPVERSION)
+                               {
+                                       q3dheader_t *header = (q3dheader_t *)buf;
+                                       lumpofs = LittleLong(header->lumps[Q3LUMP_ENTITIES].fileofs);
+                                       lumplen = LittleLong(header->lumps[Q3LUMP_ENTITIES].filelen);
+                               }
+                               else if (p == Q2BSPVERSION)
+                               {
+                                       q2dheader_t *header = (q2dheader_t *)buf;
+                                       lumpofs = LittleLong(header->lumps[Q2LUMP_ENTITIES].fileofs);
+                                       lumplen = LittleLong(header->lumps[Q2LUMP_ENTITIES].filelen);
+                               }
+                       }
+                       else if (!memcmp(buf, "MCBSPpad", 8))
+                       {
+                               p = LittleLong(((int *)buf)[2]);
+                               if (p == MCBSPVERSION)
+                               {
+                                       int numhulls = LittleLong(((int *)buf)[3]);
+                                       lumpofs = LittleLong(((int *)buf)[3 + numhulls + LUMP_ENTITIES*2+0]);
+                                       lumplen = LittleLong(((int *)buf)[3 + numhulls + LUMP_ENTITIES*2+1]);
+                               }
+                       }
+                       else if((p = LittleLong(((int *)buf)[0])) == BSPVERSION || p == 30)
+                       {
+                               dheader_t *header = (dheader_t *)buf;
+                               lumpofs = LittleLong(header->lumps[LUMP_ENTITIES].fileofs);
+                               lumplen = LittleLong(header->lumps[LUMP_ENTITIES].filelen);
+                       }
+                       else
+                               p = 0;
+                       strlcpy(entfilename, t->filenames[i], sizeof(entfilename));
+                       strcpy(entfilename + strlen(entfilename) - 4, ".ent");
+                       entities = (char *)FS_LoadFile(entfilename, tempmempool, true, NULL);
+                       if (!entities && lumplen >= 10)
+                       {
+                               FS_Seek(f, lumpofs, SEEK_SET);
+                               entities = Z_Malloc(lumplen + 1);
+                               FS_Read(f, entities, lumplen);
+                       }
+                       if (entities)
+                       {
+                               // if there are entities to parse, a missing message key just
+                               // means there is no title, so clear the message string now
+                               message[0] = 0;
+                               data = entities;
+                               for (;;)
+                               {
+                                       int l;
+                                       if (!COM_ParseToken(&data, false))
+                                               break;
+                                       if (com_token[0] == '{')
+                                               continue;
+                                       if (com_token[0] == '}')
+                                               break;
+                                       // skip leading whitespace
+                                       for (k = 0;com_token[k] && com_token[k] <= ' ';k++);
+                                       for (l = 0;l < (int)sizeof(keyname) - 1 && com_token[k+l] && com_token[k+l] > ' ';l++)
+                                               keyname[l] = com_token[k+l];
+                                       keyname[l] = 0;
+                                       if (!COM_ParseToken(&data, false))
+                                               break;
+                                       if (developer.integer >= 2)
+                                               Con_Printf("key: %s %s\n", keyname, com_token);
+                                       if (!strcmp(keyname, "message"))
+                                       {
+                                               // get the message contents
+                                               strlcpy(message, com_token, sizeof(message));
+                                               break;
+                                       }
+                               }
+                       }
+               }
+               if (entities)
+                       Z_Free(entities);
+               if(f)
+                       FS_Close(f);
+               *(t->filenames[i]+len[i]+5) = 0;
+               switch(p)
+               {
+               case Q3BSPVERSION:      strcpy((char *)buf, "Q3");break;
+               case Q2BSPVERSION:      strcpy((char *)buf, "Q2");break;
+               case BSPVERSION:        strcpy((char *)buf, "Q1");break;
+               case MCBSPVERSION:      strcpy((char *)buf, "MC");break;
+               case 30:                        strcpy((char *)buf, "HL");break;
+               default:                        strcpy((char *)buf, "??");break;
+               }
+               Con_Printf("%16s (%s) %s\n", t->filenames[i]+5, buf, message);
+       }
+       Con_Print("\n");
+       for(p=o;p<min;p++)
+       {
+               k = *(t->filenames[0]+5+p);
+               if(k == 0)
+                       goto endcomplete;
+               for(i=1;i<t->numfilenames;i++)
+                       if(*(t->filenames[i]+5+p) != k)
+                               goto endcomplete;
+       }
+endcomplete:
+       if(p > o)
+       {
+               memset(completedname, 0, completednamebufferlength);
+               memcpy(completedname, (t->filenames[0]+5), min(p, completednamebufferlength - 1));
+       }
+       Z_Free(len);
+       FS_FreeSearch(t);
+       return p > o;
+}
+
 /*
        Con_DisplayList
 
@@ -884,87 +1075,128 @@ void Con_DisplayList(const char **list)
        Added by EvilTypeGuy
        Thanks to Fett erich@heintz.com
        Thanks to taniwha
+       Enhanced to tab-complete map names by [515]
 
 */
 void Con_CompleteCommandLine (void)
 {
-       const char *cmd = "", *s;
+       const char *cmd = "";
+       char *s;
        const char **list[3] = {0, 0, 0};
-       int c, v, a, i, cmd_len;
+       char s2[512];
+       int c, v, a, i, cmd_len, pos, k;
+
+       //find what we want to complete
+       pos = key_linepos;
+       while(--pos)
+       {
+               k = key_lines[edit_line][pos];
+               if(k == '\"' || k == ';' || k == ' ' || k == '\'')
+                       break;
+       }
+       pos++;
+
+       s = key_lines[edit_line] + pos;
+       strlcpy(s2, key_lines[edit_line] + key_linepos, sizeof(s2));    //save chars after cursor
+       key_lines[edit_line][key_linepos] = 0;                                  //hide them
+
+       //maps search
+       for(k=pos-1;k>2;k--)
+               if(key_lines[edit_line][k] != ' ')
+               {
+                       if(key_lines[edit_line][k] == '\"' || key_lines[edit_line][k] == ';' || key_lines[edit_line][k] == '\'')
+                               break;
+                       if      ((pos+k > 2 && !strncmp(key_lines[edit_line]+k-2, "map", 3))
+                               || (pos+k > 10 && !strncmp(key_lines[edit_line]+k-10, "changelevel", 11)))
+                       {
+                               char t[MAX_QPATH];
+                               if (GetMapList(s, t, sizeof(t)))
+                               {
+                                       // first move the cursor
+                                       key_linepos += (int)strlen(t) - (int)strlen(s);
+
+                                       // and now do the actual work
+                                       *s = 0;
+                                       strlcat(key_lines[edit_line], t, MAX_INPUTLINE);
+                                       strlcat(key_lines[edit_line], s2, MAX_INPUTLINE); //add back chars after cursor
+
+                                       // and fix the cursor
+                                       if(key_linepos > (int) strlen(key_lines[edit_line]))
+                                               key_linepos = (int) strlen(key_lines[edit_line]);
+                               }
+                               return;
+                       }
+               }
 
-       s = key_lines[edit_line] + 1;
-       // Count number of possible matches
+       // Count number of possible matches and print them
        c = Cmd_CompleteCountPossible(s);
+       if (c)
+       {
+               Con_Printf("\n%i possible command%s\n", c, (c > 1) ? "s: " : ":");
+               Cmd_CompleteCommandPrint(s);
+       }
        v = Cvar_CompleteCountPossible(s);
+       if (v)
+       {
+               Con_Printf("\n%i possible variable%s\n", v, (v > 1) ? "s: " : ":");
+               Cvar_CompleteCvarPrint(s);
+       }
        a = Cmd_CompleteAliasCountPossible(s);
+       if (a)
+       {
+               Con_Printf("\n%i possible aliases%s\n", a, (a > 1) ? "s: " : ":");
+               Cmd_CompleteAliasPrint(s);
+       }
 
        if (!(c + v + a))       // No possible matches
+       {
+               if(s2[0])
+                       strcpy(&key_lines[edit_line][key_linepos], s2);
                return;
+       }
 
-       if (c + v + a == 1) {
-               if (c)
-                       list[0] = Cmd_CompleteBuildList(s);
-               else if (v)
-                       list[0] = Cvar_CompleteBuildList(s);
-               else
-                       list[0] = Cmd_CompleteAliasBuildList(s);
-               cmd = *list[0];
-               cmd_len = (int)strlen (cmd);
-       } else {
-               if (c)
-                       cmd = *(list[0] = Cmd_CompleteBuildList(s));
-               if (v)
-                       cmd = *(list[1] = Cvar_CompleteBuildList(s));
-               if (a)
-                       cmd = *(list[2] = Cmd_CompleteAliasBuildList(s));
-
-               cmd_len = (int)strlen (s);
-               do {
-                       for (i = 0; i < 3; i++) {
-                               char ch = cmd[cmd_len];
-                               const char **l = list[i];
-                               if (l) {
-                                       while (*l && (*l)[cmd_len] == ch)
-                                               l++;
-                                       if (*l)
-                                               break;
-                               }
-                       }
-                       if (i == 3)
-                               cmd_len++;
-               } while (i == 3);
-               // 'quakebar'
-               Con_Print("\n\35");
-               for (i = 0; i < con_linewidth - 4; i++)
-                       Con_Print("\36");
-               Con_Print("\37\n");
-
-               // Print Possible Commands
-               if (c) {
-                       Con_Printf("%i possible command%s\n", c, (c > 1) ? "s: " : ":");
-                       Con_DisplayList(list[0]);
-               }
-
-               if (v) {
-                       Con_Printf("%i possible variable%s\n", v, (v > 1) ? "s: " : ":");
-                       Con_DisplayList(list[1]);
-               }
+       if (c)
+               cmd = *(list[0] = Cmd_CompleteBuildList(s));
+       if (v)
+               cmd = *(list[1] = Cvar_CompleteBuildList(s));
+       if (a)
+               cmd = *(list[2] = Cmd_CompleteAliasBuildList(s));
 
-               if (a) {
-                       Con_Printf("%i possible aliases%s\n", a, (a > 1) ? "s: " : ":");
-                       Con_DisplayList(list[2]);
+       for (cmd_len = (int)strlen(s);;cmd_len++)
+       {
+               const char **l;
+               for (i = 0; i < 3; i++)
+                       if (list[i])
+                               for (l = list[i];*l;l++)
+                                       if ((*l)[cmd_len] != cmd[cmd_len])
+                                               goto done;
+               // all possible matches share this character, so we continue...
+               if (!cmd[cmd_len])
+               {
+                       // if all matches ended at the same position, stop
+                       // (this means there is only one match)
+                       break;
                }
        }
+done:
 
-       if (cmd) {
-               strncpy(key_lines[edit_line] + 1, cmd, cmd_len);
-               key_linepos = cmd_len + 1;
-               if (c + v + a == 1) {
-                       key_lines[edit_line][key_linepos] = ' ';
-                       key_linepos++;
-               }
-               key_lines[edit_line][key_linepos] = 0;
+       // prevent a buffer overrun by limiting cmd_len according to remaining space
+       cmd_len = min(cmd_len, (int)sizeof(key_lines[edit_line]) - 1 - pos);
+       if (cmd)
+       {
+               key_linepos = pos;
+               memcpy(&key_lines[edit_line][key_linepos], cmd, cmd_len);
+               key_linepos += cmd_len;
+               // if there is only one match, add a space after it
+               if (c + v + a == 1 && key_linepos < (int)sizeof(key_lines[edit_line]) - 1)
+                       key_lines[edit_line][key_linepos++] = ' ';
        }
+
+       // use strlcat to avoid a buffer overrun
+       key_lines[edit_line][key_linepos] = 0;
+       strlcat(key_lines[edit_line], s2, sizeof(key_lines[edit_line]));
+
+       // free the command, cvar, and alias lists
        for (i = 0; i < 3; i++)
                if (list[i])
                        Mem_Free((void *)list[i]);