X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=console.c;h=eb13a112b5b90c51da610a39247843bc6dedaea5;hb=8688df8a88c8f14d8f11fe73a151e5b53f94407c;hp=e68ca4fa2fc6b1fc29fc968fcbc70e08da81aae5;hpb=c3de890275f4840c3f4edf9a5ab047b7dd9b2a37;p=xonotic%2Fdarkplaces.git

diff --git a/console.c b/console.c
index e68ca4fa..eb13a112 100644
--- a/console.c
+++ b/console.c
@@ -43,7 +43,30 @@ char con_text[CON_TEXTSIZE];
 
 cvar_t con_notifytime = {CVAR_SAVE, "con_notifytime","3", "how long notify lines last, in seconds"};
 cvar_t con_notify = {CVAR_SAVE, "con_notify","4", "how many notify lines to show (0-32)"};
-cvar_t con_textsize = {CVAR_SAVE, "con_textsize","8", "console text size in virtual 2D pixels"};	//[515]: console text size in pixels
+cvar_t con_textsize = {CVAR_SAVE, "con_textsize","8", "console text size in virtual 2D pixels"};
+
+
+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)"};
+#ifdef WIN32
+cvar_t sys_colortranslation = {0, "sys_colortranslation", "0", "terminal console color translation (supported values: 0 = strip color codes, 1 = translate to ANSI codes, 2 = no translation)"};
+#else
+cvar_t sys_colortranslation = {0, "sys_colortranslation", "1", "terminal console color translation (supported values: 0 = strip color codes, 1 = translate to ANSI codes, 2 = no translation)"};
+#endif
+
+
+cvar_t con_nickcompletion = {CVAR_SAVE, "con_nickcompletion", "1", "tab-complete nicks in console and message input"};
+cvar_t con_nickcompletion_flags = {CVAR_SAVE, "con_nickcompletion_flags", "11", "Bitfield: "
+				   "0: add nothing after completion. "
+				   "1: add the last color after completion. "
+				   "2: add a quote when starting a quote instead of the color. "
+				   "4: will replace 1, will force color, even after a quote. "
+				   "8: ignore non-alphanumerics. "
+				   "16: ignore spaces. "};
+#define NICKS_ADD_COLOR 1
+#define NICKS_ADD_QUOTE 2
+#define NICKS_FORCE_COLOR 4
+#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
@@ -68,6 +91,10 @@ 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;
 char crt_log_file [MAX_OSPATH] = "";
 qfile_t* logfile = NULL;
 
@@ -77,6 +104,56 @@ size_t logq_size = 0;
 
 void Log_ConPrint (const char *msg);
 
+/*
+====================
+Log_DestBuffer_Init
+====================
+*/
+static void Log_DestBuffer_Init()
+{
+	memcpy(log_dest_buffer, "\377\377\377\377n", 5); // QW rcon print
+	log_dest_buffer_pos = 5;
+}
+
+/*
+====================
+Log_DestBuffer_Flush
+====================
+*/
+void Log_DestBuffer_Flush()
+{
+	lhnetaddress_t log_dest_addr;
+	lhnetsocket_t *log_dest_socket;
+	const char *s = log_dest_udp.string;
+	qboolean have_opened_temp_sockets = false;
+	if(s) if(log_dest_buffer_pos > 5)
+	{
+		++log_dest_buffer_appending;
+		log_dest_buffer[log_dest_buffer_pos++] = 0;
+
+		if(!NetConn_HaveServerPorts() && !NetConn_HaveClientPorts()) // then temporarily open one
+ 		{
+			have_opened_temp_sockets = true;
+			NetConn_OpenServerPorts(true);
+		}
+
+		while(COM_ParseToken_Console(&s))
+			if(LHNETADDRESS_FromString(&log_dest_addr, com_token, 26000))
+			{
+				log_dest_socket = NetConn_ChooseClientSocketForAddress(&log_dest_addr);
+				if(!log_dest_socket)
+					log_dest_socket = NetConn_ChooseServerSocketForAddress(&log_dest_addr);
+				if(log_dest_socket)
+					NetConn_WriteString(log_dest_socket, log_dest_buffer, &log_dest_addr);
+			}
+
+		if(have_opened_temp_sockets)
+			NetConn_CloseServerPorts();
+		--log_dest_buffer_appending;
+	}
+	log_dest_buffer_pos = 0;
+}
+
 /*
 ====================
 Log_Timestamp
@@ -148,6 +225,8 @@ Log_Start
 */
 void Log_Start (void)
 {
+	size_t pos;
+	size_t n;
 	Log_Open ();
 
 	// Dump the contents of the log queue into the log file and free it
@@ -155,8 +234,24 @@ void Log_Start (void)
 	{
 		unsigned char *temp = logqueue;
 		logqueue = NULL;
-		if (logfile != NULL && logq_ind != 0)
-			FS_Write (logfile, temp, logq_ind);
+		if(logq_ind != 0)
+		{
+			if (logfile != NULL)
+				FS_Write (logfile, temp, logq_ind);
+			if(*log_dest_udp.string)
+			{
+				for(pos = 0; pos < logq_ind; )
+				{
+					if(log_dest_buffer_pos == 0)
+						Log_DestBuffer_Init();
+					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();
+					pos += n;
+				}
+			}
+		}
 		Mem_Free (temp);
 		logq_ind = 0;
 		logq_size = 0;
@@ -215,6 +310,7 @@ void Log_ConPrint (const char *msg)
 	// If a log file is available
 	if (logfile != NULL)
 		FS_Print (logfile, msg);
+
 	inprogress = false;
 }
 
@@ -269,7 +365,7 @@ Con_Clear_f
 */
 void Con_Clear_f (void)
 {
-	if (con_text)
+	//if (con_text)
 		memset (con_text, ' ', CON_TEXTSIZE);
 }
 
@@ -382,6 +478,47 @@ static void Con_Maps_f (void)
 		GetMapList("", NULL, 0);
 }
 
+void Con_ConDump_f (void)
+{
+	int i, l;
+	qboolean allblankssofar;
+	const char *text;
+	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);
+	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);
+		}
+	}
+	FS_Close(file);
+}
+
 /*
 ================
 Con_Init
@@ -398,27 +535,33 @@ void Con_Init (void)
 	logqueue = (unsigned char *)Mem_Alloc (tempmempool, logq_size);
 	logq_ind = 0;
 
+	Cvar_RegisterVariable (&sys_colortranslation);
+	Cvar_RegisterVariable (&sys_specialcharactertranslation);
+
 	Cvar_RegisterVariable (&log_file);
+	Cvar_RegisterVariable (&log_dest_udp);
 
 	// support for the classic Quake option
 // COMMANDLINEOPTION: Console: -condebug logs console messages to qconsole.log, see also log_file
 	if (COM_CheckParm ("-condebug") != 0)
 		Cvar_SetQuick (&log_file, "qconsole.log");
-}
 
-void Con_Init_Commands (void)
-{
 	// register our cvars
 	Cvar_RegisterVariable (&con_notifytime);
 	Cvar_RegisterVariable (&con_notify);
 	Cvar_RegisterVariable (&con_textsize);
 
+	// --blub
+	Cvar_RegisterVariable (&con_nickcompletion);
+	Cvar_RegisterVariable (&con_nickcompletion_flags);
+
 	// 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 ("clear", Con_Clear_f, "clear console history");
-	Cmd_AddCommand ("maps", Con_Maps_f, "list information about available maps");	// By [515]
+	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");
@@ -549,6 +692,38 @@ static char qfont_table[256] = {
 	'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
 };
 
+/*
+================
+Con_Rcon_AddChar
+
+Adds a character to the rcon buffer
+================
+*/
+void Con_Rcon_AddChar(char c)
+{
+	if(log_dest_buffer_appending)
+		return;
+	++log_dest_buffer_appending;
+
+	// if this print is in response to an rcon command, add the character
+	// to the rcon redirect buffer
+
+	if (rcon_redirect && rcon_redirect_bufferpos < (int)sizeof(rcon_redirect_buffer) - 1)
+		rcon_redirect_buffer[rcon_redirect_bufferpos++] = c;
+	else if(*log_dest_udp.string) // don't duplicate rcon command responses here, these are sent another way
+	{
+		if(log_dest_buffer_pos == 0)
+			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();
+	}
+	else
+		log_dest_buffer_pos = 0;
+
+	--log_dest_buffer_appending;
+}
+
 /*
 ================
 Con_Print
@@ -561,16 +736,13 @@ extern cvar_t timeformat;
 extern qboolean sys_nostdout;
 void Con_Print(const char *msg)
 {
-	int mask = 0;
+	static int mask = 0;
 	static int index = 0;
 	static char line[MAX_INPUTLINE];
 
 	for (;*msg;msg++)
 	{
-		// if this print is in response to an rcon command, add the character
-		// to the rcon redirect buffer
-		if (rcon_redirect && rcon_redirect_bufferpos < (int)sizeof(rcon_redirect_buffer) - 1)
-			rcon_redirect_buffer[rcon_redirect_bufferpos++] = *msg;
+		Con_Rcon_AddChar(*msg);
 		// if this is the beginning of a new line, print timestamp
 		if (index == 0)
 		{
@@ -586,10 +758,16 @@ void Con_Print(const char *msg)
 			{
 				// play talk wav
 				if (*msg == 1)
-					S_LocalSound ("sound/misc/talk.wav");
+				{
+					if (msg[1] == '(' && cl.foundtalk2wav)
+						S_LocalSound ("sound/misc/talk2.wav");
+					else
+						S_LocalSound ("sound/misc/talk.wav");
+				}
 				line[index++] = STRING_COLOR_TAG;
 				line[index++] = '3';
 				msg++;
+				Con_Rcon_AddChar(*msg);
 			}
 			// store timestamp
 			for (;*timestamp;index++, timestamp++)
@@ -612,9 +790,154 @@ void Con_Print(const char *msg)
 			if (!sys_nostdout)
 			{
 				unsigned char *p;
-				for (p = (unsigned char *) line;*p; p++)
-					*p = qfont_table[*p];
-				Sys_PrintToTerminal(line);
+				if(sys_specialcharactertranslation.integer)
+				{
+					for (p = (unsigned char *) line;*p; p++)
+						*p = qfont_table[*p];
+				}
+
+				if(sys_colortranslation.integer == 1) // ANSI
+				{
+					static char printline[MAX_INPUTLINE * 4 + 3];
+						// 2 can become 7 bytes, rounding that up to 8, and 3 bytes are added at the end
+						// a newline can transform into four bytes, but then prevents the three extra bytes from appearing
+					int lastcolor = 0;
+					const char *in;
+					char *out;
+					for(in = line, out = printline; *in; ++in)
+					{
+						switch(*in)
+						{
+							case STRING_COLOR_TAG:
+								switch(in[1])
+								{
+									case STRING_COLOR_TAG:
+										++in;
+										*out++ = STRING_COLOR_TAG;
+										break;
+									case '0':
+									case '7':
+										// normal color
+										++in;
+										if(lastcolor == 0) break; else lastcolor = 0;
+										*out++ = 0x1B; *out++ = '['; *out++ = 'm';
+										break;
+									case '1':
+										// light red
+										++in;
+										if(lastcolor == 1) break; else lastcolor = 1;
+										*out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '1'; *out++ = 'm';
+										break;
+									case '2':
+										// light green
+										++in;
+										if(lastcolor == 2) break; else lastcolor = 2;
+										*out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '2'; *out++ = 'm';
+										break;
+									case '3':
+										// yellow
+										++in;
+										if(lastcolor == 3) break; else lastcolor = 3;
+										*out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '3'; *out++ = 'm';
+										break;
+									case '4':
+										// light blue
+										++in;
+										if(lastcolor == 4) break; else lastcolor = 4;
+										*out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '4'; *out++ = 'm';
+										break;
+									case '5':
+										// light cyan
+										++in;
+										if(lastcolor == 5) break; else lastcolor = 5;
+										*out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '6'; *out++ = 'm';
+										break;
+									case '6':
+										// light magenta
+										++in;
+										if(lastcolor == 6) break; else lastcolor = 6;
+										*out++ = 0x1B; *out++ = '['; *out++ = '1'; *out++ = ';'; *out++ = '3'; *out++ = '5'; *out++ = 'm';
+										break;
+									// 7 handled above
+									case '8':
+									case '9':
+										// bold normal color
+										++in;
+										if(lastcolor == 8) break; else lastcolor = 8;
+										*out++ = 0x1B; *out++ = '['; *out++ = '0'; *out++ = ';'; *out++ = '1'; *out++ = 'm';
+										break;
+									default:
+										*out++ = STRING_COLOR_TAG;
+										break;
+								}
+								break;
+							case '\n':
+								if(lastcolor != 0)
+								{
+									*out++ = 0x1B; *out++ = '['; *out++ = 'm';
+									lastcolor = 0;
+								}
+								*out++ = *in;
+								break;
+							default:
+								*out++ = *in;
+								break;
+						}
+					}
+					if(lastcolor != 0)
+					{
+						*out++ = 0x1B;
+						*out++ = '[';
+						*out++ = 'm';
+					}
+					*out++ = 0;
+					Sys_PrintToTerminal(printline);
+				}
+				else if(sys_colortranslation.integer == 2) // Quake
+				{
+					Sys_PrintToTerminal(line);
+				}
+				else // strip
+				{
+					static char printline[MAX_INPUTLINE]; // it can only get shorter here
+					const char *in;
+					char *out;
+					for(in = line, out = printline; *in; ++in)
+					{
+						switch(*in)
+						{
+							case STRING_COLOR_TAG:
+								switch(in[1])
+								{
+									case STRING_COLOR_TAG:
+										++in;
+										*out++ = STRING_COLOR_TAG;
+										break;
+									case '0':
+									case '1':
+									case '2':
+									case '3':
+									case '4':
+									case '5':
+									case '6':
+									case '7':
+									case '8':
+									case '9':
+										++in;
+										break;
+									default:
+										*out++ = STRING_COLOR_TAG;
+										break;
+								}
+								break;
+							default:
+								*out++ = *in;
+								break;
+						}
+					}
+					*out++ = 0;
+					Sys_PrintToTerminal(printline);
+				}
 			}
 			// empty the line buffer
 			index = 0;
@@ -705,7 +1028,8 @@ void Con_DrawInput (void)
 	if (!key_consoleactive)
 		return;		// don't draw anything
 
-	text = strcpy(editlinecopy, key_lines[edit_line]);
+	strlcpy(editlinecopy, key_lines[edit_line], sizeof(editlinecopy));
+	text = editlinecopy;
 
 	// Advanced Console Editing by Radix radix@planetquake.com
 	// Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
@@ -729,7 +1053,7 @@ void Con_DrawInput (void)
 		text += 1 + key_linepos - con_linewidth;
 
 	// draw it
-	DrawQ_ColoredString(0, con_vislines - con_textsize.value*2, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, NULL );
+	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 );
 
 	// remove cursor
 //	key_lines[edit_line][key_linepos] = 0;
@@ -783,7 +1107,7 @@ void Con_DrawNotify (void)
 			// count up to the last non-whitespace, and ignore color codes
 			for (j = 0;j < con_linewidth && text[j];j++)
 			{
-				if (text[j] == '^' && (text[j+1] >= '0' && text[j+1] <= '9'))
+				if (text[j] == STRING_COLOR_TAG && (text[j+1] >= '0' && text[j+1] <= '9'))
 				{
 					j++;
 					continue;
@@ -798,7 +1122,7 @@ void Con_DrawNotify (void)
 		} else
 			x = 0;
 
-		DrawQ_ColoredString( x, v, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
+		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 += con_textsize.value;
 	}
@@ -817,13 +1141,13 @@ void Con_DrawNotify (void)
 			sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1));
 		while ((int)strlen(temptext) >= con_linewidth)
 		{
-			DrawQ_ColoredString( 0, v, temptext, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
-			strcpy(temptext, &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)
 		{
-			DrawQ_ColoredString( 0, v, temptext, 0, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
+			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;
 		}
 	}
@@ -849,7 +1173,7 @@ void Con_DrawConsole (int lines)
 
 // draw the background
 	DrawQ_Pic(0, lines - vid_conheight.integer, scr_conbrightness.value >= 0.01f ? Draw_CachePic("gfx/conback", true) : NULL, vid_conwidth.integer, vid_conheight.integer, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, 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);
+	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);
 
 // draw the text
 	con_vislines = lines;
@@ -864,7 +1188,7 @@ void Con_DrawConsole (int lines)
 		j = max(i - con_backscroll, 0);
 		text = con_text + (j % con_totallines)*con_linewidth;
 
-		DrawQ_ColoredString( 0, y, text, con_linewidth, con_textsize.value, con_textsize.value, 1.0, 1.0, 1.0, 1.0, 0, &colorindex );
+		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 input prompt, user text, and cursor if desired
@@ -918,7 +1242,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 		const char *data = NULL;
 		char keyname[64];
 		char entfilename[MAX_QPATH];
-		strcpy(message, "^1**ERROR**^7");
+		strlcpy(message, "^1**ERROR**^7", sizeof(message));
 		p = 0;
 		f = FS_Open(t->filenames[i], "rb", true, false);
 		if(f)
@@ -960,7 +1284,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 			else
 				p = 0;
 			strlcpy(entfilename, t->filenames[i], sizeof(entfilename));
-			strcpy(entfilename + strlen(entfilename) - 4, ".ent");
+			memcpy(entfilename + strlen(entfilename) - 4, ".ent", 5);
 			entities = (char *)FS_LoadFile(entfilename, tempmempool, true, NULL);
 			if (!entities && lumplen >= 10)
 			{
@@ -977,7 +1301,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 				for (;;)
 				{
 					int l;
-					if (!COM_ParseToken(&data, false))
+					if (!COM_ParseToken_Simple(&data, false, false))
 						break;
 					if (com_token[0] == '{')
 						continue;
@@ -988,7 +1312,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 					for (l = 0;l < (int)sizeof(keyname) - 1 && com_token[k+l] && com_token[k+l] > ' ';l++)
 						keyname[l] = com_token[k+l];
 					keyname[l] = 0;
-					if (!COM_ParseToken(&data, false))
+					if (!COM_ParseToken_Simple(&data, false, false))
 						break;
 					if (developer.integer >= 100)
 						Con_Printf("key: %s %s\n", keyname, com_token);
@@ -1008,12 +1332,12 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 		*(t->filenames[i]+len[i]+5) = 0;
 		switch(p)
 		{
-		case Q3BSPVERSION:	strcpy((char *)buf, "Q3");break;
-		case Q2BSPVERSION:	strcpy((char *)buf, "Q2");break;
-		case BSPVERSION:	strcpy((char *)buf, "Q1");break;
-		case MCBSPVERSION:	strcpy((char *)buf, "MC");break;
-		case 30:			strcpy((char *)buf, "HL");break;
-		default:			strcpy((char *)buf, "??");break;
+		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;
 		}
 		Con_Printf("%16s (%s) %s\n", t->filenames[i]+5, buf, message);
 	}
@@ -1028,7 +1352,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
 				goto endcomplete;
 	}
 endcomplete:
-	if(p > o)
+	if(p > o && completedname && completednamebufferlength > 0)
 	{
 		memset(completedname, 0, completednamebufferlength);
 		memcpy(completedname, (t->filenames[0]+5), min(p, completednamebufferlength - 1));
@@ -1078,6 +1402,454 @@ 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);
+void SanitizeString(char *in, char *out)
+{
+	while(*in)
+	{
+		if(*in == STRING_COLOR_TAG)
+		{
+			++in;
+			if(!*in)
+			{
+				out[0] = STRING_COLOR_TAG;
+				out[1] = 0;
+				return;
+			} else if(*in >= '0' && *in <= '9')
+			{
+				++in;
+				if(!*in) // end
+				{
+					*out = 0;
+					return;
+				} else if (*in == STRING_COLOR_TAG)
+					continue;
+			} else if (*in != STRING_COLOR_TAG) {
+				--in;
+			}
+		}
+		*out = qfont_table[*(unsigned char*)in];
+		++in;
+		++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
+static char Nicks_sanlist[MAX_SCOREBOARD][MAX_SCOREBOARDNAME];	// sanitized list for completion when there are other possible matches.
+// means: when somebody uses a cvar's name as his name, we won't ever get his colors in there...
+static int Nicks_offset[MAX_SCOREBOARD]; // when nicks use a space, we need this to move the completion list string starts to avoid invalid memcpys
+static int Nicks_matchpos;
+
+// co against <<:BLASTER:>> is true!?
+int Nicks_strncasecmp_nospaces(char *a, char *b, unsigned int a_len)
+{
+	while(a_len)
+	{
+		if(tolower(*a) == tolower(*b))
+		{
+			if(*a == 0)
+				return 0;
+			--a_len;
+			++a;
+			++b;
+			continue;
+		}
+		if(!*a)
+			return -1;
+		if(!*b)
+			return 1;
+		if(*a == ' ')
+			return (*a < *b) ? -1 : 1;
+		if(*b == ' ')
+			++b;
+		else
+			return (*a < *b) ? -1 : 1;
+	}
+	return 0;
+}
+int Nicks_strncasecmp(char *a, char *b, unsigned int a_len)
+{
+	char space_char;
+	if(!(con_nickcompletion_flags.integer & NICKS_ALPHANUMERICS_ONLY))
+	{
+		if(con_nickcompletion_flags.integer & NICKS_NO_SPACES)
+			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
+				return 0;
+			--a_len;
+			++a;
+			++b;
+			continue;
+		}
+		// not equal, end of one string?
+		if(!*a)
+			return -1;
+		if(!*b)
+			return 1;
+		// ignore non alphanumerics
+		alnum_a = ( (*a >= 'a' && *a <= 'z') || (*a >= 'A' && *a <= 'Z') || (*a >= '0' && *a <= '9') || *a == space_char);
+		alnum_b = ( (*b >= 'a' && *b <= 'z') || (*b >= 'A' && *b <= 'Z') || (*b >= '0' && *b <= '9') || *b == space_char);
+		if(!alnum_a) // b must contain this
+			return (*a < *b) ? -1 : 1;
+		if(!alnum_b)
+			++b;
+		// otherwise, both are alnum, they're just not equal, return the appropriate number
+		else
+			return (*a < *b) ? -1 : 1;
+	}
+	return 0;
+}
+
+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);
+		
+		if(!name[0])
+			continue;
+		
+		length = strlen(name);
+		match = -1;
+		spos = pos - 1; // no need for a minimum of characters :)
+		
+		while(spos >= 0 && (spos - pos) < length) // search-string-length < name length
+		{
+			if(spos > 0 && line[spos-1] != ' ' && line[spos-1] != ';' && line[spos-1] != '\"' && line[spos-1] != '\'')
+			{
+				if(!(isCon && line[spos-1] == ']' && spos == 1) && // console start
+				   !(spos > 1 && line[spos-1] >= '0' && line[spos-1] <= '9' && line[spos-2] == STRING_COLOR_TAG)) // color start
+				{
+					--spos;
+					continue;
+				}
+			}
+			if(isCon && spos == 0)
+				break;
+			if(Nicks_strncasecmp(line+spos, name, pos-spos) == 0)
+				match = spos;
+			--spos;
+		}
+		if(match < 0)
+			continue;
+		//Con_Printf("Possible match: %s|%s\n", cl.scores[p].name, name);
+		strlcpy(Nicks_list[count], cl.scores[p].name, sizeof(Nicks_list[count]));
+
+		// the sanitized list
+		strlcpy(Nicks_sanlist[count], name, sizeof(Nicks_sanlist[count]));
+		if(!count)
+		{
+			Nicks_matchpos = match;
+		}
+		
+		Nicks_offset[count] = s - (&line[match]);
+		//Con_Printf("offset for %s: %i\n", name, Nicks_offset[count]);
+
+		++count;
+	}
+	return count;
+}
+
+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)
+{
+	// cut match 0 down to the longest possible completion
+	int i;
+	unsigned int c, l;
+	c = strlen(Nicks_sanlist[0]) - 1;
+	for(i = 1; i < count; ++i)
+	{
+		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]))
+			{
+				c = l-1;
+				break;
+			}
+	}
+	Nicks_sanlist[0][c+1] = 0;
+	//Con_Printf("List0: %s\n", Nicks_sanlist[0]);
+}
+
+unsigned int Nicks_strcleanlen(const char *s)
+{
+	unsigned int l = 0;
+	while(*s)
+	{
+		if( (*s >= 'a' && *s <= 'z') ||
+		    (*s >= 'A' && *s <= 'Z') ||
+		    (*s >= '0' && *s <= '9') ||
+		    *s == ' ')
+			++l;
+		++s;
+	}
+	return l;
+}
+
+void Nicks_CutMatchesAlphaNumeric(int count)
+{
+	// cut match 0 down to the longest possible completion
+	int i;
+	unsigned int c, l;
+	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)
+	{
+		if( (Nicks_sanlist[0][i] >= 'a' && Nicks_sanlist[0][i] <= 'z') ||
+		    (Nicks_sanlist[0][i] >= 'A' && Nicks_sanlist[0][i] <= 'Z') ||
+		    (Nicks_sanlist[0][i] >= '0' && Nicks_sanlist[0][i] <= '9') || Nicks_sanlist[0][i] == space_char) // this is what's COPIED
+		{
+			tempstr[l++] = Nicks_sanlist[0][i];
+		}
+	}
+	tempstr[l] = 0;
+	
+	for(i = 1; i < count; ++i)
+	{
+		a = tempstr;
+		b = Nicks_sanlist[i];
+		while(1)
+		{
+			if(!*a)
+				break;
+			if(!*b)
+			{
+				*a = 0;
+				break;
+			}
+			if(tolower(*a) == tolower(*b))
+			{
+				++a;
+				++b;
+				continue;
+			}
+			if( (*b >= 'a' && *b <= 'z') || (*b >= 'A' && *b <= 'Z') || (*b >= '0' && *b <= '9') || *b == space_char)
+			{
+				// b is alnum, so cut
+				*a = 0;
+				break;
+			}
+			++b;
+		}
+	}
+	// Just so you know, if cutmatchesnormal doesn't kill the first entry, then even the non-alnums fit
+	Nicks_CutMatchesNormal(count);
+	//if(!Nicks_sanlist[0][0])
+	if(Nicks_strcleanlen(Nicks_sanlist[0]) < strlen(tempstr))
+	{
+		// if the clean sanitized one is longer than the current one, use it, it has crap chars which definitely are in there
+		strlcpy(Nicks_sanlist[0], tempstr, sizeof(tempstr));
+	}
+}
+
+void Nicks_CutMatchesNoSpaces(int count)
+{
+	// cut match 0 down to the longest possible completion
+	int i;
+	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)
+	{
+		if(Nicks_sanlist[0][i] != ' ') // here it's what's NOT copied
+		{
+			tempstr[l++] = Nicks_sanlist[0][i];
+		}
+	}
+	tempstr[l] = 0;
+	
+	for(i = 1; i < count; ++i)
+	{
+		a = tempstr;
+		b = Nicks_sanlist[i];
+		while(1)
+		{
+			if(!*a)
+				break;
+			if(!*b)
+			{
+				*a = 0;
+				break;
+			}
+			if(tolower(*a) == tolower(*b))
+			{
+				++a;
+				++b;
+				continue;
+			}
+			if(*b != ' ')
+			{
+				*a = 0;
+				break;
+			}
+			++b;
+		}
+	}
+	// Just so you know, if cutmatchesnormal doesn't kill the first entry, then even the non-alnums fit
+	Nicks_CutMatchesNormal(count);
+	//if(!Nicks_sanlist[0][0])
+	//Con_Printf("TS: %s\n", tempstr);
+	if(Nicks_strcleanlen(Nicks_sanlist[0]) < strlen(tempstr))
+	{
+		// if the clean sanitized one is longer than the current one, use it, it has crap chars which definitely are in there
+		strlcpy(Nicks_sanlist[0], tempstr, sizeof(tempstr));
+	}
+}
+
+void Nicks_CutMatches(int count)
+{
+	if(con_nickcompletion_flags.integer & NICKS_ALPHANUMERICS_ONLY)
+		Nicks_CutMatchesAlphaNumeric(count);
+	else if(con_nickcompletion_flags.integer & NICKS_NO_SPACES)
+		Nicks_CutMatchesNoSpaces(count);
+	else
+		Nicks_CutMatchesNormal(count);
+}
+
+const char **Nicks_CompleteBuildList(int count)
+{
+	const char **buf;
+	int bpos = 0;
+	// the list is freed by Con_CompleteCommandLine, so create a char**
+	buf = (const char **)Mem_Alloc(tempmempool, count * sizeof(const char *) + sizeof (const char *));
+
+	for(; bpos < count; ++bpos)
+		buf[bpos] = Nicks_sanlist[bpos] + Nicks_offset[bpos];
+
+	Nicks_CutMatches(count);
+	
+	buf[bpos] = NULL;
+	return buf;
+}
+
+int Nicks_AddLastColor(char *buffer, int pos)
+{
+	qboolean quote_added = false;
+	int match;
+	char color = '7';
+	
+	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')
+			{
+				color = buffer[match+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;
+		buffer[pos++] = STRING_COLOR_TAG;
+		buffer[pos++] = color;
+	}
+	return pos;
+}
+
+int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos)
+{
+	int n;
+	/*if(!con_nickcompletion.integer)
+	  return; is tested in Nicks_CompletionCountPossible */
+	n = Nicks_CompleteCountPossible(buffer, pos, &buffer[pos], false);
+	if(n == 1)
+	{
+		size_t len;
+		char *msg;
+		
+		msg = Nicks_list[0];
+		len = min(size - Nicks_matchpos - 3, strlen(msg));
+		memcpy(&buffer[Nicks_matchpos], msg, len);
+		if( len < (size - 4) ) // space for color and space and \0
+			len = Nicks_AddLastColor(buffer, Nicks_matchpos+len);
+		buffer[len++] = ' ';
+		buffer[len] = 0;
+		return len;
+	} else if(n > 1)
+	{
+		int len;
+		char *msg;
+		Con_Printf("\n%i possible nick%s\n", n, (n > 1) ? "s: " : ":");
+		Cmd_CompleteNicksPrint(n);
+
+		Nicks_CutMatches(n);
+
+		msg = Nicks_sanlist[0];
+		len = min(size - Nicks_matchpos, strlen(msg));
+		memcpy(&buffer[Nicks_matchpos], msg, len);
+		buffer[Nicks_matchpos + len] = 0;
+		//pos += len;
+		return Nicks_matchpos + len;
+	}
+	return pos;
+}
+
+
 /*
 	Con_CompleteCommandLine
 
@@ -1092,10 +1864,11 @@ void Con_CompleteCommandLine (void)
 {
 	const char *cmd = "";
 	char *s;
-	const char **list[3] = {0, 0, 0};
+	const char **list[4] = {0, 0, 0, 0};
 	char s2[512];
 	int c, v, a, i, cmd_len, pos, k;
-
+	int n; // nicks --blub
+	
 	//find what we want to complete
 	pos = key_linepos;
 	while(--pos)
@@ -1157,11 +1930,17 @@ void Con_CompleteCommandLine (void)
 		Con_Printf("\n%i possible aliases%s\n", a, (a > 1) ? "s: " : ":");
 		Cmd_CompleteAliasPrint(s);
 	}
-
-	if (!(c + v + a))	// No possible matches
+	n = Nicks_CompleteCountPossible(key_lines[edit_line], key_linepos, s, true);
+	if (n)
 	{
+		Con_Printf("\n%i possible nick%s\n", n, (n > 1) ? "s: " : ":");
+		Cmd_CompleteNicksPrint(n);
+	}
+
+	if (!(c + v + a + n))	// No possible matches
+	{		
 		if(s2[0])
-			strcpy(&key_lines[edit_line][key_linepos], s2);
+			strlcpy(&key_lines[edit_line][key_linepos], s2, sizeof(key_lines[edit_line]) - key_linepos);
 		return;
 	}
 
@@ -1171,7 +1950,9 @@ void Con_CompleteCommandLine (void)
 		cmd = *(list[1] = Cvar_CompleteBuildList(s));
 	if (a)
 		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;
@@ -1198,8 +1979,21 @@ done:
 		memcpy(&key_lines[edit_line][key_linepos], cmd, cmd_len);
 		key_linepos += cmd_len;
 		// if there is only one match, add a space after it
-		if (c + v + a == 1 && key_linepos < (int)sizeof(key_lines[edit_line]) - 1)
+		if (c + v + a + n == 1 && key_linepos < (int)sizeof(key_lines[edit_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);
+
+				memcpy(&key_lines[edit_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);
+			}
 			key_lines[edit_line][key_linepos++] = ' ';
+		}
 	}
 
 	// use strlcat to avoid a buffer overrun
@@ -1207,7 +2001,7 @@ done:
 	strlcat(key_lines[edit_line], s2, sizeof(key_lines[edit_line]));
 
 	// free the command, cvar, and alias lists
-	for (i = 0; i < 3; i++)
+	for (i = 0; i < 4; i++)
 		if (list[i])
 			Mem_Free((void *)list[i]);
 }