From a9280457258a01c83e56d9d4d38caa3adedf6d66 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Tue, 4 Jan 2005 07:26:49 +0000
Subject: [PATCH] ^s and ^r stack based console masks added.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@704 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/console.c | 112 ++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 61 deletions(-)

diff --git a/engine/client/console.c b/engine/client/console.c
index 601b02d65..e52f7b716 100644
--- a/engine/client/console.c
+++ b/engine/client/console.c
@@ -523,6 +523,9 @@ void Con_PrintCon (char *txt, console_t *con)
 	static int	cr;
 	int		mask;
 
+	int maskstack[4];
+	int maskstackdepth = 0;
+
 	if (txt[0] == 1 || txt[0] == 2)
 	{
 		mask = CON_STANDARDMASK|CON_WHITEMASK;		// go to colored text
@@ -548,51 +551,36 @@ void Con_PrintCon (char *txt, console_t *con)
 				txt+=2;
 				continue;
 			}
-			if (txt[1] == 's')
+			if (txt[1] == 'a')
 			{
 				mask = (mask & ~CON_2NDCHARSETTEXT) + (CON_2NDCHARSETTEXT - (mask & CON_2NDCHARSETTEXT));
 				txt+=2;
 				continue;
 			}
+			if (txt[1] == 's')
+			{
+				if (maskstackdepth < sizeof(maskstack)/sizeof(maskstack[0]))
+				{
+					maskstack[maskstackdepth] = mask;
+					maskstackdepth++;
+				}
+				txt+=2;
+				continue;
+			}
+			if (txt[1] == 'r')
+			{
+				if (maskstackdepth)
+				{
+					maskstackdepth--;
+					mask = maskstack[maskstackdepth];
+				}
+				txt+=2;
+				continue;
+			}
 		}
 		if (c=='\t')
 			c = ' ';
 
-		/*
-		if (c == INVIS_CHAR1 || c == INVIS_CHAR2 || c == INVIS_CHAR3)
-		{
-			int col=0;
-			if (c == INVIS_CHAR1)
-				col=1;
-			else if (c == INVIS_CHAR2)
-				col=2;
-			else if (c == INVIS_CHAR3)
-				col=4;
-
-			if (col)
-			{
-				if (txt[1] == INVIS_CHAR1)
-				{
-					col|=1;
-					txt++;
-				}
-				else if (txt[1] == INVIS_CHAR2)
-				{
-					col|=2;
-					txt++;
-				}
-				else if (txt[1] == INVIS_CHAR3)
-				{
-					col|=4;
-					txt++;
-				}
-
-				mask = c*256;
-				txt+=1;
-				continue;
-			}
-		}
-*/
 	// count word length
 		for (l=0 ; l< con->linewidth ; l++)
 			if ( txt[l] <= ' ')
@@ -624,10 +612,10 @@ void Con_PrintCon (char *txt, console_t *con)
 			con->x = 0;
 			break;
 
-/*		case '\r':
+		case '\r':
 			con->x = 0;
 			cr = 1;
-			break;*/
+			break;
 
 		default:	// display character and advance
 			y = con->current % con->totallines;
@@ -832,6 +820,9 @@ void Con_DrawInput (void)
 	unsigned char	*text, *fname;
 	extern int con_commandmatch;
 
+	int maskstack[4];
+	int maskstackdepth = 0;
+
 	int oc;
 
 	int si, x;
@@ -859,13 +850,13 @@ void Con_DrawInput (void)
 		if ((int)(realtime*con_cursorspeed)&1)
 		{
 			text[key_linepos] = 11;
-			strcat(text, "^2");
+			mask = COLOR_GREEN<<8;
 			if (*(fname+si))	//make sure we arn't skipping a null char
 				strcat(text, fname+si+1);
 		}
 		else
 		{
-			strcat(text, "^2");
+			mask = COLOR_GREEN<<8;
 			strcat(text, fname+si);
 		}
 	}
@@ -874,22 +865,7 @@ void Con_DrawInput (void)
 	else if (!text[key_linepos])
 		text[key_linepos] = 10;
 
-	for (i=0,p=0; ;p++)	//work out exactly how many charactures there really are. //FIXME: cache this
-	{
-		if (text[p] == '^')
-		{
-			if (text[p+1]>='0' && text[p+1]<='9')
-			{				
-				p++;
-				continue;
-			}
-			else if (text[p+1] == '^')
-				p++;
-		}
-		if (!text[p])
-			break;
-		i++;
-	}
+	i = strlen(text);
 
 	if (i >= con->linewidth)	//work out the start point
 		si = i - con->linewidth;
@@ -903,13 +879,27 @@ void Con_DrawInput (void)
 		if (text[p] == '^')
 		{
 			if (text[p+1]>='0' && text[p+1]<'8')
+				mask = (text[p+1]-'0')*256 + (mask&~CON_COLOURMASK);	//change colour only.
+			else if (text[p+1] == 'b')
+				mask = (mask & ~CON_BLINKTEXT) + (CON_BLINKTEXT - (mask & CON_BLINKTEXT));
+			else if (text[p+1] == 'a')	//alternate
+				mask = (mask & ~CON_2NDCHARSETTEXT) + (CON_2NDCHARSETTEXT - (mask & CON_2NDCHARSETTEXT));
+			else if (text[p+1] == 's')	//store on stack (it's great for names)
 			{
-				mask = (text[p+1]-'0')*256;
-				p++;
-				continue;
+				if (maskstackdepth < sizeof(maskstack)/sizeof(maskstack[0]))
+				{
+					maskstack[maskstackdepth] = mask;
+					maskstackdepth++;
+				}
+			}
+			else if (text[p+1] == 'r')	//restore from stack (it's great for names)
+			{
+				if (maskstackdepth)
+				{
+					maskstackdepth--;
+					mask = maskstack[maskstackdepth];
+				}
 			}
-			else if (text[p+1] == '^')
-				p++;
 		}
 		if (!text[p])
 			break;