X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Fgui_shell_src%2Fvt100.c;h=f73f452917764c7d421974c62df60ca1a283dbd4;hb=b5aad1760060dd031d23887cfe8d64a3f287c34a;hp=51c8016fe342c10fc25a29f6ffa3a5d5e1eae68d;hpb=f194730e75d6d3681e5f99a4efed1616fd1ea738;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/gui_shell_src/vt100.c b/Usermode/Applications/gui_shell_src/vt100.c
index 51c8016f..f73f4529 100644
--- a/Usermode/Applications/gui_shell_src/vt100.c
+++ b/Usermode/Applications/gui_shell_src/vt100.c
@@ -2,42 +2,75 @@
  * Acess GUI Terminal
  * - By John Hodge (thePowersGang)
  *
- * main.c
- * - Core
+ * vt100.c
+ * - VT100/xterm Emulation
  */
 #include <string.h>
+#include <limits.h>
 #include "include/vt100.h"
 #include "include/display.h"
+#include <ctype.h>	// isalpha
+#include <acess/sys.h>	// _SysDebug
+
+ int	Term_HandleVT100_Long(int Len, const char *Buf);
+
+static inline int min(int a, int b)
+{
+	return a < b ? a : b;
+}
 
 int Term_HandleVT100(int Len, const char *Buf)
 {
-	const int	max_length = 16;
-	static char	inc_buf[max_length]
+	#define	MAX_VT100_ESCAPE_LEN	16
+	static char	inc_buf[MAX_VT100_ESCAPE_LEN];
 	static int	inc_len = 0;
 
 	if( inc_len > 0	|| *Buf == '\x1b' )
 	{
-		memcpy(inc_buf + inc_len, Buf, min(max_length - inc_len, Len));
+		 int	new_bytes = min(MAX_VT100_ESCAPE_LEN - inc_len, Len);
+		 int	ret = 0;
+		memcpy(inc_buf + inc_len, Buf, new_bytes);
+		inc_len += new_bytes;
 		// Handle VT100 (like) escape sequence
-		
-		inc_len = 0;
-		return 1;
+
+		_SysDebug("inc_len = %i, new_bytes = %i", inc_len, new_bytes);
+
+		if( inc_len <= 1 )
+			return 1;	// Skip 1 character (the '\x1b')
+
+		switch(inc_buf[1])
+		{
+		case '[':	// Multibyte, funtime starts	
+			ret = Term_HandleVT100_Long(inc_len-2, inc_buf+2);
+			if( ret > 0 )
+				ret += 2;
+			break;
+		default:
+			ret = 2;
+			break;
+		}	
+
+		if( ret != 0 )
+			inc_len = 0;
+		return ret;
 	}
 
 	switch( *Buf )
 	{
 	case '\b':
 		// TODO: Backspace
+		Display_MoveCursor(-1, 0);
 		return 1;
 	case '\t':
-		// TODO: tab
+		// TODO: tab (get current cursor pos, space until multiple of 8)
 		return 1;
 	case '\n':
 		Display_Newline(1);
 		return 1;
 	case '\r':
 		// TODO: Carriage return
-		return ;
+		Display_MoveCursor(INT_MIN, 0);
+		return 1;
 	}
 
 	 int	ret = 0;
@@ -52,3 +85,73 @@ int Term_HandleVT100(int Len, const char *Buf)
 	}
 	return -ret;
 }
+
+int Term_HandleVT100_Long(int Len, const char *Buffer)
+{
+	char	c;
+	 int	argc = 0, j = 0;
+	 int	args[6] = {0,0,0,0,0,0};
+	 int	bQuestionMark = 0;
+	
+	// Get Arguments
+	if(j == Len)	return 0;
+	c = Buffer[j++];
+	if(c == '?') {
+		bQuestionMark = 1;
+		if(j == Len)	return 0;
+		c = Buffer[j++];
+	}
+	if( '0' <= c && c <= '9' )
+	{
+		do {
+			if(c == ';') {
+				if(j == Len)	return 0;
+				c = Buffer[j++];
+			}
+			while('0' <= c && c <= '9') {
+				args[argc] *= 10;
+				args[argc] += c-'0';
+				if(j == Len)	return 0;
+				c = Buffer[j++];
+			}
+			argc ++;
+		} while(c == ';');
+	}
+	
+	// Get Command
+	if( !isalpha(c) ) {
+		// Bother.
+		_SysDebug("Unexpected char 0x%x in VT100 escape code", c);
+		return -1;
+	}
+
+	if( bQuestionMark )
+	{
+		// Special commands
+		switch( c )
+		{
+		default:
+			_SysDebug("Unknown VT100 extended escape char 0x%x", c);
+			break;
+		}
+	}
+	else
+	{
+		// Standard commands
+		switch( c )
+		{
+		case 'J':
+			if( argc == 0 )
+				Display_ClearLine(0);
+			else if( args[0] == 2 )
+				Display_ClearLines(0);	// Entire screen!
+			else
+				_SysDebug("TODO: VT100 %i J", args[0]);
+			break;
+		default:
+			_SysDebug("Unknown VT100 escape char 0x%x", c);
+			break;
+		}
+	}
+	return j;
+}