X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=common.c;h=12a42555b96b4cbc545c6a17ef14ffe135b77ddc;hb=0d368b1865e1de4c00689959407d40bf6817233e;hp=42511e494bff671e8d094886b3ae8d5e640b2217;hpb=d1a66b1504773e5da10463fd15d524697b0c2ba2;p=xonotic%2Fdarkplaces.git

diff --git a/common.c b/common.c
index 42511e49..12a42555 100644
--- a/common.c
+++ b/common.c
@@ -51,68 +51,78 @@ char com_modname[MAX_OSPATH] = "";
 ============================================================================
 */
 
-short   ShortSwap (short l)
-{
-	unsigned char    b1,b2;
-
-	b1 = l&255;
-	b2 = (l>>8)&255;
 
-	return (b1<<8) + b2;
+float BuffBigFloat (const unsigned char *buffer)
+{
+	union
+	{
+		float f;
+		unsigned int i;
+	}
+	u;
+	u.i = (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3];
+	return u.f;
 }
 
-int    LongSwap (int l)
+int BuffBigLong (const unsigned char *buffer)
 {
-	unsigned char    b1,b2,b3,b4;
-
-	b1 = l&255;
-	b2 = (l>>8)&255;
-	b3 = (l>>16)&255;
-	b4 = (l>>24)&255;
+	return (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3];
+}
 
-	return ((int)b1<<24) + ((int)b2<<16) + ((int)b3<<8) + b4;
+short BuffBigShort (const unsigned char *buffer)
+{
+	return (buffer[0] << 8) | buffer[1];
 }
 
-float FloatSwap (float f)
+float BuffLittleFloat (const unsigned char *buffer)
 {
 	union
 	{
-		float   f;
-		unsigned char    b[4];
-	} dat1, dat2;
-
-
-	dat1.f = f;
-	dat2.b[0] = dat1.b[3];
-	dat2.b[1] = dat1.b[2];
-	dat2.b[2] = dat1.b[1];
-	dat2.b[3] = dat1.b[0];
-	return dat2.f;
+		float f;
+		unsigned int i;
+	}
+	u;
+	u.i = (buffer[3] << 24) | (buffer[2] << 16) | (buffer[1] << 8) | buffer[0];
+	return u.f;
 }
 
+int BuffLittleLong (const unsigned char *buffer)
+{
+	return (buffer[3] << 24) | (buffer[2] << 16) | (buffer[1] << 8) | buffer[0];
+}
 
-// Extract integers from buffers
-
-unsigned int BuffBigLong (const unsigned char *buffer)
+short BuffLittleShort (const unsigned char *buffer)
 {
-	return (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3];
+	return (buffer[1] << 8) | buffer[0];
 }
 
-unsigned short BuffBigShort (const unsigned char *buffer)
+void StoreBigLong (unsigned char *buffer, unsigned int i)
 {
-	return (buffer[0] << 8) | buffer[1];
+	buffer[0] = (i >> 24) & 0xFF;
+	buffer[1] = (i >> 16) & 0xFF;
+	buffer[2] = (i >>  8) & 0xFF;
+	buffer[3] = i         & 0xFF;
 }
 
-unsigned int BuffLittleLong (const unsigned char *buffer)
+void StoreBigShort (unsigned char *buffer, unsigned short i)
 {
-	return (buffer[3] << 24) | (buffer[2] << 16) | (buffer[1] << 8) | buffer[0];
+	buffer[0] = (i >>  8) & 0xFF;
+	buffer[1] = i         & 0xFF;
 }
 
-unsigned short BuffLittleShort (const unsigned char *buffer)
+void StoreLittleLong (unsigned char *buffer, unsigned int i)
 {
-	return (buffer[1] << 8) | buffer[0];
+	buffer[0] = i         & 0xFF;
+	buffer[1] = (i >>  8) & 0xFF;
+	buffer[2] = (i >> 16) & 0xFF;
+	buffer[3] = (i >> 24) & 0xFF;
 }
 
+void StoreLittleShort (unsigned char *buffer, unsigned short i)
+{
+	buffer[0] = i         & 0xFF;
+	buffer[1] = (i >>  8) & 0xFF;
+}
 
 /*
 ============================================================================
@@ -173,6 +183,14 @@ unsigned short CRC_Block(const unsigned char *data, size_t size)
 	return crc ^ CRC_XOR_VALUE;
 }
 
+unsigned short CRC_Block_CaseInsensitive(const unsigned char *data, size_t size)
+{
+	unsigned short crc = CRC_INIT_VALUE;
+	while (size--)
+		crc = (crc << 8) ^ crctable[(crc >> 8) ^ (tolower(*data++))];
+	return crc ^ CRC_XOR_VALUE;
+}
+
 // QuakeWorld
 static unsigned char chktbl[1024 + 4] =
 {
@@ -635,7 +653,7 @@ void Com_HexDumpToConsole(const unsigned char *data, int size)
 					*cur++ = STRING_COLOR_TAG;
 					*cur++ = STRING_COLOR_TAG;
 				}
-				else if (d[j] >= ' ')
+				else if (d[j] >= (unsigned char) ' ')
 					*cur++ = d[j];
 				else
 					*cur++ = '.';
@@ -662,6 +680,306 @@ void SZ_HexDumpToConsole(const sizebuf_t *buf)
 
 //============================================================================
 
+/*
+==============
+COM_Wordwrap
+
+Word wraps a string. The wordWidth function is guaranteed to be called exactly
+once for each word in the string, so it may be stateful, no idea what that
+would be good for any more. At the beginning of the string, it will be called
+for the char 0 to initialize a clean state, and then once with the string " "
+(a space) so the routine knows how long a space is.
+
+In case no single character fits into the given width, the wordWidth function
+must return the width of exactly one character.
+
+Wrapped lines get the isContinuation flag set and are continuationWidth less wide.
+
+The sum of the return values of the processLine function will be returned.
+==============
+*/
+int COM_Wordwrap(const char *string, size_t length, float continuationWidth, float maxWidth, COM_WordWidthFunc_t wordWidth, void *passthroughCW, COM_LineProcessorFunc processLine, void *passthroughPL)
+{
+	// Logic is as follows:
+	//
+	// For each word or whitespace:
+	//   Newline found? Output current line, advance to next line. This is not a continuation. Continue.
+	//   Space found? Always add it to the current line, no matter if it fits.
+	//   Word found? Check if current line + current word fits.
+	//     If it fits, append it. Continue.
+	//     If it doesn't fit, output current line, advance to next line. Append the word. This is a continuation. Continue.
+
+	qboolean isContinuation = false;
+	float spaceWidth;
+	const char *startOfLine = string;
+	const char *cursor = string;
+	const char *end = string + length;
+	float spaceUsedInLine = 0;
+	float spaceUsedForWord;
+	int result = 0;
+	size_t wordLen;
+	size_t dummy;
+
+	dummy = 0;
+	wordWidth(passthroughCW, NULL, &dummy, -1);
+	dummy = 1;
+	spaceWidth = wordWidth(passthroughCW, " ", &dummy, -1);
+
+	for(;;)
+	{
+		char ch = (cursor < end) ? *cursor : 0;
+		switch(ch)
+		{
+			case 0: // end of string
+				result += processLine(passthroughPL, startOfLine, cursor - startOfLine, spaceUsedInLine, isContinuation);
+				isContinuation = false;
+				goto out;
+				break;
+			case '\n': // end of line
+				result += processLine(passthroughPL, startOfLine, cursor - startOfLine, spaceUsedInLine, isContinuation);
+				isContinuation = false;
+				++cursor;
+				startOfLine = cursor;
+				break;
+			case ' ': // space
+				++cursor;
+				spaceUsedInLine += spaceWidth;
+				break;
+			default: // word
+				wordLen = 1;
+				while(cursor + wordLen < end)
+				{
+					switch(cursor[wordLen])
+					{
+						case 0:
+						case '\n':
+						case ' ':
+							goto out_inner;
+						default:
+							++wordLen;
+							break;
+					}
+				}
+				out_inner:
+				spaceUsedForWord = wordWidth(passthroughCW, cursor, &wordLen, maxWidth - continuationWidth); // this may have reduced wordLen when it won't fit - but this is GOOD. TODO fix words that do fit in a non-continuation line
+				if(wordLen < 1) // cannot happen according to current spec of wordWidth
+				{
+					wordLen = 1;
+					spaceUsedForWord = maxWidth + 1; // too high, forces it in a line of itself
+				}
+				if(spaceUsedInLine + spaceUsedForWord <= maxWidth || cursor == startOfLine)
+				{
+					// we can simply append it
+					cursor += wordLen;
+					spaceUsedInLine += spaceUsedForWord;
+				}
+				else
+				{
+					// output current line
+					result += processLine(passthroughPL, startOfLine, cursor - startOfLine, spaceUsedInLine, isContinuation);
+					isContinuation = true;
+					startOfLine = cursor;
+					cursor += wordLen;
+					spaceUsedInLine = continuationWidth + spaceUsedForWord;
+				}
+		}
+	}
+	out:
+
+	return result;
+
+/*
+	qboolean isContinuation = false;
+	float currentWordSpace = 0;
+	const char *currentWord = 0;
+	float minReserve = 0;
+
+	float spaceUsedInLine = 0;
+	const char *currentLine = 0;
+	const char *currentLineEnd = 0;
+	float currentLineFinalWhitespace = 0;
+	const char *p;
+
+	int result = 0;
+	minReserve = charWidth(passthroughCW, 0);
+	minReserve += charWidth(passthroughCW, ' ');
+
+	if(maxWidth < continuationWidth + minReserve)
+		maxWidth = continuationWidth + minReserve;
+
+	charWidth(passthroughCW, 0);
+
+	for(p = string; p < string + length; ++p)
+	{
+		char c = *p;
+		float w = charWidth(passthroughCW, c);
+
+		if(!currentWord)
+		{
+			currentWord = p;
+			currentWordSpace = 0;
+		}
+
+		if(!currentLine)
+		{
+			currentLine = p;
+			spaceUsedInLine = isContinuation ? continuationWidth : 0;
+			currentLineEnd = 0;
+		}
+
+		if(c == ' ')
+		{
+			// 1. I can add the word AND a space - then just append it.
+			if(spaceUsedInLine + currentWordSpace + w <= maxWidth)
+			{
+				currentLineEnd = p; // note: space not included here
+				currentLineFinalWhitespace = w;
+				spaceUsedInLine += currentWordSpace + w;
+			}
+			// 2. I can just add the word - then append it, output current line and go to next one.
+			else if(spaceUsedInLine + currentWordSpace <= maxWidth)
+			{
+				result += processLine(passthroughPL, currentLine, p - currentLine, spaceUsedInLine + currentWordSpace, isContinuation);
+				currentLine = 0;
+				isContinuation = true;
+			}
+			// 3. Otherwise, output current line and go to next one, where I can add the word.
+			else if(continuationWidth + currentWordSpace + w <= maxWidth)
+			{
+				if(currentLineEnd)
+					result += processLine(passthroughPL, currentLine, currentLineEnd - currentLine, spaceUsedInLine - currentLineFinalWhitespace, isContinuation);
+				currentLine = currentWord;
+				spaceUsedInLine = continuationWidth + currentWordSpace + w;
+				currentLineEnd = p;
+				currentLineFinalWhitespace = w;
+				isContinuation = true;
+			}
+			// 4. We can't even do that? Then output both current and next word as new lines.
+			else
+			{
+				if(currentLineEnd)
+				{
+					result += processLine(passthroughPL, currentLine, currentLineEnd - currentLine, spaceUsedInLine - currentLineFinalWhitespace, isContinuation);
+					isContinuation = true;
+				}
+				result += processLine(passthroughPL, currentWord, p - currentWord, currentWordSpace, isContinuation);
+				currentLine = 0;
+				isContinuation = true;
+			}
+			currentWord = 0;
+		}
+		else if(c == '\n')
+		{
+			// 1. I can add the word - then do it.
+			if(spaceUsedInLine + currentWordSpace <= maxWidth)
+			{
+				result += processLine(passthroughPL, currentLine, p - currentLine, spaceUsedInLine + currentWordSpace, isContinuation);
+			}
+			// 2. Otherwise, output current line, next one and make tabula rasa.
+			else
+			{
+				if(currentLineEnd)
+				{
+					processLine(passthroughPL, currentLine, currentLineEnd - currentLine, spaceUsedInLine - currentLineFinalWhitespace, isContinuation);
+					isContinuation = true;
+				}
+				result += processLine(passthroughPL, currentWord, p - currentWord, currentWordSpace, isContinuation);
+			}
+			currentWord = 0;
+			currentLine = 0;
+			isContinuation = false;
+		}
+		else
+		{
+			currentWordSpace += w;
+			if(
+				spaceUsedInLine + currentWordSpace > maxWidth // can't join this line...
+				&&
+				continuationWidth + currentWordSpace > maxWidth // can't join any other line...
+			)
+			{
+				// this word cannot join ANY line...
+				// so output the current line...
+				if(currentLineEnd)
+				{
+					result += processLine(passthroughPL, currentLine, currentLineEnd - currentLine, spaceUsedInLine - currentLineFinalWhitespace, isContinuation);
+					isContinuation = true;
+				}
+
+				// then this word's beginning...
+				if(isContinuation)
+				{
+					// it may not fit, but we know we have to split it into maxWidth - continuationWidth pieces
+					float pieceWidth = maxWidth - continuationWidth;
+					const char *pos = currentWord;
+					currentWordSpace = 0;
+
+					// reset the char width function to a state where no kerning occurs (start of word)
+					charWidth(passthroughCW, ' ');
+					while(pos <= p)
+					{
+						float w = charWidth(passthroughCW, *pos);
+						if(currentWordSpace + w > pieceWidth) // this piece won't fit any more
+						{
+							// print everything until it
+							result += processLine(passthroughPL, currentWord, pos - currentWord, currentWordSpace, true);
+							// go to here
+							currentWord = pos;
+							currentWordSpace = 0;
+						}
+						currentWordSpace += w;
+						++pos;
+					}
+					// now we have a currentWord that fits... set up its next line
+					// currentWordSpace has been set
+					// currentWord has been set
+					spaceUsedInLine = continuationWidth;
+					currentLine = currentWord;
+					currentLineEnd = 0;
+					isContinuation = true;
+				}
+				else
+				{
+					// we have a guarantee that it will fix (see if clause)
+					result += processLine(passthroughPL, currentWord, p - currentWord, currentWordSpace - w, isContinuation);
+
+					// and use the rest of this word as new start of a line
+					currentWordSpace = w;
+					currentWord = p;
+					spaceUsedInLine = continuationWidth;
+					currentLine = p;
+					currentLineEnd = 0;
+					isContinuation = true;
+				}
+			}
+		}
+	}
+
+	if(!currentWord)
+	{
+		currentWord = p;
+		currentWordSpace = 0;
+	}
+
+	if(currentLine) // Same procedure as \n
+	{
+		// Can I append the current word?
+		if(spaceUsedInLine + currentWordSpace <= maxWidth)
+			result += processLine(passthroughPL, currentLine, p - currentLine, spaceUsedInLine + currentWordSpace, isContinuation);
+		else
+		{
+			if(currentLineEnd)
+			{
+				result += processLine(passthroughPL, currentLine, currentLineEnd - currentLine, spaceUsedInLine - currentLineFinalWhitespace, isContinuation);
+				isContinuation = true;
+			}
+			result += processLine(passthroughPL, currentWord, p - currentWord, currentWordSpace, isContinuation);
+		}
+	}
+
+	return result;
+*/
+}
 
 /*
 ==============
@@ -691,7 +1009,7 @@ skipwhite:
 	// UNIX: \n
 	// Mac: \r
 	// Windows: \r\n
-	for (;*data <= ' ' && ((*data != '\n' && *data != '\r') || !returnnewline);data++)
+	for (;ISWHITESPACE(*data) && ((*data != '\n' && *data != '\r') || !returnnewline);data++)
 	{
 		if (*data == 0)
 		{
@@ -767,7 +1085,7 @@ skipwhite:
 	else
 	{
 		// regular word
-		for (;*data > ' ';data++)
+		for (;!ISWHITESPACE(*data);data++)
 			if (len < (int)sizeof(com_token) - 1)
 				com_token[len++] = *data;
 		com_token[len] = 0;
@@ -804,7 +1122,7 @@ skipwhite:
 	// UNIX: \n
 	// Mac: \r
 	// Windows: \r\n
-	for (;*data <= ' ' && ((*data != '\n' && *data != '\r') || !returnnewline);data++)
+	for (;ISWHITESPACE(*data) && ((*data != '\n' && *data != '\r') || !returnnewline);data++)
 	{
 		if (*data == 0)
 		{
@@ -881,7 +1199,7 @@ skipwhite:
 	else
 	{
 		// regular word
-		for (;*data > ' ' && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != ':' && *data != ',' && *data != ';';data++)
+		for (;!ISWHITESPACE(*data) && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != ':' && *data != ',' && *data != ';';data++)
 			if (len < (int)sizeof(com_token) - 1)
 				com_token[len++] = *data;
 		com_token[len] = 0;
@@ -918,7 +1236,7 @@ skipwhite:
 	// UNIX: \n
 	// Mac: \r
 	// Windows: \r\n
-	for (;*data <= ' ' && ((*data != '\n' && *data != '\r') || !returnnewline);data++)
+	for (;ISWHITESPACE(*data) && ((*data != '\n' && *data != '\r') || !returnnewline);data++)
 	{
 		if (*data == 0)
 		{
@@ -995,7 +1313,7 @@ skipwhite:
 	else
 	{
 		// regular word
-		for (;*data > ' ' && *data != ',' && *data != ';' && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != ':' && *data != ',' && *data != ';';data++)
+		for (;!ISWHITESPACE(*data) && *data != ',' && *data != ';' && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != ':' && *data != ',' && *data != ';';data++)
 			if (len < (int)sizeof(com_token) - 1)
 				com_token[len++] = *data;
 		com_token[len] = 0;
@@ -1027,7 +1345,7 @@ int COM_ParseToken_Console(const char **datapointer)
 
 // skip whitespace
 skipwhite:
-	for (;*data <= ' ';data++)
+	for (;ISWHITESPACE(*data);data++)
 	{
 		if (*data == 0)
 		{
@@ -1063,7 +1381,7 @@ skipwhite:
 	else
 	{
 		// regular word
-		for (;*data > ' ';data++)
+		for (;!ISWHITESPACE(*data);data++)
 			if (len < (int)sizeof(com_token) - 1)
 				com_token[len++] = *data;
 		com_token[len] = 0;
@@ -1112,8 +1430,8 @@ typedef struct gamemode_info_s
 	const char* gameuserdirname;
 } gamemode_info_t;
 
-static const gamemode_info_t gamemode_info [] =
-{// prog_name		cmdline			gamename				gamedirname	gamescreenshotname
+static const gamemode_info_t gamemode_info [GAME_COUNT] =
+{// prog_name		cmdline			gamename				basegame	modgame			screenshotprefix	userdir
 
 // GAME_NORMAL
 // COMMANDLINEOPTION: Game: -quake runs the game Quake (default)
@@ -1163,9 +1481,9 @@ static const gamemode_info_t gamemode_info [] =
 // GAME_PRYDON
 // COMMANDLINEOPTION: Game: -prydon runs the topdown point and click action-RPG Prydon Gate
 { "prydon",			"-prydon",		"PrydonGate",			"id1",		"prydon",		"prydon",		"darkplaces" },
-// GAME_NETHERWORLD
-// COMMANDLINEOPTION: Game: -netherworld runs the game Netherworld: Dark Master
-{ "netherworld",	"-netherworld",	"Netherworld: Dark Master",	"id1",		"netherworld", 	"nw",			"darkplaces" },
+// GAME_DELUXEQUAKE
+// COMMANDLINEOPTION: Game: -dq runs the game Deluxe Quake
+{ "dq",	"-dq",	"Deluxe Quake",		"basedq",		"extradq",		"basedq",		"dq" },
 // GAME_THEHUNTED
 // COMMANDLINEOPTION: Game: -thehunted runs the game The Hunted
 { "thehunted",		"-thehunted",	"The Hunted",			"thdata",	NULL, 			"th",			"thehunted" },
@@ -1178,6 +1496,18 @@ static const gamemode_info_t gamemode_info [] =
 // GAME_CONTAGIONTHEORY
 // COMMANDLINEOPTION: Game: -contagiontheory runs the game Contagion Theory
 { "contagiontheory",		"-contagiontheory",	"Contagion Theory",			"ctdata",	NULL, 			"ct",			"contagiontheory" },
+// GAME_EDU2P
+// COMMANDLINEOPTION: Game: -edu2p runs the game Edu2 prototype
+{ "edu2p", "-edu2p", "EDU2 Prototype", "id1", "edu2", "edu2_p", "edu2prototype" },
+// GAME_BLADEMASTER
+// COMMANDLINEOPTION: Game: -blademaster runs the game Prophecy: Return of the BladeMaster
+{ "blademaster", "-blademaster", "Prophecy: Return of the BladeMaster", "basebm", NULL, "blademaster", "blademaster" },
+// GAME_PROPHECY
+// COMMANDLINEOPTION: Game: -prophecy runs the game Quake (default)
+{ "prophecy",				"-prophecy",		"Prophecy",		"data",		NULL,			"prophecy",			"prophecy" },
+// GAME_BLOODOMNICIDE
+// COMMANDLINEOPTION: Game: -omnicide runs the game Blood Omnicide
+{ "omnicide", "-omnicide", "Blood Omnicide", "kain", NULL, "omnicide", "omnicide" },
 };
 
 void COM_InitGameType (void)
@@ -1309,7 +1639,11 @@ int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_list ar
 {
 	int result;
 
+#if _MSC_VER >= 1400
+	result = _vsnprintf_s (buffer, buffersize, _TRUNCATE, format, args);
+#else
 	result = vsnprintf (buffer, buffersize, format, args);
+#endif
 	if (result < 0 || (size_t)result >= buffersize)
 	{
 		buffer[buffersize - 1] = '\0';
@@ -1375,7 +1709,7 @@ int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *t
 		commentprefixlength = (int)strlen(commentprefix);
 	while (*l && *l != '\n' && *l != '\r')
 	{
-		if (*l > ' ')
+		if (!ISWHITESPACE(*l))
 		{
 			if (commentprefixlength && !strncmp(l, commentprefix, commentprefixlength))
 			{
@@ -1400,7 +1734,7 @@ int COM_ReadAndTokenizeLine(const char **text, char **argv, int maxargc, char *t
 			}
 			else
 			{
-				while (*l > ' ')
+				while (!ISWHITESPACE(*l))
 				{
 					if (tokenbuf >= tokenbufend)
 						return -1;
@@ -1459,6 +1793,17 @@ COM_StringLengthNoColors(const char *s, size_t size_s, qboolean *valid)
 				++s;
 				switch((s == end) ? 0 : *s)
 				{
+					case STRING_COLOR_RGB_TAG_CHAR:
+						if (s+1 != end && isxdigit(s[1]) &&
+							s+2 != end && isxdigit(s[2]) &&
+							s+3 != end && isxdigit(s[3]) )
+						{
+							s+=3;
+							break;
+						}
+						++len; // STRING_COLOR_TAG
+						++len; // STRING_COLOR_RGB_TAG_CHAR
+						break;
 					case 0: // ends with unfinished color code!
 						++len;
 						if(valid)
@@ -1497,7 +1842,7 @@ for example).
 
 If the output buffer size did not suffice for converting, the function returns
 FALSE. Generally, if escape_carets is false, the output buffer needs
-strlen(str)+1 bytes, and if escape_carets is true, it can need strlen(str)+2
+strlen(str)+1 bytes, and if escape_carets is true, it can need strlen(str)*1.5+2
 bytes. In any case, the function makes sure that the resulting string is
 zero terminated.
 
@@ -1523,6 +1868,19 @@ COM_StringDecolorize(const char *in, size_t size_in, char *out, size_t size_out,
 				++in;
 				switch((in == end) ? 0 : *in)
 				{
+					case STRING_COLOR_RGB_TAG_CHAR:
+						if (in+1 != end && isxdigit(in[1]) &&
+							in+2 != end && isxdigit(in[2]) &&
+							in+3 != end && isxdigit(in[3]) )
+						{
+							in+=3;
+							break;
+						}
+						APPEND(STRING_COLOR_TAG);
+						if(escape_carets)
+							APPEND(STRING_COLOR_TAG);
+						APPEND(STRING_COLOR_RGB_TAG_CHAR);
+						break;
 					case 0: // ends with unfinished color code!
 						APPEND(STRING_COLOR_TAG);
 						// finish the code by appending another caret when escaping
@@ -1712,7 +2070,7 @@ void InfoString_SetValue(char *buffer, size_t bufferlength, const char *key, con
 		// set the key/value and append the remaining text
 		char tempbuffer[4096];
 		strlcpy(tempbuffer, buffer + pos2, sizeof(tempbuffer));
-		sprintf(buffer + pos, "\\%s\\%s%s", key, value, tempbuffer);
+		dpsnprintf(buffer + pos, bufferlength - pos, "\\%s\\%s%s", key, value, tempbuffer);
 	}
 	else
 	{
@@ -1833,3 +2191,25 @@ strlcpy(char *dst, const char *src, size_t siz)
 }
 
 #endif  // #ifndef HAVE_STRLCPY
+
+void FindFraction(double val, int *num, int *denom, int denomMax)
+{
+	int i;
+	double bestdiff;
+	// initialize
+	bestdiff = fabs(val);
+	*num = 0;
+	*denom = 1;
+
+	for(i = 1; i <= denomMax; ++i)
+	{
+		int inum = (int) floor(0.5 + val * i);
+		double diff = fabs(val - inum / (double)i);
+		if(diff < bestdiff)
+		{
+			bestdiff = diff;
+			*num = inum;
+			*denom = i;
+		}
+	}
+}