From a260c1b26118b7a16015d50c74e6edcbcb09784f Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Sat, 2 Feb 2013 21:19:59 +0800
Subject: [PATCH] Kernel - Implimented cached escape codes

---
 KernelLand/Kernel/drv/vterm.h         |  3 +++
 KernelLand/Kernel/drv/vterm_termbuf.c | 11 +++------
 KernelLand/Kernel/drv/vterm_vt100.c   | 35 +++++++++++++++++++++------
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/KernelLand/Kernel/drv/vterm.h b/KernelLand/Kernel/drv/vterm.h
index abd786cb..9cfb2b9b 100644
--- a/KernelLand/Kernel/drv/vterm.h
+++ b/KernelLand/Kernel/drv/vterm.h
@@ -64,6 +64,9 @@ struct sVTerm
 	short	ScrollTop;	//!< Top of scrolling region (smallest)
 	short	ScrollHeight;	//!< Length of scrolling region
 
+	char	EscapeCodeCache[16];
+	size_t	EscapeCodeLen;
+
 	 int	VideoCursorX;
 	 int	VideoCursorY;
 	
diff --git a/KernelLand/Kernel/drv/vterm_termbuf.c b/KernelLand/Kernel/drv/vterm_termbuf.c
index 525f1a4b..89511cc8 100644
--- a/KernelLand/Kernel/drv/vterm_termbuf.c
+++ b/KernelLand/Kernel/drv/vterm_termbuf.c
@@ -21,14 +21,11 @@ void VT_int_PutString(tVTerm *Term, const Uint8 *Buffer, Uint Count)
 	for( i = 0; i < Count; i++ )
 	{
 		// Handle escape sequences
-		if( Buffer[i] == 0x1B && Count - i > 1 )
+		int ret = VT_int_ParseEscape(Term, (const char*)&Buffer[i], Count-i);
+		if( ret > 0 )
 		{
-			int ret = VT_int_ParseEscape(Term, (const char*)&Buffer[i+1], Count-(i+1));
-			if( ret > 0 )
-			{
-				i += ret;
-				continue;
-			}
+			i += ret;
+			continue;
 		}
 		
 		// Fast check for non UTF-8
diff --git a/KernelLand/Kernel/drv/vterm_vt100.c b/KernelLand/Kernel/drv/vterm_vt100.c
index 6d123e5c..51666331 100644
--- a/KernelLand/Kernel/drv/vterm_vt100.c
+++ b/KernelLand/Kernel/drv/vterm_vt100.c
@@ -229,8 +229,24 @@ int VT_int_ParseEscape(tVTerm *Term, const char *Buffer, size_t Bytes)
 	 int	argc = 0, j = 0;
 	 int	args[6] = {0,0,0,0};
 	 int	bQuestionMark = 0;
+	const int	ofs = Term->EscapeCodeLen;
+	const int	sparespace = sizeof(Term->EscapeCodeCache)-Term->EscapeCodeLen;
+	const int	copysize = MIN(Bytes, sparespace);
 
-	if( Bytes == j )	return j;
+	memcpy( Term->EscapeCodeCache + Term->EscapeCodeLen, Buffer, copysize );
+	Term->EscapeCodeLen += copysize;
+	
+	Bytes = Term->EscapeCodeLen;
+	Buffer = Term->EscapeCodeCache;
+
+	if( Bytes == j )	return j-ofs;
+	c = Buffer[j++];
+	if(c != '\x1b') {
+		Term->EscapeCodeLen = 0;
+		return 0;
+	}
+
+	if( Bytes == j )	return j-ofs;
 	c = Buffer[j++];
 
 	switch(c)
@@ -238,24 +254,24 @@ int VT_int_ParseEscape(tVTerm *Term, const char *Buffer, size_t Bytes)
 	//Large Code
 	case '[':
 		// Get Arguments
-		if(Bytes == j)	return j;
+		if(Bytes == j)	return j-ofs;
 		c = Buffer[j++];
 		if(c == '?') {
 			bQuestionMark = 1;
-			if(Bytes == j)	return j;
+			if(Bytes == j)	return j-ofs;
 			c = Buffer[j++];
 		}
 		if( '0' <= c && c <= '9' )
 		{
 			do {
 				if(c == ';') {
-					if(Bytes == j)	return j;
+					if(Bytes == j)	return j-ofs;
 					c = Buffer[j++];
 				}
 				while('0' <= c && c <= '9') {
 					args[argc] *= 10;
 					args[argc] += c-'0';
-					if(Bytes == j)	return j;
+					if(Bytes == j)	return j-ofs;
 					c = Buffer[j++];
 				}
 				argc ++;
@@ -265,8 +281,10 @@ int VT_int_ParseEscape(tVTerm *Term, const char *Buffer, size_t Bytes)
 		// Get Command
 		if( !('a' <= c && c <= 'z') && !('A' <= c && c <= 'Z') )
 		{
-			// Error
-			return j;
+			// Error - eat ESC only?
+			// > j : Entire code skipped
+			Term->EscapeCodeLen = 0;
+			return j-ofs;
 		}
 		
 		if( bQuestionMark )
@@ -325,5 +343,6 @@ int VT_int_ParseEscape(tVTerm *Term, const char *Buffer, size_t Bytes)
 	}
 	
 	//Log_Debug("VTerm", "j = %i, Buffer = '%s'", j, Buffer);
-	return j;
+	Term->EscapeCodeLen = 0;
+	return j-ofs;
 }
-- 
2.20.1