Added undercurl v0.8.4 patch

Added title-parsing-fix v0.8.5 patch (#10 )
Reviewed-on: #10
2023-06-27 22:36:11 +02:00 · 2023-06-27 22:35:52 +02:00 · 2023-06-27 22:35:14 +02:00 · 2023-06-27 22:31:59 +02:00 · 2023-06-27 22:31:10 +02:00 · 2023-06-27 22:30:31 +02:00
12 changed files with 841 additions and 913 deletions
--- a/6
+++ b/6
@ -4,7 +4,7 @@

 include config.mk

-SRC = st.c x.c boxdraw.c hb.c
+SRC = st.c x.c
 OBJ = $(SRC:.c=.o)

 all: options st
@ -22,9 +22,7 @@ config.h:
 	$(CC) $(STCFLAGS) -c $<

 st.o: config.h st.h win.h
-x.o: arg.h config.h st.h win.h hb.h
-boxdraw.o: config.h st.h boxdraw_data.h
-hb.o: st.h
+x.o: arg.h config.h st.h win.h

 $(OBJ): config.h config.mk

--- a/boxdraw.c
+++ b/boxdraw.c
@ -1,194 +0,0 @@
-/*
- * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
- * MIT/X Consortium License
- */
-
-#include <X11/Xft/Xft.h>
-#include "st.h"
-#include "boxdraw_data.h"
-
-/* Rounded non-negative integers division of n / d  */
-#define DIV(n, d) (((n) + (d) / 2) / (d))
-
-static Display *xdpy;
-static Colormap xcmap;
-static XftDraw *xd;
-static Visual *xvis;
-
-static void drawbox(int, int, int, int, XftColor *, XftColor *, ushort);
-static void drawboxlines(int, int, int, int, XftColor *, ushort);
-
-/* public API */
-
-void
-boxdraw_xinit(Display *dpy, Colormap cmap, XftDraw *draw, Visual *vis)
-{
-	xdpy = dpy; xcmap = cmap; xd = draw, xvis = vis;
-}
-
-int
-isboxdraw(Rune u)
-{
-	Rune block = u & ~0xff;
-	return (boxdraw && block == 0x2500 && boxdata[(uint8_t)u]) ||
-	       (boxdraw_braille && block == 0x2800);
-}
-
-/* the "index" is actually the entire shape data encoded as ushort */
-ushort
-boxdrawindex(const Glyph *g)
-{
-	if (boxdraw_braille && (g->u & ~0xff) == 0x2800)
-		return BRL | (uint8_t)g->u;
-	if (boxdraw_bold && (g->mode & ATTR_BOLD))
-		return BDB | boxdata[(uint8_t)g->u];
-	return boxdata[(uint8_t)g->u];
-}
-
-void
-drawboxes(int x, int y, int cw, int ch, XftColor *fg, XftColor *bg,
-          const XftGlyphFontSpec *specs, int len)
-{
-	for ( ; len-- > 0; x += cw, specs++)
-		drawbox(x, y, cw, ch, fg, bg, (ushort)specs->glyph);
-}
-
-/* implementation */
-
-void
-drawbox(int x, int y, int w, int h, XftColor *fg, XftColor *bg, ushort bd)
-{
-	ushort cat = bd & ~(BDB | 0xff);  /* mask out bold and data */
-	if (bd & (BDL | BDA)) {
-		/* lines (light/double/heavy/arcs) */
-		drawboxlines(x, y, w, h, fg, bd);
-
-	} else if (cat == BBD) {
-		/* lower (8-X)/8 block */
-		int d = DIV((uint8_t)bd * h, 8);
-		XftDrawRect(xd, fg, x, y + d, w, h - d);
-
-	} else if (cat == BBU) {
-		/* upper X/8 block */
-		XftDrawRect(xd, fg, x, y, w, DIV((uint8_t)bd * h, 8));
-
-	} else if (cat == BBL) {
-		/* left X/8 block */
-		XftDrawRect(xd, fg, x, y, DIV((uint8_t)bd * w, 8), h);
-
-	} else if (cat == BBR) {
-		/* right (8-X)/8 block */
-		int d = DIV((uint8_t)bd * w, 8);
-		XftDrawRect(xd, fg, x + d, y, w - d, h);
-
-	} else if (cat == BBQ) {
-		/* Quadrants */
-		int w2 = DIV(w, 2), h2 = DIV(h, 2);
-		if (bd & TL)
-			XftDrawRect(xd, fg, x, y, w2, h2);
-		if (bd & TR)
-			XftDrawRect(xd, fg, x + w2, y, w - w2, h2);
-		if (bd & BL)
-			XftDrawRect(xd, fg, x, y + h2, w2, h - h2);
-		if (bd & BR)
-			XftDrawRect(xd, fg, x + w2, y + h2, w - w2, h - h2);
-
-	} else if (bd & BBS) {
-		/* Shades - data is 1/2/3 for 25%/50%/75% alpha, respectively */
-		int d = (uint8_t)bd;
-		XftColor xfc;
-		XRenderColor xrc = { .alpha = 0xffff };
-
-		xrc.red = DIV(fg->color.red * d + bg->color.red * (4 - d), 4);
-		xrc.green = DIV(fg->color.green * d + bg->color.green * (4 - d), 4);
-		xrc.blue = DIV(fg->color.blue * d + bg->color.blue * (4 - d), 4);
-
-		XftColorAllocValue(xdpy, xvis, xcmap, &xrc, &xfc);
-		XftDrawRect(xd, &xfc, x, y, w, h);
-		XftColorFree(xdpy, xvis, xcmap, &xfc);
-
-	} else if (cat == BRL) {
-		/* braille, each data bit corresponds to one dot at 2x4 grid */
-		int w1 = DIV(w, 2);
-		int h1 = DIV(h, 4), h2 = DIV(h, 2), h3 = DIV(3 * h, 4);
-
-		if (bd & 1)   XftDrawRect(xd, fg, x, y, w1, h1);
-		if (bd & 2)   XftDrawRect(xd, fg, x, y + h1, w1, h2 - h1);
-		if (bd & 4)   XftDrawRect(xd, fg, x, y + h2, w1, h3 - h2);
-		if (bd & 8)   XftDrawRect(xd, fg, x + w1, y, w - w1, h1);
-		if (bd & 16)  XftDrawRect(xd, fg, x + w1, y + h1, w - w1, h2 - h1);
-		if (bd & 32)  XftDrawRect(xd, fg, x + w1, y + h2, w - w1, h3 - h2);
-		if (bd & 64)  XftDrawRect(xd, fg, x, y + h3, w1, h - h3);
-		if (bd & 128) XftDrawRect(xd, fg, x + w1, y + h3, w - w1, h - h3);
-
-	}
-}
-
-void
-drawboxlines(int x, int y, int w, int h, XftColor *fg, ushort bd)
-{
-	/* s: stem thickness. width/8 roughly matches underscore thickness. */
-	/* We draw bold as 1.5 * normal-stem and at least 1px thicker.      */
-	/* doubles draw at least 3px, even when w or h < 3. bold needs 6px. */
-	int mwh = MIN(w, h);
-	int base_s = MAX(1, DIV(mwh, 8));
-	int bold = (bd & BDB) && mwh >= 6;  /* possibly ignore boldness */
-	int s = bold ? MAX(base_s + 1, DIV(3 * base_s, 2)) : base_s;
-	int w2 = DIV(w - s, 2), h2 = DIV(h - s, 2);
-	/* the s-by-s square (x + w2, y + h2, s, s) is the center texel.    */
-	/* The base length (per direction till edge) includes this square.  */
-
-	int light = bd & (LL | LU | LR | LD);
-	int double_ = bd & (DL | DU | DR | DD);
-
-	if (light) {
-		/* d: additional (negative) length to not-draw the center   */
-		/* texel - at arcs and avoid drawing inside (some) doubles  */
-		int arc = bd & BDA;
-		int multi_light = light & (light - 1);
-		int multi_double = double_ & (double_ - 1);
-		/* light crosses double only at DH+LV, DV+LH (ref. shapes)  */
-		int d = arc || (multi_double && !multi_light) ? -s : 0;
-
-		if (bd & LL)
-			XftDrawRect(xd, fg, x, y + h2, w2 + s + d, s);
-		if (bd & LU)
-			XftDrawRect(xd, fg, x + w2, y, s, h2 + s + d);
-		if (bd & LR)
-			XftDrawRect(xd, fg, x + w2 - d, y + h2, w - w2 + d, s);
-		if (bd & LD)
-			XftDrawRect(xd, fg, x + w2, y + h2 - d, s, h - h2 + d);
-	}
-
-	/* double lines - also align with light to form heavy when combined */
-	if (double_) {
-		/*
-		* going clockwise, for each double-ray: p is additional length
-		* to the single-ray nearer to the previous direction, and n to
-		* the next. p and n adjust from the base length to lengths
-		* which consider other doubles - shorter to avoid intersections
-		* (p, n), or longer to draw the far-corner texel (n).
-		*/
-		int dl = bd & DL, du = bd & DU, dr = bd & DR, dd = bd & DD;
-		if (dl) {
-			int p = dd ? -s : 0, n = du ? -s : dd ? s : 0;
-			XftDrawRect(xd, fg, x, y + h2 + s, w2 + s + p, s);
-			XftDrawRect(xd, fg, x, y + h2 - s, w2 + s + n, s);
-		}
-		if (du) {
-			int p = dl ? -s : 0, n = dr ? -s : dl ? s : 0;
-			XftDrawRect(xd, fg, x + w2 - s, y, s, h2 + s + p);
-			XftDrawRect(xd, fg, x + w2 + s, y, s, h2 + s + n);
-		}
-		if (dr) {
-			int p = du ? -s : 0, n = dd ? -s : du ? s : 0;
-			XftDrawRect(xd, fg, x + w2 - p, y + h2 - s, w - w2 + p, s);
-			XftDrawRect(xd, fg, x + w2 - n, y + h2 + s, w - w2 + n, s);
-		}
-		if (dd) {
-			int p = dr ? -s : 0, n = dl ? -s : dr ? s : 0;
-			XftDrawRect(xd, fg, x + w2 + s, y + h2 - p, s, h - h2 + p);
-			XftDrawRect(xd, fg, x + w2 - s, y + h2 - n, s, h - h2 + n);
-		}
-	}
-}
--- a/boxdraw_data.h
+++ b/boxdraw_data.h
@ -1,214 +0,0 @@
-/*
- * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
- * MIT/X Consortium License
- */
-
-/*
- * U+25XX codepoints data
- *
- * References:
- *   http://www.unicode.org/charts/PDF/U2500.pdf
- *   http://www.unicode.org/charts/PDF/U2580.pdf
- *
- * Test page:
- *   https://github.com/GNOME/vte/blob/master/doc/boxes.txt
- */
-
-/* Each shape is encoded as 16-bits. Higher bits are category, lower are data */
-/* Categories (mutually exclusive except BDB): */
-/* For convenience, BDL/BDA/BBS/BDB are 1 bit each, the rest are enums */
-#define BDL (1<<8)   /* Box Draw Lines (light/double/heavy) */
-#define BDA (1<<9)   /* Box Draw Arc (light) */
-
-#define BBD (1<<10)  /* Box Block Down (lower) X/8 */
-#define BBL (2<<10)  /* Box Block Left X/8 */
-#define BBU (3<<10)  /* Box Block Upper X/8 */
-#define BBR (4<<10)  /* Box Block Right X/8 */
-#define BBQ (5<<10)  /* Box Block Quadrants */
-#define BRL (6<<10)  /* Box Braille (data is lower byte of U28XX) */
-
-#define BBS (1<<14)  /* Box Block Shades */
-#define BDB (1<<15)  /* Box Draw is Bold */
-
-/* (BDL/BDA) Light/Double/Heavy x Left/Up/Right/Down/Horizontal/Vertical      */
-/* Heavy is light+double (literally drawing light+double align to form heavy) */
-#define LL (1<<0)
-#define LU (1<<1)
-#define LR (1<<2)
-#define LD (1<<3)
-#define LH (LL+LR)
-#define LV (LU+LD)
-
-#define DL (1<<4)
-#define DU (1<<5)
-#define DR (1<<6)
-#define DD (1<<7)
-#define DH (DL+DR)
-#define DV (DU+DD)
-
-#define HL (LL+DL)
-#define HU (LU+DU)
-#define HR (LR+DR)
-#define HD (LD+DD)
-#define HH (HL+HR)
-#define HV (HU+HD)
-
-/* (BBQ) Quadrants Top/Bottom x Left/Right */
-#define TL (1<<0)
-#define TR (1<<1)
-#define BL (1<<2)
-#define BR (1<<3)
-
-/* Data for U+2500 - U+259F except dashes/diagonals */
-static const unsigned short boxdata[256] = {
-	/* light lines */
-	[0x00] = BDL + LH,       /* light horizontal */
-	[0x02] = BDL + LV,       /* light vertical */
-	[0x0c] = BDL + LD + LR,  /* light down and right */
-	[0x10] = BDL + LD + LL,  /* light down and left */
-	[0x14] = BDL + LU + LR,  /* light up and right */
-	[0x18] = BDL + LU + LL,  /* light up and left */
-	[0x1c] = BDL + LV + LR,  /* light vertical and right */
-	[0x24] = BDL + LV + LL,  /* light vertical and left */
-	[0x2c] = BDL + LH + LD,  /* light horizontal and down */
-	[0x34] = BDL + LH + LU,  /* light horizontal and up */
-	[0x3c] = BDL + LV + LH,  /* light vertical and horizontal */
-	[0x74] = BDL + LL,       /* light left */
-	[0x75] = BDL + LU,       /* light up */
-	[0x76] = BDL + LR,       /* light right */
-	[0x77] = BDL + LD,       /* light down */
-
-	/* heavy [+light] lines */
-	[0x01] = BDL + HH,
-	[0x03] = BDL + HV,
-	[0x0d] = BDL + HR + LD,
-	[0x0e] = BDL + HD + LR,
-	[0x0f] = BDL + HD + HR,
-	[0x11] = BDL + HL + LD,
-	[0x12] = BDL + HD + LL,
-	[0x13] = BDL + HD + HL,
-	[0x15] = BDL + HR + LU,
-	[0x16] = BDL + HU + LR,
-	[0x17] = BDL + HU + HR,
-	[0x19] = BDL + HL + LU,
-	[0x1a] = BDL + HU + LL,
-	[0x1b] = BDL + HU + HL,
-	[0x1d] = BDL + HR + LV,
-	[0x1e] = BDL + HU + LD + LR,
-	[0x1f] = BDL + HD + LR + LU,
-	[0x20] = BDL + HV + LR,
-	[0x21] = BDL + HU + HR + LD,
-	[0x22] = BDL + HD + HR + LU,
-	[0x23] = BDL + HV + HR,
-	[0x25] = BDL + HL + LV,
-	[0x26] = BDL + HU + LD + LL,
-	[0x27] = BDL + HD + LU + LL,
-	[0x28] = BDL + HV + LL,
-	[0x29] = BDL + HU + HL + LD,
-	[0x2a] = BDL + HD + HL + LU,
-	[0x2b] = BDL + HV + HL,
-	[0x2d] = BDL + HL + LD + LR,
-	[0x2e] = BDL + HR + LL + LD,
-	[0x2f] = BDL + HH + LD,
-	[0x30] = BDL + HD + LH,
-	[0x31] = BDL + HD + HL + LR,
-	[0x32] = BDL + HR + HD + LL,
-	[0x33] = BDL + HH + HD,
-	[0x35] = BDL + HL + LU + LR,
-	[0x36] = BDL + HR + LU + LL,
-	[0x37] = BDL + HH + LU,
-	[0x38] = BDL + HU + LH,
-	[0x39] = BDL + HU + HL + LR,
-	[0x3a] = BDL + HU + HR + LL,
-	[0x3b] = BDL + HH + HU,
-	[0x3d] = BDL + HL + LV + LR,
-	[0x3e] = BDL + HR + LV + LL,
-	[0x3f] = BDL + HH + LV,
-	[0x40] = BDL + HU + LH + LD,
-	[0x41] = BDL + HD + LH + LU,
-	[0x42] = BDL + HV + LH,
-	[0x43] = BDL + HU + HL + LD + LR,
-	[0x44] = BDL + HU + HR + LD + LL,
-	[0x45] = BDL + HD + HL + LU + LR,
-	[0x46] = BDL + HD + HR + LU + LL,
-	[0x47] = BDL + HH + HU + LD,
-	[0x48] = BDL + HH + HD + LU,
-	[0x49] = BDL + HV + HL + LR,
-	[0x4a] = BDL + HV + HR + LL,
-	[0x4b] = BDL + HV + HH,
-	[0x78] = BDL + HL,
-	[0x79] = BDL + HU,
-	[0x7a] = BDL + HR,
-	[0x7b] = BDL + HD,
-	[0x7c] = BDL + HR + LL,
-	[0x7d] = BDL + HD + LU,
-	[0x7e] = BDL + HL + LR,
-	[0x7f] = BDL + HU + LD,
-
-	/* double [+light] lines */
-	[0x50] = BDL + DH,
-	[0x51] = BDL + DV,
-	[0x52] = BDL + DR + LD,
-	[0x53] = BDL + DD + LR,
-	[0x54] = BDL + DR + DD,
-	[0x55] = BDL + DL + LD,
-	[0x56] = BDL + DD + LL,
-	[0x57] = BDL + DL + DD,
-	[0x58] = BDL + DR + LU,
-	[0x59] = BDL + DU + LR,
-	[0x5a] = BDL + DU + DR,
-	[0x5b] = BDL + DL + LU,
-	[0x5c] = BDL + DU + LL,
-	[0x5d] = BDL + DL + DU,
-	[0x5e] = BDL + DR + LV,
-	[0x5f] = BDL + DV + LR,
-	[0x60] = BDL + DV + DR,
-	[0x61] = BDL + DL + LV,
-	[0x62] = BDL + DV + LL,
-	[0x63] = BDL + DV + DL,
-	[0x64] = BDL + DH + LD,
-	[0x65] = BDL + DD + LH,
-	[0x66] = BDL + DD + DH,
-	[0x67] = BDL + DH + LU,
-	[0x68] = BDL + DU + LH,
-	[0x69] = BDL + DH + DU,
-	[0x6a] = BDL + DH + LV,
-	[0x6b] = BDL + DV + LH,
-	[0x6c] = BDL + DH + DV,
-
-	/* (light) arcs */
-	[0x6d] = BDA + LD + LR,
-	[0x6e] = BDA + LD + LL,
-	[0x6f] = BDA + LU + LL,
-	[0x70] = BDA + LU + LR,
-
-	/* Lower (Down) X/8 block (data is 8 - X) */
-	[0x81] = BBD + 7, [0x82] = BBD + 6, [0x83] = BBD + 5, [0x84] = BBD + 4,
-	[0x85] = BBD + 3, [0x86] = BBD + 2, [0x87] = BBD + 1, [0x88] = BBD + 0,
-
-	/* Left X/8 block (data is X) */
-	[0x89] = BBL + 7, [0x8a] = BBL + 6, [0x8b] = BBL + 5, [0x8c] = BBL + 4,
-	[0x8d] = BBL + 3, [0x8e] = BBL + 2, [0x8f] = BBL + 1,
-
-	/* upper 1/2 (4/8), 1/8 block (X), right 1/2, 1/8 block (8-X) */
-	[0x80] = BBU + 4, [0x94] = BBU + 1,
-	[0x90] = BBR + 4, [0x95] = BBR + 7,
-
-	/* Quadrants */
-	[0x96] = BBQ + BL,
-	[0x97] = BBQ + BR,
-	[0x98] = BBQ + TL,
-	[0x99] = BBQ + TL + BL + BR,
-	[0x9a] = BBQ + TL + BR,
-	[0x9b] = BBQ + TL + TR + BL,
-	[0x9c] = BBQ + TL + TR + BR,
-	[0x9d] = BBQ + TR,
-	[0x9e] = BBQ + BL + TR,
-	[0x9f] = BBQ + BL + TR + BR,
-
-	/* Shades, data is an alpha value in 25% units (1/4, 1/2, 3/4) */
-	[0x91] = BBS + 1, [0x92] = BBS + 2, [0x93] = BBS + 3,
-
-	/* U+2504 - U+250B, U+254C - U+254F: unsupported (dashes) */
-	/* U+2571 - U+2573: unsupported (diagonals) */
-};
--- a/config.def.h
+++ b/config.def.h
@ -56,6 +56,12 @@ int allowwindowops = 0;
 static double minlatency = 8;
 static double maxlatency = 33;

+/*
+ * Synchronized-Update timeout in ms
+ * https://gitlab.com/gnachman/iterm2/-/wikis/synchronized-updates-spec
+ */
+static uint su_timeout = 200;
+
 /*
 * blinking timeout (set to 0 to disable blinking) for the terminal blinking
 * attribute.
@ -67,18 +73,6 @@ static unsigned int blinktimeout = 800;
 */
 static unsigned int cursorthickness = 2;

-/*
- * 1: render most of the lines/blocks characters without using the font for
- *    perfect alignment between cells (U2500 - U259F except dashes/diagonals).
- *    Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
- * 0: disable (render all U25XX glyphs normally from the font).
- */
-const int boxdraw = 0;
-const int boxdraw_bold = 0;
-
-/* braille (U28XX):  1: render as adjacent "pixels",  0: use font */
-const int boxdraw_braille = 0;
-
 /*
 * bell volume. It must be a value between -100 and 100. Use 0 for disabling
 * it
@ -105,35 +99,30 @@ char *termname = "st-256color";
 */
 unsigned int tabspaces = 8;

+/* bg opacity */
+float alpha = 0.8;
+
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
 	/* 8 normal colors */
-	"black",
-	"red3",
-	"green3",
-	"yellow3",
-	"blue2",
-	"magenta3",
-	"cyan3",
-	"gray90",
+	[0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
+	[1] = "#cc241d", /* red     */
+	[2] = "#98971a", /* green   */
+	[3] = "#d79921", /* yellow  */
+	[4] = "#458588", /* blue    */
+	[5] = "#b16286", /* magenta */
+	[6] = "#689d6a", /* cyan    */
+	[7] = "#a89984", /* white   */

 	/* 8 bright colors */
-	"gray50",
-	"red",
-	"green",
-	"yellow",
-	"#5c5cff",
-	"magenta",
-	"cyan",
-	"white",
-
-	[255] = 0,
-
-	/* more colors can be added after 255 to use with DefaultXX */
-	"#cccccc",
-	"#555555",
-	"gray90", /* default foreground colour */
-	"black", /* default background colour */
+	[8]  = "#928374", /* black   */
+	[9]  = "#fb4934", /* red     */
+	[10] = "#b8bb26", /* green   */
+	[11] = "#fabd2f", /* yellow  */
+	[12] = "#83a598", /* blue    */
+	[13] = "#d3869b", /* magenta */
+	[14] = "#8ec07c", /* cyan    */
+	[15] = "#ebdbb2", /* white   */
 };


@ -141,9 +130,9 @@ static const char *colorname[] = {
 * Default colors (colorname index)
 * foreground, background, cursor, reverse cursor
 */
-unsigned int defaultfg = 258;
-unsigned int defaultbg = 259;
-unsigned int defaultcs = 256;
+unsigned int defaultfg = 15;
+unsigned int defaultbg = 0;
+unsigned int defaultcs = 15;
 static unsigned int defaultrcs = 257;

 /*
@ -484,3 +473,27 @@ static char ascii_printable[] =
 	" !\"#$%&'()*+,-./0123456789:;<=>?"
 	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
 	"`abcdefghijklmnopqrstuvwxyz{|}~";
+
+/**
+ * Undercurl style. Set UNDERCURL_STYLE to one of the available styles.
+ *
+ * Curly: Dunno how to draw it *shrug*
+ *  _   _   _   _
+ * ( ) ( ) ( ) ( )
+ *	 (_) (_) (_) (_)
+ *
+ * Spiky:
+ * /\  /\   /\	/\
+ *   \/  \/	  \/
+ *
+ * Capped:
+ *	_     _     _
+ * / \   / \   / \
+ *    \_/   \_/
+ */
+// Available styles
+#define UNDERCURL_CURLY 0
+#define UNDERCURL_SPIKY 1
+#define UNDERCURL_CAPPED 2
+// Active style
+#define UNDERCURL_STYLE UNDERCURL_SPIKY
--- a/config.mk
+++ b/config.mk
@ -15,12 +15,10 @@ PKG_CONFIG = pkg-config
 # includes and libs
 INCS = -I$(X11INC) \
       `$(PKG_CONFIG) --cflags fontconfig` \
-       `$(PKG_CONFIG) --cflags freetype2` \
-       `$(PKG_CONFIG) --cflags harfbuzz`
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
+       `$(PKG_CONFIG) --cflags freetype2`
+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
       `$(PKG_CONFIG) --libs fontconfig` \
-       `$(PKG_CONFIG) --libs freetype2` \
-       `$(PKG_CONFIG) --libs harfbuzz`
+       `$(PKG_CONFIG) --libs freetype2`

 # flags
 STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
--- a/hb.c
+++ b/hb.c
@ -1,124 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <X11/Xft/Xft.h>
-#include <X11/cursorfont.h>
-#include <hb.h>
-#include <hb-ft.h>
-
-#include "st.h"
-#include "hb.h"
-
-#define FEATURE(c1,c2,c3,c4) { .tag = HB_TAG(c1,c2,c3,c4), .value = 1, .start = HB_FEATURE_GLOBAL_START, .end = HB_FEATURE_GLOBAL_END }
-#define BUFFER_STEP 256
-
-hb_font_t *hbfindfont(XftFont *match);
-
-typedef struct {
-	XftFont *match;
-	hb_font_t *font;
-} HbFontMatch;
-
-typedef struct {
-	size_t capacity;
-	HbFontMatch *fonts;
-} HbFontCache;
-
-static HbFontCache hbfontcache = { 0, NULL };
-
-typedef struct {
-	size_t capacity;
-	Rune *runes;
-} RuneBuffer;
-
-static RuneBuffer hbrunebuffer = { 0, NULL };
-
-/*
- * Poplulate the array with a list of font features, wrapped in FEATURE macro,
- * e. g.
- * FEATURE('c', 'a', 'l', 't'), FEATURE('d', 'l', 'i', 'g')
- */
-hb_feature_t features[] = { };
-
-void
-hbunloadfonts()
-{
-	for (int i = 0; i < hbfontcache.capacity; i++) {
-		hb_font_destroy(hbfontcache.fonts[i].font);
-		XftUnlockFace(hbfontcache.fonts[i].match);
-	}
-
-	if (hbfontcache.fonts != NULL) {
-		free(hbfontcache.fonts);
-		hbfontcache.fonts = NULL;
-	}
-	hbfontcache.capacity = 0;
-}
-
-hb_font_t *
-hbfindfont(XftFont *match)
-{
-	for (int i = 0; i < hbfontcache.capacity; i++) {
-		if (hbfontcache.fonts[i].match == match)
-			return hbfontcache.fonts[i].font;
-	}
-
-	/* Font not found in cache, caching it now. */
-	hbfontcache.fonts = realloc(hbfontcache.fonts, sizeof(HbFontMatch) * (hbfontcache.capacity + 1));
-	FT_Face face = XftLockFace(match);
-	hb_font_t *font = hb_ft_font_create(face, NULL);
-	if (font == NULL)
-		die("Failed to load Harfbuzz font.");
-
-	hbfontcache.fonts[hbfontcache.capacity].match = match;
-	hbfontcache.fonts[hbfontcache.capacity].font = font;
-	hbfontcache.capacity += 1;
-
-	return font;
-}
-
-void hbtransform(HbTransformData *data, XftFont *xfont, const Glyph *glyphs, int start, int length) {
-	ushort mode = USHRT_MAX;
-	unsigned int glyph_count;
-	int rune_idx, glyph_idx, end = start + length;
-
-	hb_font_t *font = hbfindfont(xfont);
-	if (font == NULL)
-		return;
-
-	hb_buffer_t *buffer = hb_buffer_create();
-	hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
-
-	/* Resize the buffer if required length is larger. */
-	if (hbrunebuffer.capacity < length) {
-		hbrunebuffer.capacity = (length / BUFFER_STEP + 1) * BUFFER_STEP;
-		hbrunebuffer.runes = realloc(hbrunebuffer.runes, hbrunebuffer.capacity * sizeof(Rune));
-	}
-
-	/* Fill buffer with codepoints. */
-	for (rune_idx = 0, glyph_idx = start; glyph_idx < end; glyph_idx++, rune_idx++) {
-		hbrunebuffer.runes[rune_idx] = glyphs[glyph_idx].u;
-		mode = glyphs[glyph_idx].mode;
-		if (mode & ATTR_WDUMMY)
-			hbrunebuffer.runes[rune_idx] = 0x0020;
-	}
-	hb_buffer_add_codepoints(buffer, hbrunebuffer.runes, length, 0, length);
-
-	/* Shape the segment. */
-	hb_shape(font, buffer, features, sizeof(features)/sizeof(hb_feature_t));
-
-	/* Get new glyph info. */
-	hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, &glyph_count);
-	hb_glyph_position_t *pos = hb_buffer_get_glyph_positions(buffer, &glyph_count);
-
-	/* Fill the output. */
-	data->buffer = buffer;
-	data->glyphs = info;
-	data->positions = pos;
-	data->count = glyph_count;
-}
-
-void hbcleanup(HbTransformData *data) {
-	hb_buffer_destroy(data->buffer);
-	memset(data, 0, sizeof(HbTransformData));
-}
--- a/hb.h
+++ b/hb.h
@ -1,14 +0,0 @@
-#include <X11/Xft/Xft.h>
-#include <hb.h>
-#include <hb-ft.h>
-
-typedef struct {
-  hb_buffer_t *buffer;
-  hb_glyph_info_t *glyphs;
-  hb_glyph_position_t *positions;
-  unsigned int count;
-} HbTransformData;
-
-void hbunloadfonts();
-void hbtransform(HbTransformData *, XftFont *, const Glyph *, int, int);
-void hbcleanup(HbTransformData *);
--- a/st.c
+++ b/st.c
@ -33,6 +33,7 @@
 #define UTF_SIZ       4
 #define ESC_BUF_SIZ   (128*UTF_SIZ)
 #define ESC_ARG_SIZ   16
+#define CAR_PER_ARG   4
 #define STR_BUF_SIZ   ESC_BUF_SIZ
 #define STR_ARG_SIZ   ESC_ARG_SIZ

@ -42,6 +43,8 @@
 #define ISCONTROLC1(c)		(BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c)		(ISCONTROLC0(c) || ISCONTROLC1(c))
 #define ISDELIM(u)		(u && wcschr(worddelimiters, u))
+#define STRESCARGREST(n)	((n) == 0 ? strescseq.buf : strescseq.argp[(n)-1] + 1)
+#define STRESCARGJUST(n)	(*(strescseq.argp[n]) = '\0', STRESCARGREST(n))

 enum term_mode {
 	MODE_WRAP        = 1 << 0,
@ -139,6 +142,7 @@ typedef struct {
 	int arg[ESC_ARG_SIZ];
 	int narg;              /* nb of args */
 	char mode[2];
+	int carg[ESC_ARG_SIZ][CAR_PER_ARG]; /* colon args */
 } CSIEscape;

 /* STR Escape sequence structs */
@ -148,7 +152,7 @@ typedef struct {
 	char *buf;             /* allocated raw string */
 	size_t siz;            /* allocation size */
 	size_t len;            /* raw string length */
-	char *args[STR_ARG_SIZ];
+	char *argp[STR_ARG_SIZ]; /* pointers to the end of nth argument */
 	int narg;              /* nb of args */
 } STREscape;

@ -159,6 +163,7 @@ static void ttywriteraw(const char *, size_t);

 static void csidump(void);
 static void csihandle(void);
+static void readcolonargs(char **, int, int[][CAR_PER_ARG]);
 static void csiparse(void);
 static void csireset(void);
 static void osc_color_response(int, int, int);
@ -232,6 +237,33 @@ static const uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
 static const Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
 static const Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};

+#include <time.h>
+static int su = 0;
+struct timespec sutv;
+
+static void
+tsync_begin()
+{
+	clock_gettime(CLOCK_MONOTONIC, &sutv);
+	su = 1;
+}
+
+static void
+tsync_end()
+{
+	su = 0;
+}
+
+int
+tinsync(uint timeout)
+{
+	struct timespec now;
+	if (su && !clock_gettime(CLOCK_MONOTONIC, &now)
+	       && TIMEDIFF(now, sutv) >= timeout)
+		su = 0;
+	return su;
+}
+
 ssize_t
 xwrite(int fd, const char *s, size_t len)
 {
@ -814,6 +846,9 @@ ttynew(const char *line, char *cmd, const char *out, char **args)
 	return cmdfd;
 }

+static int twrite_aborted = 0;
+int ttyread_pending() { return twrite_aborted; }
+
 size_t
 ttyread(void)
 {
@ -822,7 +857,7 @@ ttyread(void)
 	int ret, written;

 	/* append read bytes to unprocessed bytes */
-	ret = read(cmdfd, buf+buflen, LEN(buf)-buflen);
+	ret = twrite_aborted ? 1 : read(cmdfd, buf+buflen, LEN(buf)-buflen);

 	switch (ret) {
 	case 0:
@ -830,7 +865,7 @@ ttyread(void)
 	case -1:
 		die("couldn't read from shell: %s\n", strerror(errno));
 	default:
-		buflen += ret;
+		buflen += twrite_aborted ? 0 : ret;
 		written = twrite(buf, buflen, 0);
 		buflen -= written;
 		/* keep any incomplete UTF-8 byte sequence for the next call */
@ -990,6 +1025,7 @@ tsetdirtattr(int attr)
 void
 tfulldirt(void)
 {
+	tsync_end();
 	tsetdirt(0, term.row-1);
 }

@ -1127,6 +1163,28 @@ tnewline(int first_col)
 	tmoveto(first_col ? 0 : term.c.x, y);
 }

+void
+readcolonargs(char **p, int cursor, int params[][CAR_PER_ARG])
+{
+	int i = 0;
+	for (; i < CAR_PER_ARG; i++)
+		params[cursor][i] = -1;
+
+	if (**p != ':')
+		return;
+
+	char *np = NULL;
+	i = 0;
+
+	while (**p == ':' && i < CAR_PER_ARG) {
+		while (**p == ':')
+			(*p)++;
+		params[cursor][i] = strtol(*p, &np, 10);
+		*p = np;
+		i++;
+	}
+}
+
 void
 csiparse(void)
 {
@ -1149,6 +1207,7 @@ csiparse(void)
 			v = -1;
 		csiescseq.arg[csiescseq.narg++] = v;
 		p = np;
+		readcolonargs(&p, csiescseq.narg-1, csiescseq.carg);
 		if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
 			break;
 		p++;
@ -1215,9 +1274,6 @@ tsetchar(Rune u, const Glyph *attr, int x, int y)
 	term.dirty[y] = 1;
 	term.line[y][x] = *attr;
 	term.line[y][x].u = u;
-
-	if (isboxdraw(u))
-		term.line[y][x].mode |= ATTR_BOXDRAW;
 }

 void
@ -1368,6 +1424,10 @@ tsetattr(const int *attr, int l)
 				ATTR_STRUCK     );
 			term.c.attr.fg = defaultfg;
 			term.c.attr.bg = defaultbg;
+			term.c.attr.ustyle = -1;
+			term.c.attr.ucolor[0] = -1;
+			term.c.attr.ucolor[1] = -1;
+			term.c.attr.ucolor[2] = -1;
 			break;
 		case 1:
 			term.c.attr.mode |= ATTR_BOLD;
@ -1379,7 +1439,14 @@ tsetattr(const int *attr, int l)
 			term.c.attr.mode |= ATTR_ITALIC;
 			break;
 		case 4:
-			term.c.attr.mode |= ATTR_UNDERLINE;
+			term.c.attr.ustyle = csiescseq.carg[i][0];
+
+			if (term.c.attr.ustyle != 0)
+				term.c.attr.mode |= ATTR_UNDERLINE;
+			else
+				term.c.attr.mode &= ~ATTR_UNDERLINE;
+
+			term.c.attr.mode ^= ATTR_DIRTYUNDERLINE;
 			break;
 		case 5: /* slow blink */
 			/* FALLTHROUGH */
@ -1430,6 +1497,18 @@ tsetattr(const int *attr, int l)
 		case 49:
 			term.c.attr.bg = defaultbg;
 			break;
+		case 58:
+			term.c.attr.ucolor[0] = csiescseq.carg[i][1];
+			term.c.attr.ucolor[1] = csiescseq.carg[i][2];
+			term.c.attr.ucolor[2] = csiescseq.carg[i][3];
+			term.c.attr.mode ^= ATTR_DIRTYUNDERLINE;
+			break;
+		case 59:
+			term.c.attr.ucolor[0] = -1;
+			term.c.attr.ucolor[1] = -1;
+			term.c.attr.ucolor[2] = -1;
+			term.c.attr.mode ^= ATTR_DIRTYUNDERLINE;
+			break;
 		default:
 			if (BETWEEN(attr[i], 30, 37)) {
 				term.c.attr.fg = attr[i] - 30;
@ -1882,29 +1961,30 @@ strhandle(void)
 	};

 	term.esc &= ~(ESC_STR_END|ESC_STR);
-	strparse();
-	par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0;
+	strescseq.buf[strescseq.len] = '\0';

 	switch (strescseq.type) {
 	case ']': /* OSC -- Operating System Command */
+		strparse();
+		par = (narg = strescseq.narg) ? atoi(STRESCARGJUST(0)) : 0;
 		switch (par) {
 		case 0:
 			if (narg > 1) {
-				xsettitle(strescseq.args[1]);
-				xseticontitle(strescseq.args[1]);
+				xsettitle(STRESCARGREST(1));
+				xseticontitle(STRESCARGREST(1));
 			}
 			return;
 		case 1:
 			if (narg > 1)
-				xseticontitle(strescseq.args[1]);
+				xseticontitle(STRESCARGREST(1));
 			return;
 		case 2:
 			if (narg > 1)
-				xsettitle(strescseq.args[1]);
+				xsettitle(STRESCARGREST(1));
 			return;
 		case 52:
 			if (narg > 2 && allowwindowops) {
-				dec = base64dec(strescseq.args[2]);
+				dec = base64dec(STRESCARGJUST(2));
 				if (dec) {
 					xsetsel(dec);
 					xclipcopy();
@ -1918,7 +1998,7 @@ strhandle(void)
 		case 12:
 			if (narg < 2)
 				break;
-			p = strescseq.args[1];
+			p = STRESCARGREST(1);
 			if ((j = par - 10) < 0 || j >= LEN(osc_table))
 				break; /* shouldn't be possible */

@ -1934,10 +2014,10 @@ strhandle(void)
 		case 4: /* color set */
 			if (narg < 3)
 				break;
-			p = strescseq.args[2];
+			p = STRESCARGJUST(2);
 			/* FALLTHROUGH */
 		case 104: /* color reset */
-			j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
+			j = (narg > 1) ? atoi(STRESCARGJUST(1)) : -1;

 			if (p && !strcmp(p, "?")) {
 				osc_color_response(j, 0, 1);
@ -1959,9 +2039,15 @@ strhandle(void)
 		}
 		break;
 	case 'k': /* old title set compatibility */
-		xsettitle(strescseq.args[0]);
+		xsettitle(strescseq.buf);
 		return;
 	case 'P': /* DCS -- Device Control String */
+		/* https://gitlab.com/gnachman/iterm2/-/wikis/synchronized-updates-spec */
+		if (strstr(strescseq.buf, "=1s") == strescseq.buf)
+			tsync_begin();  /* BSU */
+		else if (strstr(strescseq.buf, "=2s") == strescseq.buf)
+			tsync_end();  /* ESU */
+		return;
 	case '_': /* APC -- Application Program Command */
 	case '^': /* PM -- Privacy Message */
 		return;
@ -1978,18 +2064,17 @@ strparse(void)
 	char *p = strescseq.buf;

 	strescseq.narg = 0;
-	strescseq.buf[strescseq.len] = '\0';

 	if (*p == '\0')
 		return;

 	while (strescseq.narg < STR_ARG_SIZ) {
-		strescseq.args[strescseq.narg++] = p;
 		while ((c = *p) != ';' && c != '\0')
-			++p;
+			p++;
+		strescseq.argp[strescseq.narg++] = p;
 		if (c == '\0')
 			return;
-		*p++ = '\0';
+		p++;
 	}
 }

@ -2510,6 +2595,9 @@ twrite(const char *buf, int buflen, int show_ctrl)
 	Rune u;
 	int n;

+	int su0 = su;
+	twrite_aborted = 0;
+
 	for (n = 0; n < buflen; n += charsize) {
 		if (IS_SET(MODE_UTF8)) {
 			/* process a complete utf8 char */
@ -2520,6 +2608,10 @@ twrite(const char *buf, int buflen, int show_ctrl)
 			u = buf[n] & 0xFF;
 			charsize = 1;
 		}
+		if (su0 && !su) {
+			twrite_aborted = 1;
+			break;  // ESU - allow rendering before a new BSU
+		}
 		if (show_ctrl && ISCONTROL(u)) {
 			if (u & 0x80) {
 				u &= 0x7f;
@ -2655,8 +2747,7 @@ draw(void)

 	drawregion(0, 0, term.col, term.row);
 	xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
-			term.ocx, term.ocy, term.line[term.ocy][term.ocx],
-			term.line[term.ocy], term.col);
+			term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
 	term.ocx = cx;
 	term.ocy = term.c.y;
 	xfinishdraw();
--- a/st.h
+++ b/st.h
@ -11,8 +11,7 @@
 #define DIVCEIL(n, d)		(((n) + ((d) - 1)) / (d))
 #define DEFAULT(a, b)		(a) = (a) ? (a) : (b)
 #define LIMIT(x, a, b)		(x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
-#define ATTRCMP(a, b)		(((a).mode & (~ATTR_WRAP)) != ((b).mode & (~ATTR_WRAP)) || \
-				(a).fg != (b).fg || \
+#define ATTRCMP(a, b)		((a).mode != (b).mode || (a).fg != (b).fg || \
 				(a).bg != (b).bg)
 #define TIMEDIFF(t1, t2)	((t1.tv_sec-t2.tv_sec)*1000 + \
 				(t1.tv_nsec-t2.tv_nsec)/1E6)
@ -34,14 +33,8 @@ enum glyph_attribute {
 	ATTR_WRAP       = 1 << 8,
 	ATTR_WIDE       = 1 << 9,
 	ATTR_WDUMMY     = 1 << 10,
-	ATTR_BOXDRAW    = 1 << 11,
 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
-};
-
-enum drawing_mode {
-    DRAW_NONE = 0,
-    DRAW_BG = 1 << 0,
-    DRAW_FG = 1 << 1,
+	ATTR_DIRTYUNDERLINE = 1 << 15,
 };

 enum selection_mode {
@ -73,6 +66,8 @@ typedef struct {
 	ushort mode;      /* attribute flags */
 	uint32_t fg;      /* foreground  */
 	uint32_t bg;      /* background  */
+	int ustyle;	  /* underline style */
+	int ucolor[3];    /* underline color */
 } Glyph;

 typedef Glyph *Line;
@ -119,14 +114,6 @@ void *xmalloc(size_t);
 void *xrealloc(void *, size_t);
 char *xstrdup(const char *);

-int isboxdraw(Rune);
-ushort boxdrawindex(const Glyph *);
-#ifdef XFT_VERSION
-/* only exposed to x.c, otherwise we'll need Xft.h for the types */
-void boxdraw_xinit(Display *, Colormap, XftDraw *, Visual *);
-void drawboxes(int, int, int, int, XftColor *, XftColor *, const XftGlyphFontSpec *, int);
-#endif
-
 /* config.h globals */
 extern char *utmp;
 extern char *scroll;
@ -140,4 +127,4 @@ extern unsigned int tabspaces;
 extern unsigned int defaultfg;
 extern unsigned int defaultbg;
 extern unsigned int defaultcs;
-extern const int boxdraw, boxdraw_bold, boxdraw_braille;
+extern float alpha;
--- a/st.info
+++ b/st.info
@ -1,4 +1,5 @@
 st-mono| simpleterm monocolor,
+	Su,
 	acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	am,
 	bce,
@ -191,6 +192,7 @@ st-mono| simpleterm monocolor,
 	Ms=\E]52;%p1%s;%p2%s\007,
 	Se=\E[2 q,
 	Ss=\E[%p1%d q,
+	Sync=\EP=%p1%ds\E\\,

 st| simpleterm,
 	use=st-mono,
--- a/win.h
+++ b/win.h
@ -25,7 +25,7 @@ enum win_mode {

 void xbell(void);
 void xclipcopy(void);
-void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int);
+void xdrawcursor(int, int, Glyph, int, int, Glyph);
 void xdrawline(Line, int, int, int);
 void xfinishdraw(void);
 void xloadcols(void);
--- a/x.c
+++ b/x.c
Author	SHA1	Message	Date
syrell	9e7f107c1f	Added undercurl v0.8.4 patch	2023-06-27 22:36:11 +02:00
syrell	0749fc4857	Added title-parsing-fix v0.8.5 patch (#10 ) Reviewed-on: #10	2023-06-27 22:35:52 +02:00
syrell	539dfd0bac	Added appsync part2 v2020-06-18 patch (#9 ) Reviewed-on: #9	2023-06-27 22:35:14 +02:00
syrell	af62c87aa8	Added gruvbox-dark v0.8.5 patch (#8 ) Reviewed-on: #8	2023-06-27 22:31:59 +02:00
syrell	aa9d16a41b	Added dynamic-cursor-color v0.9 patch (#7 ) Reviewed-on: #7	2023-06-27 22:31:10 +02:00
syrell	71d1f725b3	feat/clipboard (#6 ) Reviewed-on: #6	2023-06-27 22:30:31 +02:00
syrell	fb7383d52f	Added bold-is-not-bright v2019-01-27 patch (#3 ) Reviewed-on: #3	2023-06-27 21:59:07 +02:00
syrell	3a32e68b82	Added anysize v.2022-07-18 patch (#2 ) Reviewed-on: #2	2023-06-27 21:57:51 +02:00
syrell	a8d62fe07b	Added alpha patch v0.8.5 (#1 ) Reviewed-on: #1	2023-06-27 21:56:48 +02:00