X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=console.c;h=f36ca203efcbf0022f690ba4bf4e682531863639;hb=d3ce8008cff1349ff9fe884d75f0f5bac3a5f872;hp=d49bcd6a32e0129e588e6877a404ab691219df0f;hpb=67a9b5b1dc27c0d55968da28adf2558b9b58e23a;p=xonotic%2Fdarkplaces.git

diff --git a/console.c b/console.c
index d49bcd6a..f36ca203 100644
--- a/console.c
+++ b/console.c
@@ -72,7 +72,6 @@ LOGGING
 */
 
 cvar_t log_file = {0, "log_file",""};
-cvar_t log_sync = {0, "log_sync","0"};
 char crt_log_file [MAX_OSPATH] = "";
 qfile_t* logfile = NULL;
 
@@ -100,9 +99,9 @@ const char* Log_Timestamp (const char *desc)
 	strftime (timestring, sizeof (timestring), "%a %b %d %H:%M:%S %Y", crt_tm);
 
 	if (desc != NULL)
-		snprintf (timestamp, sizeof (timestamp), "====== %s (%s) ======\n", desc, timestring);
+		dpsnprintf (timestamp, sizeof (timestamp), "====== %s (%s) ======\n", desc, timestring);
 	else
-		snprintf (timestamp, sizeof (timestamp), "====== %s ======\n", timestring);
+		dpsnprintf (timestamp, sizeof (timestamp), "====== %s ======\n", timestring);
 
 	return timestamp;
 }
@@ -121,16 +120,11 @@ void Log_Init (void)
 	logq_ind = 0;
 
 	Cvar_RegisterVariable (&log_file);
-	Cvar_RegisterVariable (&log_sync);
 
 	// support for the classic Quake option
-// COMMANDLINEOPTION: Console: -condebug logs console messages to qconsole.log with sync on (so it keeps every message up to a crash), see also log_file and log_sync
+// COMMANDLINEOPTION: Console: -condebug logs console messages to qconsole.log, see also log_file
 	if (COM_CheckParm ("-condebug") != 0)
-	{
 		Cvar_SetQuick (&log_file, "qconsole.log");
-		Cvar_SetValueQuick (&log_sync, 1);
-		unlink (va("%s/qconsole.log", fs_gamedir));
-	}
 }
 
 
@@ -144,7 +138,7 @@ void Log_Open (void)
 	if (logfile != NULL || log_file.string[0] == '\0')
 		return;
 
-	logfile = FS_Open (log_file.string, "at", false);
+	logfile = FS_Open (log_file.string, "ab", false, false);
 	if (logfile != NULL)
 	{
 		strlcpy (crt_log_file, log_file.string, sizeof (crt_log_file));
@@ -202,10 +196,12 @@ Log_ConPrint
 void Log_ConPrint (const char *msg)
 {
 	static qboolean inprogress = false;
+
 	// don't allow feedback loops with memory error reports
 	if (inprogress)
 		return;
 	inprogress = true;
+
 	// Until the host is completely initialized, we maintain a log queue
 	// to store the messages, since the log can't be started before
 	if (logqueue != NULL)
@@ -242,31 +238,11 @@ void Log_ConPrint (const char *msg)
 
 	// If a log file is available
 	if (logfile != NULL)
-	{
 		FS_Print (logfile, msg);
-		if (log_sync.integer)
-			FS_Flush (logfile);
-	}
 	inprogress = false;
 }
 
 
-/*
-================
-Log_Print
-================
-*/
-void Log_Print (const char *logfilename, const char *msg)
-{
-	qfile_t *file;
-	file = FS_Open(logfilename, "at", true);
-	if (file)
-	{
-		FS_Print(file, msg);
-		FS_Close(file);
-	}
-}
-
 /*
 ================
 Log_Printf
@@ -276,7 +252,7 @@ void Log_Printf (const char *logfilename, const char *fmt, ...)
 {
 	qfile_t *file;
 
-	file = FS_Open (logfilename, "at", true);
+	file = FS_Open (logfilename, "ab", true, false);
 	if (file != NULL)
 	{
 		va_list argptr;
@@ -433,8 +409,6 @@ void Con_Init (void)
 	con_linewidth = -1;
 	Con_CheckResize ();
 
-	Con_Print("Console initialized.\n");
-
 	// register our cvars
 	Cvar_RegisterVariable (&con_notifytime);
 	Cvar_RegisterVariable (&con_notify);
@@ -444,7 +418,9 @@ void Con_Init (void)
 	Cmd_AddCommand ("messagemode", Con_MessageMode_f);
 	Cmd_AddCommand ("messagemode2", Con_MessageMode2_f);
 	Cmd_AddCommand ("clear", Con_Clear_f);
+
 	con_initialized = true;
+	Con_Print("Console initialized.\n");
 }
 
 
@@ -551,29 +527,97 @@ void Con_PrintToHistory(const char *txt)
 	}
 }
 
+/* The translation table between the graphical font and plain ASCII  --KB */
+static char qfont_table[256] = {
+	'\0', '#',  '#',  '#',  '#',  '.',  '#',  '#',
+	'#',  9,    10,   '#',  ' ',  13,   '.',  '.',
+	'[',  ']',  '0',  '1',  '2',  '3',  '4',  '5',
+	'6',  '7',  '8',  '9',  '.',  '<',  '=',  '>',
+	' ',  '!',  '"',  '#',  '$',  '%',  '&',  '\'',
+	'(',  ')',  '*',  '+',  ',',  '-',  '.',  '/',
+	'0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',
+	'8',  '9',  ':',  ';',  '<',  '=',  '>',  '?',
+	'@',  'A',  'B',  'C',  'D',  'E',  'F',  'G',
+	'H',  'I',  'J',  'K',  'L',  'M',  'N',  'O',
+	'P',  'Q',  'R',  'S',  'T',  'U',  'V',  'W',
+	'X',  'Y',  'Z',  '[',  '\\', ']',  '^',  '_',
+	'`',  'a',  'b',  'c',  'd',  'e',  'f',  'g',
+	'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o',
+	'p',  'q',  'r',  's',  't',  'u',  'v',  'w',
+	'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<',
+
+	'<',  '=',  '>',  '#',  '#',  '.',  '#',  '#',
+	'#',  '#',  ' ',  '#',  ' ',  '>',  '.',  '.',
+	'[',  ']',  '0',  '1',  '2',  '3',  '4',  '5',
+	'6',  '7',  '8',  '9',  '.',  '<',  '=',  '>',
+	' ',  '!',  '"',  '#',  '$',  '%',  '&',  '\'',
+	'(',  ')',  '*',  '+',  ',',  '-',  '.',  '/',
+	'0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',
+	'8',  '9',  ':',  ';',  '<',  '=',  '>',  '?',
+	'@',  'A',  'B',  'C',  'D',  'E',  'F',  'G',
+	'H',  'I',  'J',  'K',  'L',  'M',  'N',  'O',
+	'P',  'Q',  'R',  'S',  'T',  'U',  'V',  'W',
+	'X',  'Y',  'Z',  '[',  '\\', ']',  '^',  '_',
+	'`',  'a',  'b',  'c',  'd',  'e',  'f',  'g',
+	'h',  'i',  'j',  'k',  'l',  'm',  'n',  'o',
+	'p',  'q',  'r',  's',  't',  'u',  'v',  'w',
+	'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
+};
+
 /*
 ================
 Con_Print
 
-Prints to all appropriate console targets
+Prints to all appropriate console targets, and adds timestamps
 ================
 */
+extern cvar_t timestamps;
+extern cvar_t timeformat;
+extern qboolean sys_nostdout;
 void Con_Print(const char *msg)
 {
-	// also echo to debugging console
-	Sys_Print(msg);
-
-	// log all messages to file
-	Log_ConPrint (msg);
+	static int index = 0;
+	static char line[16384];
 
-	if (!con_initialized)
-		return;
-
-	if (cls.state == ca_dedicated)
-		return;		// no graphics mode
-
-	// write it to the scrollable buffer
-	Con_PrintToHistory(msg);
+	for (;*msg;msg++)
+	{
+		if (index == 0)
+		{
+			// if this is the beginning of a new line, print timestamp
+			char *timestamp = timestamps.integer ? Sys_TimeString(timeformat.string) : "";
+			// special color codes for chat messages must always come first
+			// for Con_PrintToHistory to work properly
+			if (*msg <= 2)
+				line[index++] = *msg++;
+			// store timestamp
+			for (;*timestamp;index++, timestamp++)
+				if (index < sizeof(line) - 2)
+					line[index] = *timestamp;
+		}
+		// append the character
+		line[index++] = *msg;
+		// if this is a newline character, we have a complete line to print
+		if (*msg == '\n' || index >= 16000)
+		{
+			// terminate the line
+			line[index] = 0;
+			// send to log file
+			Log_ConPrint(line);
+			// send to scrollable buffer
+			if (con_initialized && cls.state != ca_dedicated)
+				Con_PrintToHistory(line);
+			// send to terminal or dedicated server window
+			if (!sys_nostdout)
+			{
+				unsigned char *p;
+				for (p = (unsigned char *) line;*p; p++)
+					*p = qfont_table[*p];
+				Sys_PrintToTerminal(line);
+			}
+			// empty the line buffer
+			index = 0;
+		}
+	}
 }
 
 
@@ -593,7 +637,7 @@ void Con_Printf(const char *fmt, ...)
 	char msg[MAXPRINTMSG];
 
 	va_start(argptr,fmt);
-	vsprintf(msg,fmt,argptr);
+	dpvsnprintf(msg,sizeof(msg),fmt,argptr);
 	va_end(argptr);
 
 	Con_Print(msg);
@@ -629,39 +673,7 @@ void Con_DPrintf(const char *fmt, ...)
 		return;			// don't confuse non-developers with techie stuff...
 
 	va_start(argptr,fmt);
-	vsprintf(msg,fmt,argptr);
-	va_end(argptr);
-
-	Con_Print(msg);
-}
-
-
-/*
-================
-Con_SafePrint
-
-Okay to call even when the screen can't be updated
-==================
-*/
-void Con_SafePrint(const char *msg)
-{
-	Con_Print(msg);
-}
-
-/*
-==================
-Con_SafePrintf
-
-Okay to call even when the screen can't be updated
-==================
-*/
-void Con_SafePrintf(const char *fmt, ...)
-{
-	va_list argptr;
-	char msg[MAXPRINTMSG];
-
-	va_start(argptr,fmt);
-	vsprintf(msg,fmt,argptr);
+	dpvsnprintf(msg,sizeof(msg),fmt,argptr);
 	va_end(argptr);
 
 	Con_Print(msg);
@@ -676,6 +688,73 @@ DRAWING
 ==============================================================================
 */
 
+static vec4_t _con_colors[] =
+{
+	{1.0, 1.0, 1.0, 1.0},
+	{1.0, 0.0, 0.0, 1.0},
+	{0.0, 1.0, 0.0, 1.0},
+	{0.0, 0.0, 1.0, 1.0},
+	{1.0, 1.0, 0.0, 1.0},
+	{0.0, 1.0, 1.0, 1.0},
+	{1.0, 0.0, 1.0, 1.0},
+	{0.1, 0.1, 0.1, 1.0}
+};
+
+#define _con_colors_count	(sizeof(_con_colors) / sizeof(vec3_t))
+#define _con_color_tag		'^'
+
+// color is read and changed in the end
+static void _Con_DrawString( float x, float y, const char *text, int maxlen, float scalex, float scaley, int flags )
+{
+	vec_t *color;
+	const char *first, *last;
+	int len;
+
+	color = _con_colors[0];
+	if( maxlen < 1)
+		len = strlen( text );
+	else
+		len = min( maxlen, (signed) strlen( text ));
+
+    first = last = text;
+	while( 1 ) {
+		// iterate until we get the next color tag or reach the end of the text part to draw
+		for( ; len && *last != _con_color_tag ; len--, last++ )
+			;
+		// dont do anything if we havent read anything yet
+		if( last != text ) {
+			// draw the string
+			DrawQ_String( x, y, first, last - first, scalex, scaley, color[0], color[1], color[2], color[3], flags );
+			// update x to be at the new start position
+			x += (last - first) * scalex;
+			// if we have reached the end, we have finished
+			if( !len )
+				break;
+		}
+		first = last;
+		// jump over the tag
+		last++;
+		len--;
+		if( len && '0' <= *last && *last <= '9' ) {
+			int index = 0;
+
+			while( '0' <= *last && *last <= '9' && len ) {
+				index = index * 10 + *last - '0';
+				if( index < _con_colors_count ) {
+					last++;
+					len--;
+				} else {
+					index /= 10;
+					break;
+				}
+			}
+
+			color = _con_colors[index];
+			// we dont want to display the color tag and the color index
+			first = last;
+		}
+	}
+}
 
 /*
 ================
@@ -719,7 +798,7 @@ void Con_DrawInput (void)
 		text += 1 + key_linepos - con_linewidth;
 
 	// draw it
-	DrawQ_String(0, con_vislines - 16, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
+	_Con_DrawString(0, con_vislines - 16, text, con_linewidth, 8, 8, 0);
 
 	// remove cursor
 //	key_lines[edit_line][key_linepos] = 0;
@@ -762,7 +841,15 @@ void Con_DrawNotify (void)
 			continue;
 		text = con_text + (i % con_totallines)*con_linewidth;
 
-		DrawQ_String(0, v, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
+		if (gamemode == GAME_NEXUIZ) {
+			int linewidth;
+
+			for (linewidth = con_linewidth; linewidth && text[linewidth-1] == ' '; linewidth--);
+			x = (vid.conwidth - linewidth * 8) / 2;
+		} else
+			x = 0;
+
+		_Con_DrawString(x, v, text, con_linewidth, 8, 8, 0);
 
 		v += 8;
 	}
@@ -779,13 +866,13 @@ void Con_DrawNotify (void)
 			sprintf(temptext, "say:%s%c", chat_buffer, (int) 10+((int)(realtime*con_cursorspeed)&1));
 		while (strlen(temptext) >= (size_t) con_linewidth)
 		{
-			DrawQ_String (0, v, temptext, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
+			_Con_DrawString (0, v, temptext, con_linewidth, 8, 8, 0);
 			strcpy(temptext, &temptext[con_linewidth]);
 			v += 8;
 		}
 		if (strlen(temptext) > 0)
 		{
-			DrawQ_String (0, v, temptext, 0, 8, 8, 1, 1, 1, 1, 0);
+			_Con_DrawString (0, v, temptext, 0, 8, 8, 0);
 			v += 8;
 		}
 	}
@@ -826,7 +913,7 @@ void Con_DrawConsole (int lines)
 		j = max(i - con_backscroll, 0);
 		text = con_text + (j % con_totallines)*con_linewidth;
 
-		DrawQ_String(0, y, text, con_linewidth, 8, 8, 1, 1, 1, 1, 0);
+		_Con_DrawString(0, y, text, con_linewidth, 8, 8, 0);
 	}
 
 // draw the input prompt, user text, and cursor if desired