support colons in SGR character attributes

Patch by Mikhail Kot <to@myrrc.dev> With some modifications to behave more like xterm (see note below). Example: printf '\033[48;2;255:0:0mtest\n' https://invisible-island.net/xterm/ctlseqs/ctlseqs.html Some notes: "CSI Pm m Character Attributes (SGR). [...] o xterm allows either colons (standard) or semicolons (legacy) to separate the subparameters (but after the first colon, colons must be used).
bump version to 0.9.2
2024-05-01 20:45:39 +02:00 · 2024-04-05 12:18:41 +02:00 · 2024-04-03 19:49:05 +02:00 · 2024-03-30 12:37:06 +01:00
3 changed files with 14 additions and 9 deletions
--- a/config.mk
+++ b/config.mk
@ -1,5 +1,5 @@
 # st version
-VERSION = 0.9.1
+VERSION = 0.9.2
 # Customize below to fit your system
--- a/st.c
+++ b/st.c
@ -86,8 +86,8 @@ enum escape_state {
 typedef struct {
 	Glyph attr; /* current char attributes */
-	int x; /* terminal column */
+	int x;
-	int y; /* terminal row */
+	int y;
 	char state;
 } TCursor;
@ -1132,6 +1132,7 @@ csiparse(void)
 {
 	char *p = csiescseq.buf, *np;
 	long int v;
 	int sep = ';'; /* colon or semi-colon, but not both */
 	csiescseq.narg = 0;
 	if (*p == '?') {
@ -1149,7 +1150,9 @@ csiparse(void)
 			v = -1;
 		csiescseq.arg[csiescseq.narg++] = v;
 		p = np;
-		if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
+		if (sep == ';' && *p == ':')
 			sep = ':'; /* allow override to colon once */
 		if (*p != sep || csiescseq.narg == ESC_ARG_SIZ)
 			break;
 		p++;
 	}
@ -2175,16 +2178,12 @@ tstrsequence(uchar c)
 void
 tcontrolcode(uchar ascii)
 {
 	size_t i;
 	switch (ascii) {
 	case '\t':   /* HT */
 		tputtab(1);
 		return;
 	case '\b':   /* BS */
-		for (i = 1; term.c.x && term.line[term.c.y][term.c.x - i].u == 0; ++i)
+		tmoveto(term.c.x-1, term.c.y);
 			;
 		tmoveto(term.c.x - i, term.c.y);
 		return;
 	case '\r':   /* CR */
 		tmoveto(0, term.c.y);
--- a/x.c
+++ b/x.c
@ -1617,6 +1617,9 @@ xseticontitle(char *p)
 	XTextProperty prop;
 	DEFAULT(p, opt_title);
 	if (p[0] == '\0')
 		p = opt_title;
 	if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
 	                                &prop) != Success)
 		return;
@ -1631,6 +1634,9 @@ xsettitle(char *p)
 	XTextProperty prop;
 	DEFAULT(p, opt_title);
 	if (p[0] == '\0')
 		p = opt_title;
 	if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
 	                                &prop) != Success)
 		return;
Author	SHA1	Message	Date
Hiltjo Posthuma	5dbcca4926	support colons in SGR character attributes Patch by Mikhail Kot <to@myrrc.dev> With some modifications to behave more like xterm (see note below). Example: printf '\033[48;2;255:0:0mtest\n' https://invisible-island.net/xterm/ctlseqs/ctlseqs.html Some notes: "CSI Pm m Character Attributes (SGR). [...] o xterm allows either colons (standard) or semicolons (legacy) to separate the subparameters (but after the first colon, colons must be used).	2024-05-01 20:45:39 +02:00
Hiltjo Posthuma	d63b9eb902	bump version to 0.9.2	2024-04-05 12:18:41 +02:00
DOGMAN	497a756382	Reset title when an empty title string is given With this patch, st will reset its window title when an empty string is given as the terminal title. For example: printf "\033]0;\007" Some applications, like termdown, expect this functionality. xterm implements it, but it seems that most other terminal emulators don't. In any case, I don't see why there should ever be a case where the st window doesn't have a title property.	2024-04-03 19:49:05 +02:00
Hiltjo Posthuma	8c68ec5241	Revert "Fix cursor move with wide glyphs" This reverts commit `7473a8d1a5`. This patch needs some more work. It caused regressions with programs that use GNU readline, etc. Original test-case example from Tim Culverhouse <tim@timculverhouse.com>: printf " 😀" && sleep 2 && printf "\e[D" && sleep 2 && printf "\e[D" && sleep 2 After the patch it caused regressions, example test-case: printf "A字\bB\n"	2024-03-30 12:37:06 +01:00