X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=console.c;h=14175b07ad4c37cd84ea4e0202c438c43365c098;hb=05b7bef22279c4ba7bc7ce200d68ca1e22cbc167;hp=a20486c4641b0b61e01e3a0494b11bafa206eea9;hpb=5f5a4cb2641ad72d38bb21e55bc375f86af7b2fb;p=xonotic%2Fdarkplaces.git

diff --git a/console.c b/console.c
index a20486c4..14175b07 100644
--- a/console.c
+++ b/console.c
@@ -19,13 +19,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // console.c
 
-#include "quakedef.h"
-
 #if !defined(WIN32) || defined(__MINGW32__)
 # include <unistd.h>
 #endif
 #include <time.h>
 
+#include "quakedef.h"
+#include "thread.h"
+
 // for u8_encodech
 #include "ft2.h"
 
@@ -35,6 +36,7 @@ float con_cursorspeed = 4;
 int con_backscroll;
 
 conbuffer_t con;
+void *con_mutex = NULL;
 
 #define CON_LINES(i) CONBUFFER_LINES(&con, i)
 #define CON_LINES_LAST CONBUFFER_LINES_LAST(&con)
@@ -47,6 +49,9 @@ cvar_t con_notifyalign = {CVAR_SAVE, "con_notifyalign", "", "how to align notify
 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"};
@@ -90,6 +95,7 @@ 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
 
@@ -122,8 +128,10 @@ ConBuffer_Shutdown
 void ConBuffer_Shutdown(conbuffer_t *buf)
 {
 	buf->active = false;
-	Mem_Free(buf->text);
-	Mem_Free(buf->lines);
+	if (buf->text)
+		Mem_Free(buf->text);
+	if (buf->lines)
+		Mem_Free(buf->lines);
 	buf->text = NULL;
 	buf->lines = NULL;
 }
@@ -281,27 +289,9 @@ int ConBuffer_FindPrevLine(conbuffer_t *buf, int mask_must, int mask_mustnot, in
 	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];
+	static char copybuf[MAX_INPUTLINE]; // client only
 	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);
@@ -332,23 +322,13 @@ size_t logq_size = 0;
 
 void Log_ConPrint (const char *msg);
 //@}
-/*
-====================
-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;
 }
 
-/*
-====================
-Log_DestBuffer_Flush
-====================
-*/
-void Log_DestBuffer_Flush(void)
+static void Log_DestBuffer_Flush_NoLock(void)
 {
 	lhnetaddress_t log_dest_addr;
 	lhnetsocket_t *log_dest_socket;
@@ -384,12 +364,21 @@ void Log_DestBuffer_Flush(void)
 
 /*
 ====================
-Log_Timestamp
+Log_DestBuffer_Flush
 ====================
 */
-const char* Log_Timestamp (const char *desc)
+void Log_DestBuffer_Flush(void)
 {
-	static char timestamp [128];
+	if (con_mutex)
+		Thread_LockMutex(con_mutex);
+	Log_DestBuffer_Flush_NoLock();
+	if (con_mutex)
+		Thread_UnlockMutex(con_mutex);
+}
+
+static const char* Log_Timestamp (const char *desc)
+{
+	static char timestamp [128]; // init/shutdown only
 	time_t crt_time;
 #if _MSC_VER >= 1400
 	struct tm crt_tm;
@@ -416,13 +405,7 @@ const char* Log_Timestamp (const char *desc)
 	return timestamp;
 }
 
-
-/*
-====================
-Log_Open
-====================
-*/
-void Log_Open (void)
+static void Log_Open (void)
 {
 	if (logfile != NULL || log_file.string[0] == '\0')
 		return;
@@ -435,7 +418,6 @@ void Log_Open (void)
 	}
 }
 
-
 /*
 ====================
 Log_Close
@@ -484,7 +466,7 @@ void Log_Start (void)
 					n = min(sizeof(log_dest_buffer) - log_dest_buffer_pos - 1, logq_ind - pos);
 					memcpy(log_dest_buffer + log_dest_buffer_pos, temp + pos, n);
 					log_dest_buffer_pos += n;
-					Log_DestBuffer_Flush();
+					Log_DestBuffer_Flush_NoLock();
 					pos += n;
 				}
 			}
@@ -590,6 +572,10 @@ Con_ToggleConsole_f
 */
 void Con_ToggleConsole_f (void)
 {
+	if (COM_CheckParm ("-noconsole"))
+		if (!(key_consoleactive & KEY_CONSOLEACTIVE_USER))
+			return; // only allow the key bind to turn off console
+
 	// toggle the 'user wants console' bit
 	key_consoleactive ^= KEY_CONSOLEACTIVE_USER;
 	Con_ClearNotify();
@@ -613,12 +599,15 @@ void Con_ClearNotify (void)
 Con_MessageMode_f
 ================
 */
-void Con_MessageMode_f (void)
+static void Con_MessageMode_f (void)
 {
 	key_dest = key_message;
 	chat_mode = 0; // "say"
-	chat_bufferlen = 0;
-	chat_buffer[0] = 0;
+	if(Cmd_Argc() > 1)
+	{
+		dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args());
+		chat_bufferlen = strlen(chat_buffer);
+	}
 }
 
 
@@ -627,12 +616,15 @@ void Con_MessageMode_f (void)
 Con_MessageMode2_f
 ================
 */
-void Con_MessageMode2_f (void)
+static void Con_MessageMode2_f (void)
 {
 	key_dest = key_message;
 	chat_mode = 1; // "say_team"
-	chat_bufferlen = 0;
-	chat_buffer[0] = 0;
+	if(Cmd_Argc() > 1)
+	{
+		dpsnprintf(chat_buffer, sizeof(chat_buffer), "%s ", Cmd_Args());
+		chat_bufferlen = strlen(chat_buffer);
+	}
 }
 
 /*
@@ -640,7 +632,7 @@ void Con_MessageMode2_f (void)
 Con_CommandMode_f
 ================
 */
-void Con_CommandMode_f (void)
+static void Con_CommandMode_f (void)
 {
 	key_dest = key_message;
 	if(Cmd_Argc() > 1)
@@ -695,7 +687,7 @@ static void Con_Maps_f (void)
 		GetMapList("", NULL, 0);
 }
 
-void Con_ConDump_f (void)
+static void Con_ConDump_f (void)
 {
 	int i;
 	qfile_t *file;
@@ -710,17 +702,21 @@ void Con_ConDump_f (void)
 		Con_Printf("condump: unable to write file \"%s\"\n", Cmd_Argv(1));
 		return;
 	}
+	if (con_mutex) Thread_LockMutex(con_mutex);
 	for(i = 0; i < CON_LINES_COUNT; ++i)
 	{
 		FS_Write(file, CON_LINES(i).start, CON_LINES(i).len);
 		FS_Write(file, "\n", 1);
 	}
+	if (con_mutex) Thread_UnlockMutex(con_mutex);
 	FS_Close(file);
 }
 
 void Con_Clear_f (void)
 {
+	if (con_mutex) Thread_LockMutex(con_mutex);
 	ConBuffer_Clear(&con);
+	if (con_mutex) Thread_UnlockMutex(con_mutex);
 }
 
 /*
@@ -732,6 +728,8 @@ void Con_Init (void)
 {
 	con_linewidth = 80;
 	ConBuffer_Init(&con, CON_TEXTSIZE, CON_MAXLINES, zonemempool);
+	if (Thread_HasThreads())
+		con_mutex = Thread_CreateMutex();
 
 	// Allocate a log queue, this will be freed after configs are parsed
 	logq_size = MAX_INPUTLINE;
@@ -752,6 +750,9 @@ void Con_Init (void)
 	// register our cvars
 	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);
@@ -785,7 +786,10 @@ void Con_Init (void)
 
 void Con_Shutdown (void)
 {
+	if (con_mutex) Thread_LockMutex(con_mutex);
 	ConBuffer_Shutdown(&con);
+	if (con_mutex) Thread_UnlockMutex(con_mutex);
+	if (con_mutex) Thread_DestroyMutex(con_mutex);con_mutex = NULL;
 }
 
 /*
@@ -797,14 +801,14 @@ All console printing must go through this in order to be displayed
 If no console is visible, the notify window will pop up.
 ================
 */
-void Con_PrintToHistory(const char *txt, int mask)
+static void Con_PrintToHistory(const char *txt, int mask)
 {
 	// process:
 	//   \n goes to next line
 	//   \r deletes current line and makes a new one
 
 	static int cr_pending = 0;
-	static char buf[CON_TEXTSIZE];
+	static char buf[CON_TEXTSIZE]; // con_mutex
 	static int bufpos = 0;
 
 	if(!con.text) // FIXME uses a non-abstracted property of con
@@ -879,20 +883,38 @@ static char qfont_table[256] = {
 	'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
 };
 
-void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest)
+void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest, qboolean proquakeprotocol)
 {
 	rcon_redirect_sock = sock;
 	rcon_redirect_dest = dest;
-	memcpy(rcon_redirect_buffer, "\377\377\377\377n", 5); // QW rcon print
+	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] = (char)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)
+static void Con_Rcon_Redirect_Flush(void)
 {
 	rcon_redirect_buffer[rcon_redirect_bufferpos] = 0;
-	NetConn_WriteString(rcon_redirect_sock, rcon_redirect_buffer, rcon_redirect_dest);
+	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)
@@ -914,7 +936,7 @@ Con_Rcon_AddChar
 ================
 */
 /// Adds a character to the rcon buffer.
-void Con_Rcon_AddChar(int c)
+static void Con_Rcon_AddChar(int c)
 {
 	if(log_dest_buffer_appending)
 		return;
@@ -935,7 +957,7 @@ void Con_Rcon_AddChar(int c)
 			Log_DestBuffer_Init();
 		log_dest_buffer[log_dest_buffer_pos++] = c;
 		if(log_dest_buffer_pos >= sizeof(log_dest_buffer) - 1) // minus one, to allow for terminating zero
-			Log_DestBuffer_Flush();
+			Log_DestBuffer_Flush_NoLock();
 	}
 	else
 		log_dest_buffer_pos = 0;
@@ -1020,11 +1042,12 @@ void Con_MaskPrint(int additionalmask, const char *msg)
 	static int index = 0;
 	static char line[MAX_INPUTLINE];
 
+	if (con_mutex)
+		Thread_LockMutex(con_mutex);
+
 	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)
 		{
@@ -1043,7 +1066,7 @@ void Con_MaskPrint(int additionalmask, const char *msg)
 				{
 					if (con_chatsound.value)
 					{
-						if(gamemode == GAME_NEXUIZ)
+						if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC)
 						{
 							if(msg[1] == '\r' && cl.foundtalk2wav)
 								S_LocalSound ("sound/misc/talk2.wav");
@@ -1069,6 +1092,8 @@ void Con_MaskPrint(int additionalmask, const char *msg)
 			for (;*timestamp;index++, timestamp++)
 				if (index < (int)sizeof(line) - 2)
 					line[index] = *timestamp;
+			// add the mask
+			mask |= additionalmask;
 		}
 		// append the character
 		line[index++] = *msg;
@@ -1083,16 +1108,29 @@ void Con_MaskPrint(int additionalmask, const char *msg)
 			if (con_initialized && cls.state != ca_dedicated)
 			{
 				Con_PrintToHistory(line, mask);
-				mask = 0;
 			}
 			// send to terminal or dedicated server window
 			if (!sys_nostdout)
+			if (developer.integer || !(mask & CON_MASK_DEVELOPER))
 			{
-				unsigned char *p;
 				if(sys_specialcharactertranslation.integer)
 				{
-					for (p = (unsigned char *) line;*p; p++)
-						*p = qfont_table[*p];
+					char *p;
+					const char *q;
+					p = line;
+					while(*p)
+					{
+						int ch = u8_getchar(p, &q);
+						if(ch >= 0xE000 && ch <= 0xE0FF)
+						{
+							*p = qfont_table[ch - 0xE000];
+							if(q > p+1)
+								memmove(p+1, q, strlen(q)+1);
+							p = p + 1;
+						}
+						else
+							p = p + (q - p);
+					}
 				}
 
 				if(sys_colortranslation.integer == 1) // ANSI
@@ -1270,8 +1308,12 @@ void Con_MaskPrint(int additionalmask, const char *msg)
 			}
 			// empty the line buffer
 			index = 0;
+			mask = 0;
 		}
 	}
+
+	if (con_mutex)
+		Thread_UnlockMutex(con_mutex);
 }
 
 /*
@@ -1325,6 +1367,9 @@ 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);
 }
 
@@ -1338,6 +1383,9 @@ 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);
@@ -1363,12 +1411,15 @@ The input line scrolls horizontally if typing goes beyond the right edge
 Modified by EvilTypeGuy eviltypeguy@qeradiant.com
 ================
 */
-void Con_DrawInput (void)
+extern cvar_t r_font_disable_freetype;
+static void Con_DrawInput (void)
 {
 	int		y;
 	int		i;
 	char editlinecopy[MAX_INPUTLINE+1], *text;
-	float x;
+	float x, xo;
+	size_t len_out;
+	int col_out;
 
 	if (!key_consoleactive)
 		return;		// don't draw anything
@@ -1383,39 +1434,70 @@ 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
+	if (r_font_disable_freetype.integer)
 	{
-		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)
+		// this code is freetype incompatible!
+		if ((int)(realtime*con_cursorspeed) & 1)		// cursor is visible
 		{
-			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)
+			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)
 			{
-				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;
+				int ofs = u8_bytelen(text + key_linepos, 1);
+				size_t len;
+				const char *curbuf;
+				char charbuf16[16];
+				curbuf = u8_encodech(0xE000 + 11 + 130 * key_insert, &len, charbuf16);
+
+				if (curbuf)
+				{
+					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;
 
-	x = vid_conwidth.value * 0.95 - DrawQ_TextWidth_Font(text, key_linepos, con_textsize.value, con_textsize.value, false, FONT_CONSOLE);
+	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_Font(x, con_vislines - con_textsize.value*2, text, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, FONT_CONSOLE );
+	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;
+				char charbuf16[16];
+				curbuf = u8_encodech(0xE000 + 11 + 130 * key_insert, &len, charbuf16);
+				memcpy(text, curbuf, len);
+				text[len] = 0;
+			}
+			DrawQ_String(x + xo, con_vislines - con_textsize.value*2, text, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &col_out, false, FONT_CONSOLE);
+		}
+	}
 
 	// remove cursor
 //	key_line[key_linepos] = 0;
@@ -1437,7 +1519,7 @@ typedef struct
 }
 con_text_info_t;
 
-float Con_WordWidthFunc(void *passthrough, const char *w, size_t *length, float maxWidth)
+static 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)
@@ -1446,18 +1528,18 @@ float Con_WordWidthFunc(void *passthrough, const char *w, size_t *length, float
 		return ti->fontsize * ti->font->maxwidth;
 	}
 	if(maxWidth >= 0)
-		return DrawQ_TextWidth_Font_UntilWidth_Size(w, length, ti->fontsize, ti->fontsize, false, ti->font, -maxWidth); // -maxWidth: we want at least one char
+		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_Font(w, *length, ti->fontsize, ti->fontsize, false, ti->font);
+		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);
+		Sys_PrintfToTerminal("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)
+static int Con_CountLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation)
 {
 	(void) passthrough;
 	(void) line;
@@ -1467,7 +1549,7 @@ int Con_CountLineFunc(void *passthrough, const char *line, size_t length, float
 	return 1;
 }
 
-int Con_DisplayLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation)
+static int Con_DisplayLineFunc(void *passthrough, const char *line, size_t length, float width, qboolean isContinuation)
 {
 	con_text_info_t *ti = (con_text_info_t *) passthrough;
 
@@ -1479,16 +1561,16 @@ int Con_DisplayLineFunc(void *passthrough, const char *line, size_t length, floa
 	{
 		int x = (int) (ti->x + (ti->width - width) * ti->alignment);
 		if(isContinuation && *ti->continuationString)
-			x += (int) DrawQ_String_Font(x, ti->y, ti->continuationString, strlen(ti->continuationString), ti->fontsize, ti->fontsize, 1.0, 1.0, 1.0, 1.0, 0, NULL, false, ti->font);
+			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_Font(x, ti->y, line, length, ti->fontsize, ti->fontsize, 1.0, 1.0, 1.0, 1.0, 0, &(ti->colorindex), false, ti->font);
+			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)
+static 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;
@@ -1572,16 +1654,18 @@ Draws the last few lines of output transparently over the game top
 */
 void Con_DrawNotify (void)
 {
-	float	x, v;
-	float chatstart, notifystart, inputsize;
+	float	x, v, xr;
+	float chatstart, notifystart, inputsize, height;
 	float align;
 	char	temptext[MAX_INPUTLINE];
 	int numChatlines;
 	int chatpos;
 
+	if (con_mutex) Thread_LockMutex(con_mutex);
 	ConBuffer_FixTimes(&con);
 
 	numChatlines = con_chat.integer;
+
 	chatpos = con_chatpos.integer;
 
 	if (con_notify.integer < 0)
@@ -1599,7 +1683,7 @@ void Con_DrawNotify (void)
 			align = 0.5;
 	}
 
-	if(numChatlines)
+	if(numChatlines || !con_chatrect.integer)
 	{
 		if(chatpos == 0)
 		{
@@ -1629,19 +1713,31 @@ void Con_DrawNotify (void)
 
 	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, "");
 
-	// chat?
-	if(numChatlines)
+	if(con_chatrect.integer)
+	{
+		x = con_chatrect_x.value * vid_conwidth.value;
+		v = con_chatrect_y.value * vid_conheight.value;
+	}
+	else
 	{
-		v = chatstart + numChatlines * con_chatsize.value;
-		Con_DrawNotifyRect(CON_MASK_CHAT, CON_MASK_INPUT, con_chattime.value, 0, chatstart, vid_conwidth.value * con_chatwidth.value, v - chatstart, 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
+		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;
 		const char *cursor;
-		cursor = u8_encodech(0xE00A + ((int)(realtime * con_cursorspeed)&1), NULL);
+		char charbuf16[16];
+		cursor = u8_encodech(0xE00A + ((int)(realtime * con_cursorspeed)&1), NULL, charbuf16);
 
 		// LordHavoc: speedup, and other improvements
 		if (chat_mode < 0)
@@ -1653,11 +1749,11 @@ void Con_DrawNotify (void)
 
 		// FIXME word wrap
 		inputsize = (numChatlines ? con_chatsize : con_notifysize).value;
-		x = vid_conwidth.value - DrawQ_TextWidth_Font(temptext, 0, inputsize, inputsize, false, FONT_CHAT);
-		if(x > 0)
-			x = 0;
-		DrawQ_String_Font(x, v, temptext, 0, inputsize, inputsize, 1.0, 1.0, 1.0, 1.0, 0, &colorindex, false, FONT_CHAT);
+		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);
 	}
+	if (con_mutex) Thread_UnlockMutex(con_mutex);
 }
 
 /*
@@ -1667,7 +1763,7 @@ Con_LineHeight
 Returns the height of a given console line; calculates it if necessary.
 ================
 */
-int Con_LineHeight(int lineno)
+static int Con_LineHeight(int lineno)
 {
 	con_lineinfo_t *li = &CON_LINES(lineno);
 	if(li->height == -1)
@@ -1691,7 +1787,7 @@ 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)
+static 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;
@@ -1767,20 +1863,74 @@ The typing input line at the bottom should only be drawn if typing is allowed
 */
 void Con_DrawConsole (int lines)
 {
+	float alpha, alpha0;
+	double sx, sy;
 	int mask_must = 0;
-	int mask_mustnot = developer.integer ? 0 : CON_MASK_DEVELOPER;
+	int mask_mustnot = (developer.integer>0) ? 0 : CON_MASK_DEVELOPER;
+	cachepic_t *conbackpic;
 
 	if (lines <= 0)
 		return;
 
+	if (con_mutex) Thread_LockMutex(con_mutex);
+
 	if (con_backscroll < 0)
 		con_backscroll = 0;
 
 	con_vislines = lines;
 
+	r_draw2d_force = true;
+
 // draw the background
-	DrawQ_Pic(0, lines - vid_conheight.integer, scr_conbrightness.value >= 0.01f ? Draw_CachePic ("gfx/conback") : NULL, vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, cls.signon == SIGNONS ? scr_conalpha.value : 1.0, 0); // always full alpha when not in game
-	DrawQ_String_Font(vid_conwidth.integer - DrawQ_TextWidth_Font(engineversion, con_textsize.value, con_textsize.value, 0, false, FONT_CONSOLE), lines - con_textsize.value, engineversion, 0, con_textsize.value, con_textsize.value, 1, 0, 0, 1, 0, NULL, true, FONT_CONSOLE);
+	alpha0 = cls.signon == SIGNONS ? scr_conalpha.value : 1.0f; // always full alpha when not in game
+	if((alpha = alpha0 * scr_conalphafactor.value) > 0)
+	{
+		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);
 
 // draw the text
 #if 0
@@ -1828,6 +1978,9 @@ void Con_DrawConsole (int lines)
 
 // draw the input prompt, user text, and cursor if desired
 	Con_DrawInput ();
+
+	r_draw2d_force = false;
+	if (con_mutex) Thread_UnlockMutex(con_mutex);
 }
 
 /*
@@ -1926,7 +2079,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 				for (;;)
 				{
 					int l;
-					if (!COM_ParseToken_Simple(&data, false, false))
+					if (!COM_ParseToken_Simple(&data, false, false, true))
 						break;
 					if (com_token[0] == '{')
 						continue;
@@ -1937,7 +2090,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 					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))
+					if (!COM_ParseToken_Simple(&data, false, false, true))
 						break;
 					if (developer_extra.integer)
 						Con_DPrintf("key: %s %s\n", keyname, com_token);
@@ -2030,7 +2183,7 @@ void Con_DisplayList(const char **list)
 	SanitizeString strips color tags from the string in
 	and writes the result on string out
 */
-void SanitizeString(char *in, char *out)
+static void SanitizeString(char *in, char *out)
 {
 	while(*in)
 	{
@@ -2085,7 +2238,7 @@ static int Nicks_offset[MAX_SCOREBOARD]; // when nicks use a space, we need this
 static int Nicks_matchpos;
 
 // co against <<:BLASTER:>> is true!?
-int Nicks_strncasecmp_nospaces(char *a, char *b, unsigned int a_len)
+static int Nicks_strncasecmp_nospaces(char *a, char *b, unsigned int a_len)
 {
 	while(a_len)
 	{
@@ -2111,7 +2264,7 @@ int Nicks_strncasecmp_nospaces(char *a, char *b, unsigned int a_len)
 	}
 	return 0;
 }
-int Nicks_strncasecmp(char *a, char *b, unsigned int a_len)
+static int Nicks_strncasecmp(char *a, char *b, unsigned int a_len)
 {
 	char space_char;
 	if(!(con_nickcompletion_flags.integer & NICKS_ALPHANUMERICS_ONLY))
@@ -2162,11 +2315,10 @@ int Nicks_strncasecmp(char *a, char *b, unsigned int a_len)
 
    Count the number of possible nicks to complete
  */
-int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon)
+static 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;
@@ -2190,7 +2342,6 @@ int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon)
 		if(!name[0])
 			continue;
 
-		length = strlen(name);
 		match = -1;
 		spos = pos - 1; // no need for a minimum of characters :)
 
@@ -2231,14 +2382,14 @@ int Nicks_CompleteCountPossible(char *line, int pos, char *s, qboolean isCon)
 	return count;
 }
 
-void Cmd_CompleteNicksPrint(int count)
+static void Cmd_CompleteNicksPrint(int count)
 {
 	int i;
 	for(i = 0; i < count; ++i)
 		Con_Printf("%s\n", Nicks_list[i]);
 }
 
-void Nicks_CutMatchesNormal(int count)
+static void Nicks_CutMatchesNormal(int count)
 {
 	// cut match 0 down to the longest possible completion
 	int i;
@@ -2261,7 +2412,7 @@ void Nicks_CutMatchesNormal(int count)
 	//Con_Printf("List0: %s\n", Nicks_sanlist[0]);
 }
 
-unsigned int Nicks_strcleanlen(const char *s)
+static unsigned int Nicks_strcleanlen(const char *s)
 {
 	unsigned int l = 0;
 	while(*s)
@@ -2276,7 +2427,7 @@ unsigned int Nicks_strcleanlen(const char *s)
 	return l;
 }
 
-void Nicks_CutMatchesAlphaNumeric(int count)
+static void Nicks_CutMatchesAlphaNumeric(int count)
 {
 	// cut match 0 down to the longest possible completion
 	int i;
@@ -2335,7 +2486,7 @@ void Nicks_CutMatchesAlphaNumeric(int count)
 	}
 }
 
-void Nicks_CutMatchesNoSpaces(int count)
+static void Nicks_CutMatchesNoSpaces(int count)
 {
 	// cut match 0 down to the longest possible completion
 	int i;
@@ -2391,7 +2542,7 @@ void Nicks_CutMatchesNoSpaces(int count)
 	}
 }
 
-void Nicks_CutMatches(int count)
+static void Nicks_CutMatches(int count)
 {
 	if(con_nickcompletion_flags.integer & NICKS_ALPHANUMERICS_ONLY)
 		Nicks_CutMatchesAlphaNumeric(count);
@@ -2401,7 +2552,7 @@ void Nicks_CutMatches(int count)
 		Nicks_CutMatchesNormal(count);
 }
 
-const char **Nicks_CompleteBuildList(int count)
+static const char **Nicks_CompleteBuildList(int count)
 {
 	const char **buf;
 	int bpos = 0;
@@ -2421,7 +2572,7 @@ const char **Nicks_CompleteBuildList(int count)
 	Nicks_AddLastColor
 	Restores the previous used color, after the autocompleted name.
 */
-int Nicks_AddLastColor(char *buffer, int pos)
+static int Nicks_AddLastColor(char *buffer, int pos)
 {
 	qboolean quote_added = false;
 	int match;
@@ -2542,6 +2693,7 @@ void Con_CompleteCommandLine (void)
 	int c, v, a, i, cmd_len, pos, k;
 	int n; // nicks --blub
 	const char *space, *patterns;
+	char vabuf[1024];
 
 	//find what we want to complete
 	pos = key_linepos;
@@ -2562,7 +2714,7 @@ void Con_CompleteCommandLine (void)
 	{
 		strlcpy(command, key_line + 1, min(sizeof(command), (unsigned int)(space - key_line)));
 
-		patterns = Cvar_VariableString(va("con_completion_%s", command)); // TODO maybe use a better place for this?
+		patterns = Cvar_VariableString(va(vabuf, sizeof(vabuf), "con_completion_%s", command)); // TODO maybe use a better place for this?
 		if(patterns && !*patterns)
 			patterns = NULL; // get rid of the empty string
 
@@ -2614,7 +2766,7 @@ void Con_CompleteCommandLine (void)
 
 				stringlistinit(&resultbuf);
 				stringlistinit(&dirbuf);
-				while(COM_ParseToken_Simple(&patterns, false, false))
+				while(COM_ParseToken_Simple(&patterns, false, false, true))
 				{
 					fssearch_t *search;
 					if(strchr(com_token, '/'))
@@ -2680,11 +2832,11 @@ void Con_CompleteCommandLine (void)
 					}
 					else
 					{
-						stringlistsort(&resultbuf); // dirbuf is already sorted
+						stringlistsort(&resultbuf, true); // 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]);
+							Con_Printf("^4%s^7/\n", dirbuf.strings[i]);
 						}
 						for(i = 0; i < resultbuf.numstrings; ++i)
 						{
@@ -2748,7 +2900,7 @@ 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_line, key_linepos, s, true);