Attempt to stabilize ODE. Now using constant step (sys_ticrate set steptime) - on...
[divverent/darkplaces.git] / console.c
index eb13a11..0eaccd3 100644 (file)
--- a/console.c
+++ b/console.c
@@ -23,27 +23,38 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 # include <unistd.h>
 #endif
 #include <time.h>
+
 #include "quakedef.h"
 
-int con_linewidth;
+// for u8_encodech
+#include "ft2.h"
 
 float con_cursorspeed = 4;
 
-#define                CON_TEXTSIZE    131072
-
-// total lines in console scrollback
-int con_totallines;
 // lines up from bottom to display
 int con_backscroll;
-// where next message will be printed
-int con_current;
-// offset in current line for next print
-int con_x;
-char con_text[CON_TEXTSIZE];
+
+conbuffer_t con;
+
+#define CON_LINES(i) CONBUFFER_LINES(&con, i)
+#define CON_LINES_LAST CONBUFFER_LINES_LAST(&con)
+#define CON_LINES_COUNT CONBUFFER_LINES_COUNT(&con)
 
 cvar_t con_notifytime = {CVAR_SAVE, "con_notifytime","3", "how long notify lines last, in seconds"};
-cvar_t con_notify = {CVAR_SAVE, "con_notify","4", "how many notify lines to show (0-32)"};
+cvar_t con_notify = {CVAR_SAVE, "con_notify","4", "how many notify lines to show"};
+cvar_t con_notifyalign = {CVAR_SAVE, "con_notifyalign", "", "how to align notify lines: 0 = left, 0.5 = center, 1 = right, empty string = game default)"};
+
+cvar_t con_chattime = {CVAR_SAVE, "con_chattime","30", "how long chat lines last, in seconds"};
+cvar_t con_chat = {CVAR_SAVE, "con_chat","0", "how many chat lines to show in a dedicated chat area"};
+cvar_t con_chatpos = {CVAR_SAVE, "con_chatpos","0", "where to put chat (negative: lines from bottom of screen, positive: lines below notify, 0: at top)"};
+cvar_t con_chatrect = {CVAR_SAVE, "con_chatrect","0", "use con_chatrect_x and _y to position con_notify and con_chat freely instead of con_chatpos"};
+cvar_t con_chatrect_x = {CVAR_SAVE, "con_chatrect_x","", "where to put chat, relative x coordinate of left edge on screen (use con_chatwidth for width)"};
+cvar_t con_chatrect_y = {CVAR_SAVE, "con_chatrect_y","", "where to put chat, relative y coordinate of top edge on screen (use con_chat for line count)"};
+cvar_t con_chatwidth = {CVAR_SAVE, "con_chatwidth","1.0", "relative chat window width"};
 cvar_t con_textsize = {CVAR_SAVE, "con_textsize","8", "console text size in virtual 2D pixels"};
+cvar_t con_notifysize = {CVAR_SAVE, "con_notifysize","8", "notify text size in virtual 2D pixels"};
+cvar_t con_chatsize = {CVAR_SAVE, "con_chatsize","8", "chat text size in virtual 2D pixels (if con_chat is enabled)"};
+cvar_t con_chatsound = {CVAR_SAVE, "con_chatsound","1", "enables chat sound to play on message"};
 
 
 cvar_t sys_specialcharactertranslation = {0, "sys_specialcharactertranslation", "1", "terminal console conchars to ASCII translation (set to 0 if your conchars.tga is for an 8bit character set or if you want raw output)"};
@@ -68,19 +79,240 @@ cvar_t con_nickcompletion_flags = {CVAR_SAVE, "con_nickcompletion_flags", "11",
 #define NICKS_ALPHANUMERICS_ONLY 8
 #define NICKS_NO_SPACES 16
 
-#define MAX_NOTIFYLINES 32
-// cl.time time the line was generated for transparent notify lines
-float con_times[MAX_NOTIFYLINES];
+cvar_t con_completion_playdemo = {CVAR_SAVE, "con_completion_playdemo", "*.dem", "completion pattern for the playdemo command"};
+cvar_t con_completion_timedemo = {CVAR_SAVE, "con_completion_timedemo", "*.dem", "completion pattern for the timedemo command"};
+cvar_t con_completion_exec = {CVAR_SAVE, "con_completion_exec", "*.cfg", "completion pattern for the exec command"};
 
+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];
+qboolean rcon_redirect_proquakeprotocol = false;
+
+// generic functions for console buffers
+
+void ConBuffer_Init(conbuffer_t *buf, int textsize, int maxlines, mempool_t *mempool)
+{
+       buf->active = true;
+       buf->textsize = textsize;
+       buf->text = (char *) Mem_Alloc(mempool, textsize);
+       buf->maxlines = maxlines;
+       buf->lines = (con_lineinfo_t *) Mem_Alloc(mempool, maxlines * sizeof(*buf->lines));
+       buf->lines_first = 0;
+       buf->lines_count = 0;
+}
+
+/*
+================
+ConBuffer_Clear
+================
+*/
+void ConBuffer_Clear (conbuffer_t *buf)
+{
+       buf->lines_count = 0;
+}
+
+/*
+================
+ConBuffer_Shutdown
+================
+*/
+void ConBuffer_Shutdown(conbuffer_t *buf)
+{
+       buf->active = false;
+       if (buf->text)
+               Mem_Free(buf->text);
+       if (buf->lines)
+               Mem_Free(buf->lines);
+       buf->text = NULL;
+       buf->lines = NULL;
+}
+
+/*
+================
+ConBuffer_FixTimes
+
+Notifies the console code about the current time
+(and shifts back times of other entries when the time
+went backwards)
+================
+*/
+void ConBuffer_FixTimes(conbuffer_t *buf)
+{
+       int i;
+       if(buf->lines_count >= 1)
+       {
+               double diff = cl.time - CONBUFFER_LINES_LAST(buf).addtime;
+               if(diff < 0)
+               {
+                       for(i = 0; i < buf->lines_count; ++i)
+                               CONBUFFER_LINES(buf, i).addtime += diff;
+               }
+       }
+}
+
+/*
+================
+ConBuffer_DeleteLine
+
+Deletes the first line from the console history.
+================
+*/
+void ConBuffer_DeleteLine(conbuffer_t *buf)
+{
+       if(buf->lines_count == 0)
+               return;
+       --buf->lines_count;
+       buf->lines_first = (buf->lines_first + 1) % buf->maxlines;
+}
+
+/*
+================
+ConBuffer_DeleteLastLine
+
+Deletes the last line from the console history.
+================
+*/
+void ConBuffer_DeleteLastLine(conbuffer_t *buf)
+{
+       if(buf->lines_count == 0)
+               return;
+       --buf->lines_count;
+}
+
+/*
+================
+ConBuffer_BytesLeft
+
+Checks if there is space for a line of the given length, and if yes, returns a
+pointer to the start of such a space, and NULL otherwise.
+================
+*/
+static char *ConBuffer_BytesLeft(conbuffer_t *buf, int len)
+{
+       if(len > buf->textsize)
+               return NULL;
+       if(buf->lines_count == 0)
+               return buf->text;
+       else
+       {
+               char *firstline_start = buf->lines[buf->lines_first].start;
+               char *lastline_onepastend = CONBUFFER_LINES_LAST(buf).start + CONBUFFER_LINES_LAST(buf).len;
+               // the buffer is cyclic, so we first have two cases...
+               if(firstline_start < lastline_onepastend) // buffer is contiguous
+               {
+                       // put at end?
+                       if(len <= buf->text + buf->textsize - lastline_onepastend)
+                               return lastline_onepastend;
+                       // put at beginning?
+                       else if(len <= firstline_start - buf->text)
+                               return buf->text;
+                       else
+                               return NULL;
+               }
+               else // buffer has a contiguous hole
+               {
+                       if(len <= firstline_start - lastline_onepastend)
+                               return lastline_onepastend;
+                       else
+                               return NULL;
+               }
+       }
+}
+
+/*
+================
+ConBuffer_AddLine
+
+Appends a given string as a new line to the console.
+================
+*/
+void ConBuffer_AddLine(conbuffer_t *buf, const char *line, int len, int mask)
+{
+       char *putpos;
+       con_lineinfo_t *p;
+
+       // developer_memory 1 during shutdown prints while conbuffer_t is being freed
+       if (!buf->active)
+               return;
+
+       ConBuffer_FixTimes(buf);
+
+       if(len >= buf->textsize)
+       {
+               // line too large?
+               // only display end of line.
+               line += len - buf->textsize + 1;
+               len = buf->textsize - 1;
+       }
+       while(!(putpos = ConBuffer_BytesLeft(buf, len + 1)) || buf->lines_count >= buf->maxlines)
+               ConBuffer_DeleteLine(buf);
+       memcpy(putpos, line, len);
+       putpos[len] = 0;
+       ++buf->lines_count;
+
+       //fprintf(stderr, "Now have %d lines (%d -> %d).\n", buf->lines_count, buf->lines_first, CON_LINES_LAST);
+
+       p = &CONBUFFER_LINES_LAST(buf);
+       p->start = putpos;
+       p->len = len;
+       p->addtime = cl.time;
+       p->mask = mask;
+       p->height = -1; // calculate when needed
+}
+
+int ConBuffer_FindPrevLine(conbuffer_t *buf, int mask_must, int mask_mustnot, int start)
+{
+       int i;
+       if(start == -1)
+               start = buf->lines_count;
+       for(i = start - 1; i >= 0; --i)
+       {
+               con_lineinfo_t *l = &CONBUFFER_LINES(buf, i);
+
+               if((l->mask & mask_must) != mask_must)
+                       continue;
+               if(l->mask & mask_mustnot)
+                       continue;
+
+               return i;
+       }
+
+       return -1;
+}
+
+int Con_FindNextLine(conbuffer_t *buf, int mask_must, int mask_mustnot, int start)
+{
+       int i;
+       for(i = start + 1; i < buf->lines_count; ++i)
+       {
+               con_lineinfo_t *l = &CONBUFFER_LINES(buf, i);
+
+               if((l->mask & mask_must) != mask_must)
+                       continue;
+               if(l->mask & mask_mustnot)
+                       continue;
 
+               return i;
+       }
+
+       return -1;
+}
+
+const char *ConBuffer_GetLine(conbuffer_t *buf, int i)
+{
+       static char copybuf[MAX_INPUTLINE];
+       con_lineinfo_t *l = &CONBUFFER_LINES(buf, i);
+       size_t sz = l->len+1 > sizeof(copybuf) ? sizeof(copybuf) : l->len+1;
+       strlcpy(copybuf, l->start, sz);
+       return copybuf;
+}
 
 /*
 ==============================================================================
@@ -90,11 +322,13 @@ LOGGING
 ==============================================================================
 */
 
+/// \name Logging
+//@{
 cvar_t log_file = {0, "log_file","", "filename to log messages to"};
 cvar_t log_dest_udp = {0, "log_dest_udp","", "UDP address to log messages to (in QW rcon compatible format); multiple destinations can be separated by spaces; DO NOT SPECIFY DNS NAMES HERE"};
 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;
 
@@ -103,13 +337,13 @@ size_t logq_ind = 0;
 size_t logq_size = 0;
 
 void Log_ConPrint (const char *msg);
-
+//@}
 /*
 ====================
 Log_DestBuffer_Init
 ====================
 */
-static void Log_DestBuffer_Init()
+static void Log_DestBuffer_Init(void)
 {
        memcpy(log_dest_buffer, "\377\377\377\377n", 5); // QW rcon print
        log_dest_buffer_pos = 5;
@@ -120,7 +354,7 @@ static void Log_DestBuffer_Init()
 Log_DestBuffer_Flush
 ====================
 */
-void Log_DestBuffer_Flush()
+void Log_DestBuffer_Flush(void)
 {
        lhnetaddress_t log_dest_addr;
        lhnetsocket_t *log_dest_socket;
@@ -163,13 +397,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);
@@ -190,7 +433,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));
@@ -324,7 +567,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;
@@ -355,21 +598,9 @@ void Con_ToggleConsole_f (void)
 {
        // toggle the 'user wants console' bit
        key_consoleactive ^= KEY_CONSOLEACTIVE_USER;
-       memset (con_times, 0, sizeof(con_times));
-}
-
-/*
-================
-Con_Clear_f
-================
-*/
-void Con_Clear_f (void)
-{
-       //if (con_text)
-               memset (con_text, ' ', CON_TEXTSIZE);
+       Con_ClearNotify();
 }
 
-
 /*
 ================
 Con_ClearNotify
@@ -378,9 +609,8 @@ Con_ClearNotify
 void Con_ClearNotify (void)
 {
        int i;
-
-       for (i=0 ; i<MAX_NOTIFYLINES ; i++)
-               con_times[i] = 0;
+       for(i = 0; i < CON_LINES_COUNT; ++i)
+               CON_LINES(i).mask |= CON_MASK_HIDENOTIFY;
 }
 
 
@@ -392,7 +622,9 @@ Con_MessageMode_f
 void Con_MessageMode_f (void)
 {
        key_dest = key_message;
-       chat_team = false;
+       chat_mode = 0; // "say"
+       chat_bufferlen = 0;
+       chat_buffer[0] = 0;
 }
 
 
@@ -404,63 +636,54 @@ Con_MessageMode2_f
 void Con_MessageMode2_f (void)
 {
        key_dest = key_message;
-       chat_team = true;
+       chat_mode = 1; // "say_team"
+       chat_bufferlen = 0;
+       chat_buffer[0] = 0;
 }
 
+/*
+================
+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
+}
 
 /*
 ================
 Con_CheckResize
-
-If the line width has changed, reformat the buffer.
 ================
 */
 void Con_CheckResize (void)
 {
-       int i, j, width, oldwidth, oldtotallines, numlines, numchars;
+       int i, width;
        float f;
-       char tbuf[CON_TEXTSIZE];
 
        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);
+       width = bound(1, width, con.textsize/4);
+               // FIXME uses con in a non abstracted way
 
        if (width == con_linewidth)
                return;
 
-       oldwidth = con_linewidth;
        con_linewidth = width;
-       oldtotallines = con_totallines;
-       con_totallines = CON_TEXTSIZE / con_linewidth;
-       numlines = oldtotallines;
-
-       if (con_totallines < numlines)
-               numlines = con_totallines;
-
-       numchars = oldwidth;
-
-       if (con_linewidth < numchars)
-               numchars = con_linewidth;
-
-       memcpy (tbuf, con_text, CON_TEXTSIZE);
-       memset (con_text, ' ', CON_TEXTSIZE);
-
-       for (i=0 ; i<numlines ; i++)
-       {
-               for (j=0 ; j<numchars ; j++)
-               {
-                       con_text[(con_totallines - 1 - i) * con_linewidth + j] =
-                                       tbuf[((con_current - i + oldtotallines) %
-                                                 oldtotallines) * oldwidth + j];
-               }
-       }
 
-       Con_ClearNotify ();
+       for(i = 0; i < CON_LINES_COUNT; ++i)
+               CON_LINES(i).height = -1; // recalculate when next needed
 
+       Con_ClearNotify();
        con_backscroll = 0;
-       con_current = con_totallines - 1;
 }
 
 //[515]: the simplest command ever
@@ -480,45 +703,32 @@ static void Con_Maps_f (void)
 
 void Con_ConDump_f (void)
 {
-       int i, l;
-       qboolean allblankssofar;
-       const char *text;
+       int i;
        qfile_t *file;
-       char temp[MAX_INPUTLINE+2];
        if (Cmd_Argc() != 2)
        {
                Con_Printf("usage: condump <filename>\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));
                return;
        }
-       // iterate over the entire console history buffer line by line
-       allblankssofar = true;
-       for (i = 0;i < con_totallines;i++)
-       {
-               text = con_text + ((con_current + 1 + i) % con_totallines)*con_linewidth;
-               // count the used characters on this line
-               for (l = min(con_linewidth, (int)sizeof(temp));l > 0 && text[l-1] == ' ';l--);
-               // if not a blank line, begin output
-               if (l)
-                       allblankssofar = false;
-               // output the current line to the file
-               if (!allblankssofar)
-               {
-                       if (l)
-                               memcpy(temp, text, l);
-                       temp[l] = '\n';
-                       temp[l+1] = 0;
-                       FS_Print(file, temp);
-               }
+       for(i = 0; i < CON_LINES_COUNT; ++i)
+       {
+               FS_Write(file, CON_LINES(i).start, CON_LINES(i).len);
+               FS_Write(file, "\n", 1);
        }
        FS_Close(file);
 }
 
+void Con_Clear_f (void)
+{
+       ConBuffer_Clear(&con);
+}
+
 /*
 ================
 Con_Init
@@ -526,9 +736,8 @@ Con_Init
 */
 void Con_Init (void)
 {
-       memset (con_text, ' ', CON_TEXTSIZE);
        con_linewidth = 80;
-       con_totallines = CON_TEXTSIZE / con_linewidth;
+       ConBuffer_Init(&con, CON_TEXTSIZE, CON_MAXLINES, zonemempool);
 
        // Allocate a log queue, this will be freed after configs are parsed
        logq_size = MAX_INPUTLINE;
@@ -547,40 +756,45 @@ void Con_Init (void)
                Cvar_SetQuick (&log_file, "qconsole.log");
 
        // register our cvars
-       Cvar_RegisterVariable (&con_notifytime);
+       Cvar_RegisterVariable (&con_chat);
+       Cvar_RegisterVariable (&con_chatpos);
+       Cvar_RegisterVariable (&con_chatrect_x);
+       Cvar_RegisterVariable (&con_chatrect_y);
+       Cvar_RegisterVariable (&con_chatrect);
+       Cvar_RegisterVariable (&con_chatsize);
+       Cvar_RegisterVariable (&con_chattime);
+       Cvar_RegisterVariable (&con_chatwidth);
        Cvar_RegisterVariable (&con_notify);
+       Cvar_RegisterVariable (&con_notifyalign);
+       Cvar_RegisterVariable (&con_notifysize);
+       Cvar_RegisterVariable (&con_notifytime);
        Cvar_RegisterVariable (&con_textsize);
+       Cvar_RegisterVariable (&con_chatsound);
 
        // --blub
        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");
 }
 
-
-/*
-===============
-Con_Linefeed
-===============
-*/
-void Con_Linefeed (void)
+void Con_Shutdown (void)
 {
-       if (con_backscroll)
-               con_backscroll++;
-
-       con_x = 0;
-       con_current++;
-       memset (&con_text[(con_current%con_totallines)*con_linewidth], ' ', con_linewidth);
+       ConBuffer_Shutdown(&con);
 }
 
 /*
@@ -594,68 +808,50 @@ If no console is visible, the notify window will pop up.
 */
 void Con_PrintToHistory(const char *txt, int mask)
 {
-       int y, c, l;
-       static int cr;
-
-       while ( (c = *txt) )
-       {
-       // count word length
-               for (l=0 ; l< con_linewidth ; l++)
-                       if ( txt[l] <= ' ')
-                               break;
-
-       // word wrap
-               if (l != con_linewidth && (con_x + l > con_linewidth) )
-                       con_x = 0;
-
-               txt++;
+       // process:
+       //   \n goes to next line
+       //   \r deletes current line and makes a new one
 
-               if (cr)
-               {
-                       con_current--;
-                       cr = false;
-               }
+       static int cr_pending = 0;
+       static char buf[CON_TEXTSIZE];
+       static int bufpos = 0;
 
+       if(!con.text) // FIXME uses a non-abstracted property of con
+               return;
 
-               if (!con_x)
+       for(; *txt; ++txt)
+       {
+               if(cr_pending)
                {
-                       Con_Linefeed ();
-               // mark time for transparent overlay
-                       if (con_current >= 0)
-                       {
-                               if (con_notify.integer < 0)
-                                       Cvar_SetValueQuick(&con_notify, 0);
-                               if (con_notify.integer > MAX_NOTIFYLINES)
-                                       Cvar_SetValueQuick(&con_notify, MAX_NOTIFYLINES);
-                               if (con_notify.integer > 0)
-                                       con_times[con_current % con_notify.integer] = cl.time;
-                       }
+                       ConBuffer_DeleteLastLine(&con);
+                       cr_pending = 0;
                }
-
-               switch (c)
+               switch(*txt)
                {
-               case '\n':
-                       con_x = 0;
-                       break;
-
-               case '\r':
-                       con_x = 0;
-                       cr = 1;
-                       break;
-
-               default:        // display character and advance
-                       y = con_current % con_totallines;
-                       con_text[y*con_linewidth+con_x] = c | mask;
-                       con_x++;
-                       if (con_x >= con_linewidth)
-                               con_x = 0;
-                       break;
+                       case 0:
+                               break;
+                       case '\r':
+                               ConBuffer_AddLine(&con, buf, bufpos, mask);
+                               bufpos = 0;
+                               cr_pending = 1;
+                               break;
+                       case '\n':
+                               ConBuffer_AddLine(&con, buf, bufpos, mask);
+                               bufpos = 0;
+                               break;
+                       default:
+                               buf[bufpos++] = *txt;
+                               if(bufpos >= con.textsize - 1) // FIXME uses a non-abstracted property of con
+                               {
+                                       ConBuffer_AddLine(&con, buf, bufpos, mask);
+                                       bufpos = 0;
+                               }
+                               break;
                }
-
        }
 }
 
-/* The translation table between the graphical font and plain ASCII  --KB */
+/*! The translation table between the graphical font and plain ASCII  --KB */
 static char qfont_table[256] = {
        '\0', '#',  '#',  '#',  '#',  '.',  '#',  '#',
        '#',  9,    10,   '#',  ' ',  13,   '.',  '.',
@@ -692,14 +888,60 @@ static char qfont_table[256] = {
        'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
 };
 
+void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest, qboolean proquakeprotocol)
+{
+       rcon_redirect_sock = sock;
+       rcon_redirect_dest = dest;
+       rcon_redirect_proquakeprotocol = proquakeprotocol;
+       if (rcon_redirect_proquakeprotocol)
+       {
+               // reserve space for the packet header
+               rcon_redirect_buffer[0] = 0;
+               rcon_redirect_buffer[1] = 0;
+               rcon_redirect_buffer[2] = 0;
+               rcon_redirect_buffer[3] = 0;
+               // this is a reply to a CCREQ_RCON
+               rcon_redirect_buffer[4] = CCREP_RCON;
+       }
+       else
+               memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print
+       rcon_redirect_bufferpos = 5;
+}
+
+void Con_Rcon_Redirect_Flush(void)
+{
+       rcon_redirect_buffer[rcon_redirect_bufferpos] = 0;
+       if (rcon_redirect_proquakeprotocol)
+       {
+               // update the length in the packet header
+               StoreBigLong((unsigned char *)rcon_redirect_buffer, NETFLAG_CTL | (rcon_redirect_bufferpos & NETFLAG_LENGTH_MASK));
+       }
+       NetConn_Write(rcon_redirect_sock, rcon_redirect_buffer, rcon_redirect_bufferpos, rcon_redirect_dest);
+       memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print
+       rcon_redirect_bufferpos = 5;
+       rcon_redirect_proquakeprotocol = false;
+}
+
+void Con_Rcon_Redirect_End(void)
+{
+       Con_Rcon_Redirect_Flush();
+       rcon_redirect_dest = NULL;
+       rcon_redirect_sock = NULL;
+}
+
+void Con_Rcon_Redirect_Abort(void)
+{
+       rcon_redirect_dest = NULL;
+       rcon_redirect_sock = NULL;
+}
+
 /*
 ================
 Con_Rcon_AddChar
-
-Adds a character to the rcon buffer
 ================
 */
-void Con_Rcon_AddChar(char c)
+/// Adds a character to the rcon buffer.
+void Con_Rcon_AddChar(int c)
 {
        if(log_dest_buffer_appending)
                return;
@@ -708,8 +950,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)
@@ -724,17 +970,78 @@ 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
-
-Prints to all appropriate console targets, and adds timestamps
+Con_MaskPrint
 ================
 */
 extern cvar_t timestamps;
 extern cvar_t timeformat;
 extern qboolean sys_nostdout;
-void Con_Print(const char *msg)
+void Con_MaskPrint(int additionalmask, const char *msg)
 {
        static int mask = 0;
        static int index = 0;
@@ -743,6 +1050,8 @@ void Con_Print(const char *msg)
        for (;*msg;msg++)
        {
                Con_Rcon_AddChar(*msg);
+               if (index == 0)
+                       mask |= additionalmask;
                // if this is the beginning of a new line, print timestamp
                if (index == 0)
                {
@@ -759,10 +1068,24 @@ void Con_Print(const char *msg)
                                // play talk wav
                                if (*msg == 1)
                                {
-                                       if (msg[1] == '(' && cl.foundtalk2wav)
-                                               S_LocalSound ("sound/misc/talk2.wav");
-                                       else
-                                               S_LocalSound ("sound/misc/talk.wav");
+                                       if (con_chatsound.value)
+                                       {
+                                               if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC)
+                                               {
+                                                       if(msg[1] == '\r' && cl.foundtalk2wav)
+                                                               S_LocalSound ("sound/misc/talk2.wav");
+                                                       else
+                                                               S_LocalSound ("sound/misc/talk.wav");
+                                               }
+                                               else
+                                               {
+                                                       if (msg[1] == '(' && cl.foundtalk2wav)
+                                                               S_LocalSound ("sound/misc/talk2.wav");
+                                                       else
+                                                               S_LocalSound ("sound/misc/talk.wav");
+                                               }
+                                       }
+                                       mask = CON_MASK_CHAT;
                                }
                                line[index++] = STRING_COLOR_TAG;
                                line[index++] = '3';
@@ -785,7 +1108,10 @@ void Con_Print(const char *msg)
                        Log_ConPrint(line);
                        // send to scrollable buffer
                        if (con_initialized && cls.state != ca_dedicated)
+                       {
                                Con_PrintToHistory(line, mask);
+                               mask = 0;
+                       }
                        // send to terminal or dedicated server window
                        if (!sys_nostdout)
                        {
@@ -804,12 +1130,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;
@@ -909,6 +1255,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;
@@ -945,15 +1301,12 @@ void Con_Print(const char *msg)
        }
 }
 
-
 /*
 ================
-Con_Printf
-
-Prints to all appropriate console targets
+Con_MaskPrintf
 ================
 */
-void Con_Printf(const char *fmt, ...)
+void Con_MaskPrintf(int mask, const char *fmt, ...)
 {
        va_list argptr;
        char msg[MAX_INPUTLINE];
@@ -962,73 +1315,101 @@ void Con_Printf(const char *fmt, ...)
        dpvsnprintf(msg,sizeof(msg),fmt,argptr);
        va_end(argptr);
 
-       Con_Print(msg);
+       Con_MaskPrint(mask, msg);
 }
 
 /*
 ================
-Con_DPrint
-
-A Con_Print that only shows up if the "developer" cvar is set
+Con_Print
 ================
 */
-void Con_DPrint(const char *msg)
+void Con_Print(const char *msg)
 {
-       if (!developer.integer)
-               return;                 // don't confuse non-developers with techie stuff...
-       Con_Print(msg);
+       Con_MaskPrint(CON_MASK_PRINT, msg);
 }
 
 /*
 ================
-Con_DPrintf
-
-A Con_Printf that only shows up if the "developer" cvar is set
+Con_Printf
 ================
 */
-void Con_DPrintf(const char *fmt, ...)
+void Con_Printf(const char *fmt, ...)
 {
        va_list argptr;
        char msg[MAX_INPUTLINE];
 
-       if (!developer.integer)
-               return;                 // don't confuse non-developers with techie stuff...
-
        va_start(argptr,fmt);
        dpvsnprintf(msg,sizeof(msg),fmt,argptr);
        va_end(argptr);
 
-       Con_Print(msg);
+       Con_MaskPrint(CON_MASK_PRINT, msg);
 }
 
-
-/*
-==============================================================================
-
-DRAWING
-
-==============================================================================
-*/
-
 /*
 ================
-Con_DrawInput
+Con_DPrint
+================
+*/
+void Con_DPrint(const char *msg)
+{
+       if(developer.integer < 0) // at 0, we still add to the buffer but hide
+               return;
+
+       Con_MaskPrint(CON_MASK_DEVELOPER, msg);
+}
+
+/*
+================
+Con_DPrintf
+================
+*/
+void Con_DPrintf(const char *fmt, ...)
+{
+       va_list argptr;
+       char msg[MAX_INPUTLINE];
+
+       if(developer.integer < 0) // at 0, we still add to the buffer but hide
+               return;
+
+       va_start(argptr,fmt);
+       dpvsnprintf(msg,sizeof(msg),fmt,argptr);
+       va_end(argptr);
+
+       Con_MaskPrint(CON_MASK_DEVELOPER, msg);
+}
+
+
+/*
+==============================================================================
+
+DRAWING
+
+==============================================================================
+*/
+
+/*
+================
+Con_DrawInput
 
 The input line scrolls horizontally if typing goes beyond the right edge
 
 Modified by EvilTypeGuy eviltypeguy@qeradiant.com
 ================
 */
+extern cvar_t r_font_disable_freetype;
 void Con_DrawInput (void)
 {
        int             y;
        int             i;
        char editlinecopy[MAX_INPUTLINE+1], *text;
+       float x, xo;
+       size_t len_out;
+       int col_out;
 
        if (!key_consoleactive)
                return;         // don't draw anything
 
-       strlcpy(editlinecopy, key_lines[edit_line], sizeof(editlinecopy));
+       strlcpy(editlinecopy, key_line, sizeof(editlinecopy));
        text = editlinecopy;
 
        // Advanced Console Editing by Radix radix@planetquake.com
@@ -1038,27 +1419,214 @@ void Con_DrawInput (void)
 
        y = (int)strlen(text);
 
-// fill out remainder with spaces
-       for (i = y; i < (int)sizeof(editlinecopy)-1; i++)
-               text[i] = ' ';
+       // append enoug nul-bytes to cover the utf8-versions of the cursor too
+       for (i = y; i < y + 4 && i < (int)sizeof(editlinecopy); ++i)
+               text[i] = 0;
 
        // add the cursor frame
-       if ((int)(realtime*con_cursorspeed) & 1)                // cursor is visible
-               text[key_linepos] = 11 + 130 * key_insert;      // either solid or triangle facing right
+       if (r_font_disable_freetype.integer)
+       {
+               // this code is freetype incompatible!
+               if ((int)(realtime*con_cursorspeed) & 1)                // cursor is visible
+               {
+                       if (!utf8_enable.integer)
+                               text[key_linepos] = 11 + 130 * key_insert;      // either solid or triangle facing right
+                       else if (y + 3 < (int)sizeof(editlinecopy)-1)
+                       {
+                               int ofs = u8_bytelen(text + key_linepos, 1);
+                               size_t len;
+                               const char *curbuf;
+                               curbuf = u8_encodech(0xE000 + 11 + 130 * key_insert, &len);
+
+                               if (curbuf)
+                               {
+                                       memmove(text + key_linepos + len, text + key_linepos + ofs, sizeof(editlinecopy) - key_linepos - len);
+                                       memcpy(text + key_linepos, curbuf, len);
+                               }
+                       } else
+                               text[key_linepos] = '-' + ('+' - '-') * key_insert;
+               }
+       }
 
 //     text[key_linepos + 1] = 0;
 
-       // prestep if horizontally scrolling
-       if (key_linepos >= con_linewidth)
-               text += 1 + key_linepos - con_linewidth;
+       len_out = key_linepos;
+       col_out = -1;
+       xo = DrawQ_TextWidth_UntilWidth_TrackColors(text, &len_out, con_textsize.value, con_textsize.value, &col_out, false, FONT_CONSOLE, 1000000000);
+       x = vid_conwidth.value * 0.95 - xo; // scroll
+       if(x >= 0)
+               x = 0;
 
        // draw it
-       DrawQ_String(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, false );
+       DrawQ_String(x, con_vislines - con_textsize.value*2, text, y + 3, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, FONT_CONSOLE );
+
+       // add a cursor on top of this (when using freetype)
+       if (!r_font_disable_freetype.integer)
+       {
+               if ((int)(realtime*con_cursorspeed) & 1)                // cursor is visible
+               {
+                       if (!utf8_enable.integer)
+                       {
+                               text[0] = 11 + 130 * key_insert;        // either solid or triangle facing right
+                               text[1] = 0;
+                       }
+                       else
+                       {
+                               size_t len;
+                               const char *curbuf;
+                               curbuf = u8_encodech(0xE000 + 11 + 130 * key_insert, &len);
+                               memcpy(text, curbuf, len);
+                               text[len] = 0;
+                       }
+                       DrawQ_String(x + xo, con_vislines - con_textsize.value*2, text, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &col_out, false, FONT_CONSOLE);
+               }
+       }
 
        // remove cursor
-//     key_lines[edit_line][key_linepos] = 0;
+//     key_line[key_linepos] = 0;
+}
+
+typedef struct
+{
+       dp_font_t *font;
+       float alignment; // 0 = left, 0.5 = center, 1 = right
+       float fontsize;
+       float x;
+       float y;
+       float width;
+       float ymin, ymax;
+       const char *continuationString;
+
+       // PRIVATE:
+       int colorindex; // init to -1
+}
+con_text_info_t;
+
+float Con_WordWidthFunc(void *passthrough, const char *w, size_t *length, float maxWidth)
+{
+       con_text_info_t *ti = (con_text_info_t *) passthrough;
+       if(w == NULL)
+       {
+               ti->colorindex = -1;
+               return ti->fontsize * ti->font->maxwidth;
+       }
+       if(maxWidth >= 0)
+               return DrawQ_TextWidth_UntilWidth(w, length, ti->fontsize, ti->fontsize, false, ti->font, -maxWidth); // -maxWidth: we want at least one char
+       else if(maxWidth == -1)
+               return DrawQ_TextWidth(w, *length, ti->fontsize, ti->fontsize, false, ti->font);
+       else
+       {
+               printf("Con_WordWidthFunc: can't get here (maxWidth should never be %f)\n", maxWidth);
+               // Note: this is NOT a Con_Printf, as it could print recursively
+               return 0;
+       }
+}
+
+int Con_CountLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation)
+{
+       (void) passthrough;
+       (void) line;
+       (void) length;
+       (void) width;
+       (void) isContinuation;
+       return 1;
 }
 
+int Con_DisplayLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation)
+{
+       con_text_info_t *ti = (con_text_info_t *) passthrough;
+
+       if(ti->y < ti->ymin - 0.001)
+               (void) 0;
+       else if(ti->y > ti->ymax - ti->fontsize + 0.001)
+               (void) 0;
+       else
+       {
+               int x = (int) (ti->x + (ti->width - width) * ti->alignment);
+               if(isContinuation && *ti->continuationString)
+                       x = (int) DrawQ_String(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(x, ti->y, line, length, ti->fontsize, ti->fontsize, 1.0, 1.0, 1.0, 1.0, 0, &(ti->colorindex), false, ti->font);
+       }
+
+       ti->y += ti->fontsize;
+       return 1;
+}
+
+int Con_DrawNotifyRect(int mask_must, int mask_mustnot, float maxage, float x, float y, float width, float height, float fontsize, float alignment_x, float alignment_y, const char *continuationString)
+{
+       int i;
+       int lines = 0;
+       int maxlines = (int) floor(height / fontsize + 0.01f);
+       int startidx;
+       int nskip = 0;
+       int continuationWidth = 0;
+       size_t l;
+       double t = cl.time; // saved so it won't change
+       con_text_info_t ti;
+
+       ti.font = (mask_must & CON_MASK_CHAT) ? FONT_CHAT : FONT_NOTIFY;
+       ti.fontsize = fontsize;
+       ti.alignment = alignment_x;
+       ti.width = width;
+       ti.ymin = y;
+       ti.ymax = y + height;
+       ti.continuationString = continuationString;
+
+       l = 0;
+       Con_WordWidthFunc(&ti, NULL, &l, -1);
+       l = strlen(continuationString);
+       continuationWidth = (int) Con_WordWidthFunc(&ti, continuationString, &l, -1);
+
+       // first find the first line to draw by backwards iterating and word wrapping to find their length...
+       startidx = CON_LINES_COUNT;
+       for(i = CON_LINES_COUNT - 1; i >= 0; --i)
+       {
+               con_lineinfo_t *l = &CON_LINES(i);
+               int mylines;
+
+               if((l->mask & mask_must) != mask_must)
+                       continue;
+               if(l->mask & mask_mustnot)
+                       continue;
+               if(maxage && (l->addtime < t - maxage))
+                       continue;
+
+               // WE FOUND ONE!
+               // Calculate its actual height...
+               mylines = COM_Wordwrap(l->start, l->len, continuationWidth, width, Con_WordWidthFunc, &ti, Con_CountLineFunc, &ti);
+               if(lines + mylines >= maxlines)
+               {
+                       nskip = lines + mylines - maxlines;
+                       lines = maxlines;
+                       startidx = i;
+                       break;
+               }
+               lines += mylines;
+               startidx = i;
+       }
+
+       // then center according to the calculated amount of lines...
+       ti.x = x;
+       ti.y = y + alignment_y * (height - lines * fontsize) - nskip * fontsize;
+
+       // then actually draw
+       for(i = startidx; i < CON_LINES_COUNT; ++i)
+       {
+               con_lineinfo_t *l = &CON_LINES(i);
+
+               if((l->mask & mask_must) != mask_must)
+                       continue;
+               if(l->mask & mask_mustnot)
+                       continue;
+               if(maxage && (l->addtime < t - maxage))
+                       continue;
+
+               COM_Wordwrap(l->start, l->len, continuationWidth, width, Con_WordWidthFunc, &ti, Con_DisplayLineFunc, &ti);
+       }
+
+       return lines;
+}
 
 /*
 ================
@@ -1069,88 +1637,200 @@ Draws the last few lines of output transparently over the game top
 */
 void Con_DrawNotify (void)
 {
-       float   x, v;
-       char    *text;
-       int             i, stop;
-       float   time;
+       float   x, v, xr;
+       float chatstart, notifystart, inputsize, height;
+       float align;
        char    temptext[MAX_INPUTLINE];
-       int colorindex = -1; //-1 for default
+       int numChatlines;
+       int chatpos;
+
+       ConBuffer_FixTimes(&con);
+
+       numChatlines = con_chat.integer;
+
+       chatpos = con_chatpos.integer;
 
        if (con_notify.integer < 0)
                Cvar_SetValueQuick(&con_notify, 0);
-       if (con_notify.integer > MAX_NOTIFYLINES)
-               Cvar_SetValueQuick(&con_notify, MAX_NOTIFYLINES);
        if (gamemode == GAME_TRANSFUSION)
-               v = 8;
+               v = 8; // vertical offset
        else
                v = 0;
-       // make a copy of con_current here so that we can't get in a runaway loop printing new messages while drawing the notify text
-       stop = con_current;
-       for (i= stop-con_notify.integer+1 ; i<=stop ; i++)
-       {
 
-               if (i < 0)
-                       continue;
-               time = con_times[i % con_notify.integer];
-               if (time == 0)
-                       continue;
-               time = cl.time - time;
-               if (time > con_notifytime.value)
-                       continue;
-               text = con_text + (i % con_totallines)*con_linewidth;
-
-               if (gamemode == GAME_NEXUIZ) {
-                       int chars = 0;
-                       int finalchars = 0;
-                       int j;
+       // GAME_NEXUIZ: center, otherwise left justify
+       align = con_notifyalign.value;
+       if(!*con_notifyalign.string) // empty string, evaluated to 0 above
+       {
+               if(gamemode == GAME_NEXUIZ)
+                       align = 0.5;
+       }
 
-                       // count up to the last non-whitespace, and ignore color codes
-                       for (j = 0;j < con_linewidth && text[j];j++)
-                       {
-                               if (text[j] == STRING_COLOR_TAG && (text[j+1] >= '0' && text[j+1] <= '9'))
-                               {
-                                       j++;
-                                       continue;
-                               }
-                               chars++;
-                               if (text[j] == ' ')
-                                       continue;
-                               finalchars = chars;
-                       }
-                       // center the line using the calculated width
-                       x = (vid_conwidth.integer - finalchars * con_textsize.value) * 0.5;
-               } else
-                       x = 0;
+       if(numChatlines || !con_chatrect.integer)
+       {
+               if(chatpos == 0)
+               {
+                       // first chat, input line, then notify
+                       chatstart = v;
+                       notifystart = v + (numChatlines + 1) * con_chatsize.value;
+               }
+               else if(chatpos > 0)
+               {
+                       // first notify, then (chatpos-1) empty lines, then chat, then input
+                       notifystart = v;
+                       chatstart = v + (con_notify.value + (chatpos - 1)) * con_notifysize.value;
+               }
+               else // if(chatpos < 0)
+               {
+                       // first notify, then much space, then chat, then input, then -chatpos-1 empty lines
+                       notifystart = v;
+                       chatstart = vid_conheight.value - (-chatpos-1 + numChatlines + 1) * con_chatsize.value;
+               }
+       }
+       else
+       {
+               // just notify and input
+               notifystart = v;
+               chatstart = 0; // shut off gcc warning
+       }
 
-               DrawQ_String( x, v, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false );
+       v = notifystart + con_notifysize.value * Con_DrawNotifyRect(0, CON_MASK_INPUT | CON_MASK_HIDENOTIFY | (numChatlines ? CON_MASK_CHAT : 0) | CON_MASK_DEVELOPER, con_notifytime.value, 0, notifystart, vid_conwidth.value, con_notify.value * con_notifysize.value, con_notifysize.value, align, 0.0, "");
 
-               v += con_textsize.value;
+       if(con_chatrect.integer)
+       {
+               x = con_chatrect_x.value * vid_conwidth.value;
+               v = con_chatrect_y.value * vid_conheight.value;
        }
+       else
+       {
+               x = 0;
+               if(numChatlines) // only do this if chat area is enabled, or this would move the input line wrong
+                       v = chatstart;
+       }
+       height = numChatlines * con_chatsize.value;
 
-
+       if(numChatlines)
+       {
+               Con_DrawNotifyRect(CON_MASK_CHAT, CON_MASK_INPUT, con_chattime.value, x, v, vid_conwidth.value * con_chatwidth.value, height, con_chatsize.value, 0.0, 1.0, (utf8_enable.integer ? "^3\xee\x80\x8c\xee\x80\x8c\xee\x80\x8c " : "^3\014\014\014 ")); // 015 is ยท> character in conchars.tga
+               v += height;
+       }
        if (key_dest == key_message)
        {
+               //static char *cursor[2] = { "\xee\x80\x8a", "\xee\x80\x8b" }; // { off, on }
                int colorindex = -1;
-
-               x = 0;
+               const char *cursor;
+               cursor = u8_encodech(0xE00A + ((int)(realtime * con_cursorspeed)&1), NULL);
 
                // 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%s", chat_buffer, cursor);
+               else if(chat_mode)
+                       dpsnprintf(temptext, sizeof(temptext), "say_team:%s%s", chat_buffer, cursor);
                else
-                       sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1));
-               while ((int)strlen(temptext) >= con_linewidth)
-               {
-                       DrawQ_String( 0, v, temptext, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false );
-                       strlcpy(temptext, &temptext[con_linewidth], sizeof(temptext));
-                       v += con_textsize.value;
-               }
-               if (strlen(temptext) > 0)
+                       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_LineHeight
+
+Returns the height of a given console line; calculates it if necessary.
+================
+*/
+int Con_LineHeight(int lineno)
+{
+       con_lineinfo_t *li = &CON_LINES(lineno);
+       if(li->height == -1)
+       {
+               float width = vid_conwidth.value;
+               con_text_info_t ti;
+               con_lineinfo_t *li = &CON_LINES(lineno);
+               ti.fontsize = con_textsize.value;
+               ti.font = FONT_CONSOLE;
+               li->height = COM_Wordwrap(li->start, li->len, 0, width, Con_WordWidthFunc, &ti, Con_CountLineFunc, NULL);
+       }
+       return li->height;
+}
+
+/*
+================
+Con_DrawConsoleLine
+
+Draws a line of the console; returns its height in lines.
+If alpha is 0, the line is not drawn, but still wrapped and its height
+returned.
+================
+*/
+int Con_DrawConsoleLine(int mask_must, int mask_mustnot, float y, int lineno, float ymin, float ymax)
+{
+       float width = vid_conwidth.value;
+       con_text_info_t ti;
+       con_lineinfo_t *li = &CON_LINES(lineno);
+
+       if((li->mask & mask_must) != mask_must)
+               return 0;
+       if((li->mask & mask_mustnot) != 0)
+               return 0;
+
+       ti.continuationString = "";
+       ti.alignment = 0;
+       ti.fontsize = con_textsize.value;
+       ti.font = FONT_CONSOLE;
+       ti.x = 0;
+       ti.y = y - (Con_LineHeight(lineno) - 1) * ti.fontsize;
+       ti.ymin = ymin;
+       ti.ymax = ymax;
+       ti.width = width;
+
+       return COM_Wordwrap(li->start, li->len, 0, width, Con_WordWidthFunc, &ti, Con_DisplayLineFunc, &ti);
+}
+
+/*
+================
+Con_LastVisibleLine
+
+Calculates the last visible line index and how much to show of it based on
+con_backscroll.
+================
+*/
+static void Con_LastVisibleLine(int mask_must, int mask_mustnot, int *last, int *limitlast)
+{
+       int lines_seen = 0;
+       int i;
+
+       if(con_backscroll < 0)
+               con_backscroll = 0;
+
+       *last = 0;
+
+       // now count until we saw con_backscroll actual lines
+       for(i = CON_LINES_COUNT - 1; i >= 0; --i)
+       if((CON_LINES(i).mask & mask_must) == mask_must)
+       if((CON_LINES(i).mask & mask_mustnot) == 0)
+       {
+               int h = Con_LineHeight(i);
+
+               // line is the last visible line?
+               *last = i;
+               if(lines_seen + h > con_backscroll && lines_seen <= con_backscroll)
                {
-                       DrawQ_String( 0, v, temptext, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false );
-                       v += con_textsize.value;
+                       *limitlast = lines_seen + h - con_backscroll;
+                       return;
                }
+
+               lines_seen += h;
        }
+
+       // if we get here, no line was on screen - scroll so that one line is
+       // visible then.
+       con_backscroll = lines_seen - 1;
+       *limitlast = 1;
 }
 
 /*
@@ -1163,36 +1843,121 @@ The typing input line at the bottom should only be drawn if typing is allowed
 */
 void Con_DrawConsole (int lines)
 {
-       int i, rows, j, stop;
-       float y;
-       char *text;
-       int colorindex = -1;
+       float alpha, alpha0;
+       double sx, sy;
+       int mask_must = 0;
+       int mask_mustnot = (developer.integer>0) ? 0 : CON_MASK_DEVELOPER;
+       cachepic_t *conbackpic;
 
        if (lines <= 0)
                return;
 
-// 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, 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, NULL, true);
+       if (con_backscroll < 0)
+               con_backscroll = 0;
 
-// draw the text
        con_vislines = lines;
 
-       rows = (int)ceil((lines/con_textsize.value)-2);         // rows of text to draw
-       y = lines - (rows+2)*con_textsize.value;        // may start slightly negative
+       r_draw2d_force = true;
 
-       // make a copy of con_current here so that we can't get in a runaway loop printing new messages while drawing the notify text
-       stop = con_current;
-       for (i = stop - rows + 1;i <= stop;i++, y += con_textsize.value)
+// draw the background
+       alpha0 = cls.signon == SIGNONS ? scr_conalpha.value : 1.0f; // always full alpha when not in game
+       if((alpha = alpha0 * scr_conalphafactor.value) > 0)
        {
-               j = max(i - con_backscroll, 0);
-               text = con_text + (j % con_totallines)*con_linewidth;
+               sx = scr_conscroll_x.value;
+               sy = scr_conscroll_y.value;
+               conbackpic = scr_conbrightness.value >= 0.01f ? Draw_CachePic_Flags("gfx/conback", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0) : NULL;
+               sx *= realtime; sy *= realtime;
+               sx -= floor(sx); sy -= floor(sy);
+               if (conbackpic && conbackpic->tex != r_texture_notexture)
+                       DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer,
+                                       0 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+                                       1 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+                                       0 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+                                       1 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+                                       0);
+               else
+                       DrawQ_Fill(0, lines - vid_conheight.integer, vid_conwidth.integer, vid_conheight.integer, 0.0f, 0.0f, 0.0f, alpha, 0);
+       }
+       if((alpha = alpha0 * scr_conalpha2factor.value) > 0)
+       {
+               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 -= floor(sx); sy -= floor(sy);
+               if(conbackpic && conbackpic->tex != r_texture_notexture)
+                       DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer,
+                                       0 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+                                       1 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+                                       0 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+                                       1 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+                                       0);
+       }
+       if((alpha = alpha0 * scr_conalpha3factor.value) > 0)
+       {
+               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 -= floor(sx); sy -= floor(sy);
+               if(conbackpic && conbackpic->tex != r_texture_notexture)
+                       DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer,
+                                       0 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+                                       1 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+                                       0 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+                                       1 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+                                       0);
+       }
+       DrawQ_String(vid_conwidth.integer - DrawQ_TextWidth(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_String( 0, y, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false );
+// draw the text
+#if 0
+       {
+               int i;
+               int count = CON_LINES_COUNT;
+               float ymax = con_vislines - 2 * con_textsize.value;
+               float y = ymax + con_textsize.value * con_backscroll;
+               for (i = 0;i < count && y >= 0;i++)
+                       y -= Con_DrawConsoleLine(mask_must, mask_mustnot, y - con_textsize.value, CON_LINES_COUNT - 1 - i, 0, ymax) * con_textsize.value;
+               // fix any excessive scrollback for the next frame
+               if (i >= count && y >= 0)
+               {
+                       con_backscroll -= (int)(y / con_textsize.value);
+                       if (con_backscroll < 0)
+                               con_backscroll = 0;
+               }
        }
+#else
+       if(CON_LINES_COUNT > 0)
+       {
+               int i, last, limitlast;
+               float y;
+               float ymax = con_vislines - 2 * con_textsize.value;
+               Con_LastVisibleLine(mask_must, mask_mustnot, &last, &limitlast);
+               //Con_LastVisibleLine(mask_must, mask_mustnot, &last, &limitlast);
+               y = ymax - con_textsize.value;
+
+               if(limitlast)
+                       y += (CON_LINES(last).height - limitlast) * con_textsize.value;
+               i = last;
+
+               for(;;)
+               {
+                       y -= Con_DrawConsoleLine(mask_must, mask_mustnot, y, i, 0, ymax) * con_textsize.value;
+                       if(i == 0)
+                               break; // top of console buffer
+                       if(y < 0)
+                               break; // top of console window
+                       limitlast = 0;
+                       --i;
+               }
+       }
+#endif
 
 // draw the input prompt, user text, and cursor if desired
        Con_DrawInput ();
+
+       r_draw2d_force = false;
 }
 
 /*
@@ -1203,19 +1968,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;
@@ -1244,7 +2009,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);
@@ -1265,17 +2030,7 @@ 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)
+                       else if((p = BuffLittleLong(buf)) == BSPVERSION || p == 30)
                        {
                                dheader_t *header = (dheader_t *)buf;
                                lumpofs = LittleLong(header->lumps[LUMP_ENTITIES].fileofs);
@@ -1308,14 +2063,14 @@ 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))
                                                break;
-                                       if (developer.integer >= 100)
-                                               Con_Printf("key: %s %s\n", keyname, com_token);
+                                       if (developer_extra.integer)
+                                               Con_DPrintf("key: %s %s\n", keyname, com_token);
                                        if (!strcmp(keyname, "message"))
                                        {
                                                // get the message contents
@@ -1335,7 +2090,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;
                }
@@ -1402,11 +2156,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)
@@ -1419,18 +2172,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;
@@ -1438,7 +2206,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
@@ -1483,15 +2250,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
@@ -1520,42 +2287,42 @@ 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];
        int i, p;
-       int length;
        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
+
+               while(spos >= 0)
                {
                        if(spos > 0 && line[spos-1] != ' ' && line[spos-1] != ';' && line[spos-1] != '\"' && line[spos-1] != '\'')
                        {
@@ -1583,7 +2350,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]);
 
@@ -1610,7 +2377,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]))
                        {
@@ -1645,7 +2412,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)
        {
@@ -1657,7 +2424,7 @@ void Nicks_CutMatchesAlphaNumeric(int count)
                }
        }
        tempstr[l] = 0;
-       
+
        for(i = 1; i < count; ++i)
        {
                a = tempstr;
@@ -1703,7 +2470,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)
        {
@@ -1713,7 +2480,7 @@ void Nicks_CutMatchesNoSpaces(int count)
                }
        }
        tempstr[l] = 0;
-       
+
        for(i = 1; i < count; ++i)
        {
                a = tempstr;
@@ -1773,40 +2540,73 @@ 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 && buffer[pos-2] == STRING_COLOR_TAG && buffer[pos-1] >= '0' && buffer[pos-1] <= '9') // when thes use &4
-                       pos -= 2;
+               if(!quote_added)
+               {
+                       if( pos >= 2 && 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
+                                        && isxdigit(buffer[pos-3]) && isxdigit(buffer[pos-2]) && isxdigit(buffer[pos-1]) )
+                               pos -= 5;
+               }
                buffer[pos++] = STRING_COLOR_TAG;
-               buffer[pos++] = color;
+               if (color == -1)
+               {
+                       buffer[pos++] = STRING_COLOR_RGB_TAG_CHAR;
+                       buffer[pos++] = r;
+                       buffer[pos++] = g;
+                       buffer[pos++] = b;
+               }
+               else
+                       buffer[pos++] = color;
        }
        return pos;
 }
@@ -1821,11 +2621,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;
@@ -1834,7 +2634,7 @@ int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos)
        {
                int len;
                char *msg;
-               Con_Printf("\n%i possible nick%s\n", n, (n > 1) ? "s: " : ":");
+               Con_Printf("\n%i possible nicks:\n", n);
                Cmd_CompleteNicksPrint(n);
 
                Nicks_CutMatches(n);
@@ -1866,50 +2666,199 @@ 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)
        {
-               k = key_lines[edit_line][pos];
+               k = key_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
+       s = key_line + pos;
+       strlcpy(s2, key_line + key_linepos, sizeof(s2));        //save chars after cursor
+       key_line[key_linepos] = 0;                                      //hide them
+
+       space = strchr(key_line + 1, ' ');
+       if(space && pos == (space - key_line) + 1)
+       {
+               strlcpy(command, key_line + 1, min(sizeof(command), (unsigned int)(space - key_line)));
 
-       //maps search
-       for(k=pos-1;k>2;k--)
-               if(key_lines[edit_line][k] != ' ')
+               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_line, t, MAX_INPUTLINE);
+                               strlcat(key_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);
+                       }
+                       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 <TAB>
+                               //
+                               // 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);
 
                                        // 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
+                                       strlcat(key_line, t, MAX_INPUTLINE);
+                                       strlcat(key_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]);
+                                       if(key_linepos > (int) strlen(key_line))
+                                               key_linepos = (int) strlen(key_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);
@@ -1927,10 +2876,10 @@ void Con_CompleteCommandLine (void)
        a = Cmd_CompleteAliasCountPossible(s);
        if (a)
        {
-               Con_Printf("\n%i possible aliases%s\n", a, (a > 1) ? "s: " : ":");
+               Con_Printf("\n%i possible alias%s\n", a, (a > 1) ? "es: " : ":");
                Cmd_CompleteAliasPrint(s);
        }
-       n = Nicks_CompleteCountPossible(key_lines[edit_line], key_linepos, s, true);
+       n = Nicks_CompleteCountPossible(key_line, key_linepos, s, true);
        if (n)
        {
                Con_Printf("\n%i possible nick%s\n", n, (n > 1) ? "s: " : ":");
@@ -1938,9 +2887,9 @@ 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);
+                       strlcpy(&key_line[key_linepos], s2, sizeof(key_line) - key_linepos);
                return;
        }
 
@@ -1952,7 +2901,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;
@@ -1972,33 +2921,33 @@ void Con_CompleteCommandLine (void)
 done:
 
        // 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);
+       cmd_len = min(cmd_len, (int)sizeof(key_line) - 1 - pos);
        if (cmd)
        {
                key_linepos = pos;
-               memcpy(&key_lines[edit_line][key_linepos], cmd, cmd_len);
+               memcpy(&key_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 + n == 1 && key_linepos < (int)sizeof(key_lines[edit_line]) - 1)
+               if (c + v + a + n == 1 && key_linepos < (int)sizeof(key_line) - 1)
                {
                        if(n)
                        { // was a nick, might have an offset, and needs colors ;) --blub
                                key_linepos = pos - Nicks_offset[0];
                                cmd_len = strlen(Nicks_list[0]);
-                               cmd_len = min(cmd_len, (int)sizeof(key_lines[edit_line]) - 3 - pos);
+                               cmd_len = min(cmd_len, (int)sizeof(key_line) - 3 - pos);
 
-                               memcpy(&key_lines[edit_line][key_linepos] , Nicks_list[0], cmd_len);
+                               memcpy(&key_line[key_linepos] , Nicks_list[0], cmd_len);
                                key_linepos += cmd_len;
-                               if(key_linepos < (int)(sizeof(key_lines[edit_line])-4)) // space for ^, X and space and \0
-                                       key_linepos = Nicks_AddLastColor(key_lines[edit_line], key_linepos);
+                               if(key_linepos < (int)(sizeof(key_line)-4)) // space for ^, X and space and \0
+                                       key_linepos = Nicks_AddLastColor(key_line, key_linepos);
                        }
-                       key_lines[edit_line][key_linepos++] = ' ';
+                       key_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]));
+       key_line[key_linepos] = 0;
+       strlcat(key_line, s2, sizeof(key_line));
 
        // free the command, cvar, and alias lists
        for (i = 0; i < 4; i++)