X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdrv%2Fvterm_vt100.c;fp=KernelLand%2FKernel%2Fdrv%2Fvterm_vt100.c;h=51666331efb1344e64b1413c64c5babee6055e57;hb=a260c1b26118b7a16015d50c74e6edcbcb09784f;hp=6d123e5cc7bbde6b3795fbbf2d5f16ab359ba6d3;hpb=c75ade4d4456b1db0e59531542cfcb71b1c2551e;p=tpg%2Facess2.git

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;
 }