From 3b2a74a61a0199136d21c8f05c7171d9cf43d875 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Sun, 12 Jul 2020 20:29:47 -0400
Subject: Implement IRC formatting

---
 html.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 75 insertions(+), 4 deletions(-)

diff --git a/html.c b/html.c
index ae4c76f..1d2cec0 100644
--- a/html.c
+++ b/html.c
@@ -15,9 +15,11 @@
  */
 
 #include <assert.h>
+#include <ctype.h>
 #include <err.h>
 #include <inttypes.h>
 #include <regex.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -422,9 +424,78 @@ enum kcgi_err linkify(struct khtmlreq *html, const char *str, size_t len) {
 	return KCGI_OK;
 }
 
+static const struct Style {
+	int fg, bg;
+	bool b, r, i, u;
+} Default = { .fg = 99, .bg = 99 };
+
+enum kcgi_err htmlStyle(struct khtmlreq *html, struct Style style) {
+	enum kcgi_err error = KCGI_OK;
+	char class[sizeof("fg99")];
+	if (style.fg != Default.fg) {
+		snprintf(class, sizeof(class), "fg%02d", style.fg);
+		error = error || khtml_attr(
+			html, KELEM_SPAN,
+			KATTR_CLASS, class,
+			KATTR__MAX
+		);
+	}
+	if (style.bg != Default.bg) {
+		snprintf(class, sizeof(class), "bg%02d", style.bg);
+		error = error || khtml_attr(
+			html, KELEM_SPAN,
+			KATTR_CLASS, class,
+			KATTR__MAX
+		);
+	}
+	if (style.b) error = error || khtml_elem(html, KELEM_B);
+	if (style.r) error = error || khtml_elem(html, KELEM_MARK);
+	if (style.i) error = error || khtml_elem(html, KELEM_I);
+	if (style.u) error = error || khtml_elem(html, KELEM_U);
+	return error;
+}
+
 enum kcgi_err htmlIRC(struct khtmlreq *html, const char *str) {
-	return 0
-		|| khtml_attr(html, KELEM_SPAN, KATTR_CLASS, "irc", KATTR__MAX)
-		|| linkify(html, str, strlen(str))
-		|| khtml_closeelem(html, 1);
+	enum kcgi_err error = khtml_attr(
+		html, KELEM_SPAN,
+		KATTR_CLASS, "irc",
+		KATTR__MAX
+	);
+	if (error) return error;
+
+	size_t top = khtml_elemat(html);
+	struct Style style = Default;
+	for (;;) {
+		size_t len = strcspn(str, "\2\3\17\26\35\37");
+		if (len) {
+			error = 0
+				|| khtml_closeto(html, top)
+				|| htmlStyle(html, style)
+				|| linkify(html, str, len);
+			if (error) return error;
+		}
+
+		str += len;
+		if (!*str) break;
+		switch (*str++) {
+			break; case '\2':  style.b ^= true;
+			break; case '\26': style.r ^= true;
+			break; case '\35': style.i ^= true;
+			break; case '\37': style.u ^= true;
+			break; case '\3': {
+				if (!isdigit(*str)) {
+					style.fg = Default.fg;
+					style.bg = Default.bg;
+					break;
+				}
+				style.fg = *str++ - '0';
+				if (isdigit(*str)) style.fg = style.fg * 10 + *str++ - '0';
+				if (str[0] != ',' || !isdigit(str[1])) break;
+				str++;
+				style.bg = *str++ - '0';
+				if (isdigit(*str)) style.bg = style.bg * 10 + *str++ - '0';
+			}
+		}
+	}
+	return khtml_closeto(html, top) || khtml_closeelem(html, 1);
 }
-- 
cgit 1.4.1

itle='2021-02-06 23:02:02 -0500'>2021-02-06</span></td><td class='logsubject'><a href='/src/commit/home/.xsession?id=bed16967d6c1d893e72d7e38d1e39df1c7801578&amp;follow=1'>Set root window to black on purple snow</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-02-06 22:30:10 -0500'>2021-02-06</span></td><td class='logsubject'><a href='/src/commit/home/.xsession?id=af835d81e1468573e979ff339fe403eaa14af938&amp;follow=1'>Add xmodmap configuration</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-02-06 20:23:45 -0500'>2021-02-06</span></td><td class='logsubject'><a href='/src/commit/home/.xsession?id=2865d6fccb2036150bb36eed1a4b8e6d70889e7a&amp;follow=1'>Add initial OpenBSD X configuration</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
cwm still needs a lot more rebinding, and I need to actually look
at its other options. xterm definitely still needs some configuration,
but I at least managed to get it to use a decent looking font. Very
happy that OpenBSD includes Luxi Mono, which is what my usual font,
Go Mono, is based on anyway. Still missing is xmodmap and such.


</td></tr>
<tr class='logheader'><td><span title='2021-02-06 19:48:14 -0500'>2021-02-06</span></td><td class='logsubject'><a href='/src/commit/bin/scheme.c?id=34894724b0a85f7d047f31dcdc893dbd47b8f9c3&amp;follow=1'>Add xterm output to scheme</a></td><td>June McEnroe