feat: working parser for rc shell language

2 files changed, 26 insertions, 16 deletions

diff --git a/sys/cmd/term/term.c b/sys/cmd/term/term.c
index 6a27a10..f7687b9 100644
--- a/sys/cmd/term/term.c
+++ b/sys/cmd/term/term.c
@@ -1111,13 +1111,12 @@ tdefcolor(int *attr, int *npar, int l)
 		break;
 	case 5: /* indexed color */
 		if (*npar + 2 >= l) {
-			fprintf(stderr,
-				"erresc(38): Incorrect number of parameters (%d)\n", *npar);
+			fprintf(stderr, "erresc(38): Incorrect number of parameters (%d)\n", *npar);
 			break;
 		}
 		*npar += 2;
 		if (!BETWEEN(attr[*npar], 0, 255))
-			fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]);
+			fprintf(stderr, "erresc: bad color %d\n", attr[*npar]);
 		else
 			idx = attr[*npar];
 		break;
diff --git a/sys/cmd/term/term.info b/sys/cmd/term/term.info
index 2f40292..7b90344 100644
--- a/sys/cmd/term/term.info
+++ b/sys/cmd/term/term.info
@@ -1,4 +1,4 @@
-st-mono| simpleterm monocolor,
+term+mono| simpleterm monocolor,
 	acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	am,
 	bce,
@@ -193,8 +193,8 @@ st-mono| simpleterm monocolor,
 	Ss=\E[%p1%d q,
 
 term| simpleterm,
-	use=st-mono,
-	colors#8,
+	use=term+mono,
+	colors#8, pairs#64,
 	setab=\E[4%p1%dm,
 	setaf=\E[3%p1%dm,
 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
@@ -202,38 +202,49 @@ term| simpleterm,
 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
 
 term-256color| simpleterm with 256 colors,
-	use=st,
+	use=term,
 	ccc,
-	colors#256,
+	colors#256, pairs#32767,
 	oc=\E]104\007,
-	pairs#32767,
 #	Nicked from xterm-256color
 	initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
 	setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
 	setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
 
+term-direct| simpleterm with true color,
+	use=term,
+    RGB,
+#	Nicked from xterm-direct
+    colors#0x1000000, pairs#0x7FFFF,
+    initc@, op=\E[39;49m,
+    setab=\E[%?%p1%{8}%<%t4%p1%d%e48;2;%p1%{65536}%/%d;%p1%{256}
+          %/%{255}%&%d;%p1%{255}%&%d%;m,
+    setaf=\E[%?%p1%{8}%<%t3%p1%d%e38;2;%p1%{65536}%/%d;%p1%{256}
+          %/%{255}%&%d;%p1%{255}%&%d%;m,
+    setb@, setf@,
+
 term-meta| simpleterm with meta key,
-	use=st,
+	use=term,
 	km,
 	rmm=\E[?1034l,
 	smm=\E[?1034h,
 	rs2=\E[4l\E>\E[?1034h,
 	is2=\E[4l\E>\E[?1034h,
 
-st-meta-256color| simpleterm with meta key and 256 colors,
-	use=st-256color,
+term-meta-256color| simpleterm with meta key and 256 colors,
+	use=term-256color,
 	km,
 	rmm=\E[?1034l,
 	smm=\E[?1034h,
 	rs2=\E[4l\E>\E[?1034h,
 	is2=\E[4l\E>\E[?1034h,
 
-st-bs| simpleterm with backspace as backspace,
-	use=st,
+term-bs| simpleterm with backspace as backspace,
+	use=term,
 	kbs=\010,
 	kdch1=\177,
 
-st-bs-256color| simpleterm with backspace as backspace and 256colors,
-	use=st-256color,
+term-bs-256color| simpleterm with backspace as backspace and 256colors,
+	use=term-256color,
 	kbs=\010,
 	kdch1=\177,