Boxdraw Support

3 files changed, 757 insertions, 398 deletions

diff --git a/patches/st-boxdraw_v2-0.8.5.diff b/patches/st-boxdraw_v2-0.8.5.diff
new file mode 100644
index 0000000..1ba0e46
--- /dev/null
+++ b/patches/st-boxdraw_v2-0.8.5.diff
@@ -0,0 +1,583 @@
+From 46a1124957b8de5e7f827656b64bfc3baeaa097f Mon Sep 17 00:00:00 2001
+From: wael <40663@protonmail.com>
+Date: Mon, 11 Apr 2022 17:04:30 +0300
+Subject: [PATCH] [st][patch][boxdraw] update to 0.8.5
+
+---
+ Makefile       |   3 +-
+ boxdraw.c      | 194 ++++++++++++++++++++++++++++++++++++++++++++
+ boxdraw_data.h | 214 +++++++++++++++++++++++++++++++++++++++++++++++++
+ config.def.h   |  12 +++
+ st.c           |   3 +
+ st.h           |  10 +++
+ x.c            |  21 +++--
+ 7 files changed, 451 insertions(+), 6 deletions(-)
+ create mode 100644 boxdraw.c
+ create mode 100644 boxdraw_data.h
+
+diff --git a/Makefile b/Makefile
+index 470ac86..6dfa212 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ 
+ include config.mk
+ 
+-SRC = st.c x.c
++SRC = st.c x.c boxdraw.c
+ OBJ = $(SRC:.c=.o)
+ 
+ all: options st
+@@ -23,6 +23,7 @@ config.h:
+ 
+ st.o: config.h st.h win.h
+ x.o: arg.h config.h st.h win.h
++boxdraw.o: config.h st.h boxdraw_data.h
+ 
+ $(OBJ): config.h config.mk
+ 
+diff --git a/boxdraw.c b/boxdraw.c
+new file mode 100644
+index 0000000..28a92d0
+--- /dev/null
++++ b/boxdraw.c
+@@ -0,0 +1,194 @@
++/*
++ * 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);
++		}
++	}
++}
+diff --git a/boxdraw_data.h b/boxdraw_data.h
+new file mode 100644
+index 0000000..7890500
+--- /dev/null
++++ b/boxdraw_data.h
+@@ -0,0 +1,214 @@
++/*
++ * 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) */
++};
+diff --git a/config.def.h b/config.def.h
+index 91ab8ca..7bb3ff7 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -67,6 +67,18 @@ 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
+diff --git a/st.c b/st.c
+index f43cfd3..baa2bed 100644
+--- a/st.c
++++ b/st.c
+@@ -1214,6 +1214,9 @@ 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
+diff --git a/st.h b/st.h
+index 519b9bd..07a7c66 100644
+--- a/st.h
++++ b/st.h
+@@ -33,6 +33,7 @@ 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,
+ };
+ 
+@@ -113,6 +114,14 @@ char *xstrdup(const char *);
+ 
+ int xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b);
+ 
++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;
+@@ -126,3 +135,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;
+diff --git a/x.c b/x.c
+index 2a3bd38..bf6bbf9 100644
+--- a/x.c
++++ b/x.c
+@@ -1237,6 +1237,8 @@ xinit(int cols, int rows)
+ 	xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
+ 	if (xsel.xtarget == None)
+ 		xsel.xtarget = XA_STRING;
++
++	boxdraw_xinit(xw.dpy, xw.cmap, xw.draw, xw.vis);
+ }
+ 
+ int
+@@ -1283,8 +1285,13 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+ 			yp = winy + font->ascent;
+ 		}
+ 
+-		/* Lookup character index with default font. */
+-		glyphidx = XftCharIndex(xw.dpy, font->match, rune);
++		if (mode & ATTR_BOXDRAW) {
++			/* minor shoehorning: boxdraw uses only this ushort */
++			glyphidx = boxdrawindex(&glyphs[i]);
++		} else {
++			/* Lookup character index with default font. */
++			glyphidx = XftCharIndex(xw.dpy, font->match, rune);
++		}
+ 		if (glyphidx) {
+ 			specs[numspecs].font = font->match;
+ 			specs[numspecs].glyph = glyphidx;
+@@ -1488,8 +1495,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
+ 	r.width = width;
+ 	XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
+ 
+-	/* Render the glyphs. */
+-	XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
++	if (base.mode & ATTR_BOXDRAW) {
++		drawboxes(winx, winy, width / len, win.ch, fg, bg, specs, len);
++	} else {
++		/* Render the glyphs. */
++		XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
++	}
+ 
+ 	/* Render underline and strikethrough. */
+ 	if (base.mode & ATTR_UNDERLINE) {
+@@ -1532,7 +1543,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
+ 	/*
+ 	 * Select the right color for the right mode.
+ 	 */
+-	g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
++	g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE|ATTR_BOXDRAW;
+ 
+ 	if (IS_SET(MODE_REVERSE)) {
+ 		g.mode |= ATTR_REVERSE;
+-- 
+2.35.1
+
diff --git a/patches/st-clickurl-0.8.5.diff b/patches/st-clickurl-0.8.5.diff
deleted file mode 100644
index 169f178..0000000
--- a/patches/st-clickurl-0.8.5.diff
+++ /dev/null
@@ -1,221 +0,0 @@
-From d5b492049f48dc411b0dd7dc01a403304c20438d Mon Sep 17 00:00:00 2001
-From: Jishnu Sen <jishnu1@gmail.com>
-Date: Sun, 7 Apr 2024 22:54:46 -0700
-Subject: [PATCH] Highlight URLs with control and follow with click
-
----
- config.def.h | 11 +++++++
- st.c         | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- st.h         |  9 ++++++
- x.c          | 24 +++++++++++++-
- 4 files changed, 132 insertions(+), 1 deletion(-)
-
-diff --git a/config.def.h b/config.def.h
-index 91ab8ca..4961830 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -472,3 +472,14 @@ static char ascii_printable[] =
- 	" !\"#$%&'()*+,-./0123456789:;<=>?"
- 	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
- 	"`abcdefghijklmnopqrstuvwxyz{|}~";
-+
-+/*
-+ * Open urls starting with urlprefixes, contatining urlchars
-+ * by passing as ARG1 to urlhandler.
-+ */
-+char* urlhandler = "xdg-open";
-+char urlchars[] =
-+	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-+	"abcdefghijklmnopqrstuvwxyz"
-+	"0123456789-._~:/?#@!$&'*+,;=%";
-+char* urlprefixes[] = {"http://", "https://", NULL};
-diff --git a/st.c b/st.c
-index 51049ba..8f2156c 100644
---- a/st.c
-+++ b/st.c
-@@ -643,6 +643,95 @@ getsel(void)
- 	return str;
- }
- 
-+char *
-+strstrany(char* s, char** strs) {
-+	char *match;
-+	for (int i = 0; strs[i]; i++) {
-+		if ((match = strstr(s, strs[i]))) {
-+			return match;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+void
-+highlighturls(void)
-+{
-+	char *match;
-+	char *linestr = calloc(sizeof(char), term.col+1); /* assume ascii */
-+	for (int i = term.top; i < term.bot; i++) {
-+		int url_start = -1;
-+		for (int j = 0; j < term.col; j++) {
-+			if (term.line[i][j].u < 127) {
-+				linestr[j] = term.line[i][j].u;
-+			}
-+			linestr[term.col] = '\0';
-+		}
-+		while ((match = strstrany(linestr + url_start + 1, urlprefixes))) {
-+			url_start = match - linestr;
-+			for (int c = url_start; c < term.col && strchr(urlchars, linestr[c]); c++) {
-+				term.line[i][c].mode |= ATTR_URL;
-+				tsetdirt(i, c);
-+			}
-+		}
-+	}
-+	free(linestr);
-+}
-+
-+void
-+unhighlighturls(void)
-+{
-+	for (int i = term.top; i < term.bot; i++) {
-+		for (int j = 0; j < term.col; j++) {
-+			Glyph* g = &term.line[i][j];
-+			if (g->mode & ATTR_URL) {
-+				g->mode &= ~ATTR_URL;
-+				tsetdirt(i, j);
-+			}
-+		}
-+	}
-+	return;
-+}
-+
-+void
-+followurl(int x, int y) {
-+	char *linestr = calloc(sizeof(char), term.col+1); /* assume ascii */
-+	char *match;
-+	for (int i = 0; i < term.col; i++) {
-+		if (term.line[x][i].u < 127) {
-+			linestr[i] = term.line[x][i].u;
-+		}
-+		linestr[term.col] = '\0';
-+	}
-+	int url_start = -1;
-+	while ((match = strstrany(linestr + url_start + 1, urlprefixes))) {
-+		url_start = match - linestr;
-+		int url_end = url_start;
-+		for (int c = url_start; c < term.col && strchr(urlchars, linestr[c]); c++) {
-+			url_end++;
-+		}
-+		if (url_start <= y && y < url_end) {
-+			linestr[url_end] = '\0';
-+			break;
-+		}
-+	}
-+	if (url_start == -1) {
-+		free(linestr);
-+		return;
-+	}
-+
-+	pid_t chpid;
-+	if ((chpid = fork()) == 0) {
-+		if (fork() == 0)
-+			execlp(urlhandler, urlhandler, linestr + url_start, NULL);
-+		exit(1);
-+	}
-+	if (chpid > 0)
-+		waitpid(chpid, NULL, 0);
-+	free(linestr);
-+	unhighlighturls();
-+}
-+
- void
- selclear(void)
- {
-diff --git a/st.h b/st.h
-index 519b9bd..354e7f9 100644
---- a/st.h
-+++ b/st.h
-@@ -34,6 +34,7 @@ enum glyph_attribute {
- 	ATTR_WIDE       = 1 << 9,
- 	ATTR_WDUMMY     = 1 << 10,
- 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
-+	ATTR_URL	= 1 << 14,
- };
- 
- enum selection_mode {
-@@ -105,6 +106,10 @@ void selextend(int, int, int, int);
- int selected(int, int);
- char *getsel(void);
- 
-+void highlighturls(void);
-+void unhighlighturls(void);
-+void followurl(int, int);
-+
- size_t utf8encode(Rune, char *);
- 
- void *xmalloc(size_t);
-@@ -126,3 +131,7 @@ extern unsigned int tabspaces;
- extern unsigned int defaultfg;
- extern unsigned int defaultbg;
- extern unsigned int defaultcs;
-+extern char *urlhandler;
-+extern char urlchars[];
-+extern char *urlprefixes[];
-+extern int nurlprefixes;
-diff --git a/x.c b/x.c
-index 8a16faa..13f68e4 100644
---- a/x.c
-+++ b/x.c
-@@ -191,6 +191,7 @@ static void usage(void);
- 
- static void (*handler[LASTEvent])(XEvent *) = {
- 	[KeyPress] = kpress,
-+	[KeyRelease] = kpress,
- 	[ClientMessage] = cmessage,
- 	[ConfigureNotify] = resize,
- 	[VisibilityNotify] = visibility,
-@@ -445,6 +446,15 @@ mouseaction(XEvent *e, uint release)
- 	/* ignore Button<N>mask for Button<N> - it's set on release */
- 	uint state = e->xbutton.state & ~buttonmask(e->xbutton.button);
- 
-+	if (release == 0 &&
-+	    e->xbutton.button == Button1 &&
-+	    (match(ControlMask, state) ||
-+	     match(ControlMask, state & ~forcemousemod))) {
-+		followurl(evrow(e), evcol(e));
-+		return 1;
-+	}
-+
-+
- 	for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
- 		if (ms->release == release &&
- 		    ms->button == e->xbutton.button &&
-@@ -1476,7 +1486,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
- 	XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
- 
- 	/* Render underline and strikethrough. */
--	if (base.mode & ATTR_UNDERLINE) {
-+	if (base.mode & ATTR_UNDERLINE || base.mode & ATTR_URL) {
- 		XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
- 				width, 1);
- 	}
-@@ -1831,6 +1841,18 @@ kpress(XEvent *ev)
- 		len = XmbLookupString(xw.ime.xic, e, buf, sizeof buf, &ksym, &status);
- 	else
- 		len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
-+
-+        /* 0. highlight URLs when control held */
-+	if (ksym == XK_Control_L) {
-+		highlighturls();
-+	} else if (ev->type == KeyRelease && e->keycode == XKeysymToKeycode(e->display, XK_Control_L)) {
-+		unhighlighturls();
-+	}
-+
-+	/* KeyRelease not relevant to shortcuts */
-+	if (ev->type == KeyRelease)
-+		return;
-+
- 	/* 1. shortcuts */
- 	for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
- 		if (ksym == bp->keysym && match(bp->mod, e->state)) {
--- 
-2.44.0
-
diff --git a/patches/st-ligatures-20241226-0.9.2.diff b/patches/st-ligatures-boxdraw-20240105-0.9.diff
index 698516f..4f62f43 100644
--- a/patches/st-ligatures-20241226-0.9.2.diff
+++ b/patches/st-ligatures-boxdraw-20240105-0.9.diff
@@ -1,36 +1,32 @@
 diff --git a/Makefile b/Makefile
-index 15db421..dfcea0f 100644
+index 6dfa212..adfa07a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -3,9 +3,9 @@
- .POSIX:
+@@ -4,7 +4,7 @@
  
  include config.mk
  
--SRC = st.c x.c
-+SRC = st.c x.c hb.c
+-SRC = st.c x.c boxdraw.c
++SRC = st.c x.c boxdraw.c hb.c
  OBJ = $(SRC:.c=.o)
  
- all: st
- 
-@@ -15,9 +15,10 @@ config.h:
- .c.o:
+ all: options st
+@@ -22,8 +22,9 @@ config.h:
  	$(CC) $(STCFLAGS) -c $<
  
  st.o: config.h st.h win.h
 -x.o: arg.h 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
  
  $(OBJ): config.h config.mk
  
- st: $(OBJ)
 diff --git a/config.mk b/config.mk
-index fdc29a7..6833b3b 100644
+index 1e306f8..3e13e53 100644
 --- a/config.mk
 +++ b/config.mk
-@@ -14,12 +14,14 @@ PKG_CONFIG = pkg-config
- 
+@@ -15,10 +15,12 @@ PKG_CONFIG = pkg-config
  # includes and libs
  INCS = -I$(X11INC) \
         `$(PKG_CONFIG) --cflags fontconfig` \
@@ -45,19 +41,6 @@ index fdc29a7..6833b3b 100644
  
  # flags
  STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
- STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
-@@ -28,9 +30,10 @@ STLDFLAGS = $(LIBS) $(LDFLAGS)
- # OpenBSD:
- #CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
- #LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
- #       `$(PKG_CONFIG) --libs fontconfig` \
--#       `$(PKG_CONFIG) --libs freetype2`
-+#       `$(PKG_CONFIG) --libs freetype2` \
-+#       `$(PKG_CONFIG) --libs harfbuzz`
- #MANPREFIX = ${PREFIX}/man
- 
- # compiler and linker
- # CC = c99
 diff --git a/hb.c b/hb.c
 new file mode 100644
 index 0000000..99412c8
@@ -210,11 +193,10 @@ index 0000000..3b0ef44
 +void hbtransform(HbTransformData *, XftFont *, const Glyph *, int, int);
 +void hbcleanup(HbTransformData *);
 diff --git a/st.c b/st.c
-index b9f66e7..da33a85 100644
+index 41d5ace..1c2edd6 100644
 --- a/st.c
 +++ b/st.c
-@@ -2658,9 +2658,10 @@ draw(void)
- 		cx--;
+@@ -2643,7 +2643,8 @@ draw(void)
  
  	drawregion(0, 0, term.col, term.row);
  	xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
@@ -224,13 +206,11 @@ index b9f66e7..da33a85 100644
  	term.ocx = cx;
  	term.ocy = term.c.y;
  	xfinishdraw();
- 	if (ocx != term.ocx || ocy != term.ocy)
 diff --git a/st.h b/st.h
-index fd3b0d8..142fdfe 100644
+index 808f5f7..ae41368 100644
 --- a/st.h
 +++ b/st.h
-@@ -10,9 +10,10 @@
- #define BETWEEN(x, a, b)	((a) <= (x) && (x) <= (b))
+@@ -11,7 +11,8 @@
  #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)
@@ -240,13 +220,11 @@ index fd3b0d8..142fdfe 100644
  				(a).bg != (b).bg)
  #define TIMEDIFF(t1, t2)	((t1.tv_sec-t2.tv_sec)*1000 + \
  				(t1.tv_nsec-t2.tv_nsec)/1E6)
- #define MODBIT(x, set, bit)	((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
 diff --git a/win.h b/win.h
 index 6de960d..94679e4 100644
 --- a/win.h
 +++ b/win.h
-@@ -24,9 +24,9 @@ enum win_mode {
- };
+@@ -25,7 +25,7 @@ enum win_mode {
  
  void xbell(void);
  void xclipcopy(void);
@@ -255,13 +233,11 @@ index 6de960d..94679e4 100644
  void xdrawline(Line, int, int, int);
  void xfinishdraw(void);
  void xloadcols(void);
- int xsetcolorname(int, const char *);
 diff --git a/x.c b/x.c
-index bd23686..2bf3b72 100644
+index bf6bbf9..96b117f 100644
 --- a/x.c
 +++ b/x.c
-@@ -18,8 +18,9 @@
- char *argv0;
+@@ -19,6 +19,7 @@ char *argv0;
  #include "arg.h"
  #include "st.h"
  #include "win.h"
@@ -269,9 +245,7 @@ index bd23686..2bf3b72 100644
  
  /* types used in config.h */
  typedef struct {
- 	uint mod;
-@@ -140,10 +141,11 @@ typedef struct {
- 	GC gc;
+@@ -141,8 +142,9 @@ typedef struct {
  } DC;
  
  static inline ushort sixd_to_16bit(int);
@@ -282,9 +256,7 @@ index bd23686..2bf3b72 100644
  static void xdrawglyph(Glyph, int, int);
  static void xclear(int, int, int, int);
  static int xgeommasktogravity(int);
- static int ximopen(Display *);
-@@ -756,9 +758,9 @@ xresize(int col, int row)
- 	XftDrawChange(xw.draw, xw.buf);
+@@ -757,7 +759,7 @@ xresize(int col, int row)
  	xclear(0, 0, win.w, win.h);
  
  	/* resize to new width */
@@ -293,9 +265,7 @@ index bd23686..2bf3b72 100644
  }
  
  ushort
- sixd_to_16bit(int x)
-@@ -1061,8 +1063,11 @@ xunloadfont(Font *f)
- 
+@@ -1062,6 +1064,9 @@ xunloadfont(Font *f)
  void
  xunloadfonts(void)
  {
@@ -305,9 +275,7 @@ index bd23686..2bf3b72 100644
  	/* Free the loaded fonts in the font cache.  */
  	while (frclen > 0)
  		XftFontClose(xw.dpy, frc[--frclen].font);
- 
-@@ -1184,9 +1189,9 @@ xinit(int cols, int rows)
- 	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
+@@ -1185,7 +1190,7 @@ xinit(int cols, int rows)
  	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
  
  	/* font spec buffer */
@@ -316,10 +284,8 @@ index bd23686..2bf3b72 100644
  
  	/* Xft rendering context */
  	xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
- 
-@@ -1238,144 +1243,155 @@ xinit(int cols, int rows)
- 	if (xsel.xtarget == None)
- 		xsel.xtarget = XA_STRING;
+@@ -1241,6 +1246,22 @@ xinit(int cols, int rows)
+ 	boxdraw_xinit(xw.dpy, xw.cmap, xw.draw, xw.vis);
  }
  
 +void
@@ -341,42 +307,28 @@ index bd23686..2bf3b72 100644
  int
  xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
  {
- 	float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp;
--	ushort mode, prevmode = USHRT_MAX;
-+	ushort mode = glyphs[0].mode & ~ATTR_WRAP;
- 	Font *font = &dc.font;
- 	int frcflags = FRC_NORMAL;
--	float runewidth = win.cw;
-+	float runewidth = win.cw * ((glyphs[0].mode & ATTR_WIDE) ? 2.0f : 1.0f);
- 	Rune rune;
- 	FT_UInt glyphidx;
- 	FcResult fcres;
+@@ -1255,133 +1276,164 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
  	FcPattern *fcpattern, *fontpattern;
  	FcFontSet *fcsets[] = { NULL };
  	FcCharSet *fccharset;
 -	int i, f, numspecs = 0;
-+	int f, code_idx, numspecs = 0;
++	int i, f, length = 0, start = 0, numspecs = 0;
 +	float cluster_xp = xp, cluster_yp = yp;
 +	HbTransformData shaped = { 0 };
++
++	/* Initial values. */
++	mode = prevmode = glyphs[0].mode & ~ATTR_WRAP;
++	xresetfontsettings(mode, &font, &frcflags);
  
--	for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
+ 	for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
 -		/* Fetch rune and mode for current glyph. */
 -		rune = glyphs[i].u;
 -		mode = glyphs[i].mode;
-+	/* Initial values. */
-+	xresetfontsettings(mode, &font, &frcflags);
++		mode = glyphs[i].mode & ~ATTR_WRAP;
  
--		/* Skip dummy wide-character spacing. */
+ 		/* Skip dummy wide-character spacing. */
 -		if (mode == ATTR_WDUMMY)
-+	/* Shape the segment. */
-+	hbtransform(&shaped, font->match, glyphs, 0, len);
-+	xp = winx; yp = winy + font->ascent;
-+	cluster_xp = xp; cluster_yp = yp;
-+
-+	for (code_idx = 0; code_idx < shaped.count; code_idx++) {
-+		int idx = shaped.glyphs[code_idx].cluster;
-+
-+		if (glyphs[idx].mode & ATTR_WDUMMY)
++		if (mode & ATTR_WDUMMY && i < (len - 1))
  			continue;
  
 -		/* Determine font for glyph if different from previous glyph. */
@@ -394,31 +346,36 @@ index bd23686..2bf3b72 100644
 -			} else if (mode & ATTR_BOLD) {
 -				font = &dc.bfont;
 -				frcflags = FRC_BOLD;
--			}
++		if (
++			prevmode != mode
++			|| ATTRCMP(glyphs[start], glyphs[i])
++			|| selected(x + i, y) != selected(x + start, y)
++			|| i == (len - 1)
++		) {
++			/* Handle 1-character wide segments and end of line */
++			length = i - start;
++			if (i == start) {
++				length = 1;
++			} else if (i == (len - 1)) {
++				length = (i - start + 1);
+ 			}
 -			yp = winy + font->ascent;
-+		/* Advance the drawing cursor if we've moved to a new cluster */
-+		if (code_idx > 0 && idx != shaped.glyphs[code_idx - 1].cluster) {
-+			xp += runewidth;
-+			cluster_xp = xp;
-+			cluster_yp = yp;
- 		}
+-		}
  
--		/* Lookup character index with default font. */
--		glyphidx = XftCharIndex(xw.dpy, font->match, rune);
+-		if (mode & ATTR_BOXDRAW) {
+-			/* minor shoehorning: boxdraw uses only this ushort */
+-			glyphidx = boxdrawindex(&glyphs[i]);
+-		} else {
+-			/* Lookup character index with default font. */
+-			glyphidx = XftCharIndex(xw.dpy, font->match, rune);
+-		}
 -		if (glyphidx) {
-+		if (shaped.glyphs[code_idx].codepoint != 0) {
-+			/* If symbol is found, put it into the specs. */
- 			specs[numspecs].font = font->match;
+-			specs[numspecs].font = font->match;
 -			specs[numspecs].glyph = glyphidx;
 -			specs[numspecs].x = (short)xp;
 -			specs[numspecs].y = (short)yp;
 -			xp += runewidth;
-+			specs[numspecs].glyph = shaped.glyphs[code_idx].codepoint;
-+			specs[numspecs].x = cluster_xp + (short)(shaped.positions[code_idx].x_offset / 64.);
-+			specs[numspecs].y = cluster_yp - (short)(shaped.positions[code_idx].y_offset / 64.);
-+			cluster_xp += shaped.positions[code_idx].x_advance / 64.;
-+			cluster_yp += shaped.positions[code_idx].y_advance / 64.;
- 			numspecs++;
+-			numspecs++;
 -			continue;
 -		}
 -
@@ -432,18 +389,112 @@ index bd23686..2bf3b72 100644
 -			if (!glyphidx && frc[f].flags == frcflags
 -					&& frc[f].unicodep == rune) {
 -				break;
-+		} else {
-+			/* If it's not found, try to fetch it through the font cache. */
-+			rune = glyphs[idx].u;
-+			for (f = 0; f < frclen; f++) {
-+				glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
-+				/* Everything correct. */
-+				if (glyphidx && frc[f].flags == frcflags)
-+					break;
-+				/* We got a default font for a not found glyph. */
-+				if (!glyphidx && frc[f].flags == frcflags
-+						&& frc[f].unicodep == rune) {
-+					break;
++			/* Shape the segment. */
++			hbtransform(&shaped, font->match, glyphs, start, length);
++			runewidth = win.cw * ((glyphs[start].mode & ATTR_WIDE) ? 2.0f : 1.0f);
++			cluster_xp = xp; cluster_yp = yp;
++			for (int code_idx = 0; code_idx < shaped.count; code_idx++) {
++				int idx = shaped.glyphs[code_idx].cluster;
++
++				if (glyphs[start + idx].mode & ATTR_WDUMMY)
++					continue;
++
++				/* Advance the drawing cursor if we've moved to a new cluster */
++				if (code_idx > 0 && idx != shaped.glyphs[code_idx - 1].cluster) {
++					xp += runewidth;
++					cluster_xp = xp;
++					cluster_yp = yp;
++					runewidth = win.cw * ((glyphs[start + idx].mode & ATTR_WIDE) ? 2.0f : 1.0f);
++				}
++
++				if (glyphs[start + idx].mode & ATTR_BOXDRAW) {
++					/* minor shoehorning: boxdraw uses only this ushort */
++					specs[numspecs].font = font->match;
++					specs[numspecs].glyph = boxdrawindex(&glyphs[start + idx]);
++					specs[numspecs].x = xp;
++					specs[numspecs].y = yp;
++					numspecs++;
++				} else if (shaped.glyphs[code_idx].codepoint != 0) {
++					/* If symbol is found, put it into the specs. */
++					specs[numspecs].font = font->match;
++					specs[numspecs].glyph = shaped.glyphs[code_idx].codepoint;
++					specs[numspecs].x = cluster_xp + (short)(shaped.positions[code_idx].x_offset / 64.);
++					specs[numspecs].y = cluster_yp - (short)(shaped.positions[code_idx].y_offset / 64.);
++					cluster_xp += shaped.positions[code_idx].x_advance / 64.;
++					cluster_yp += shaped.positions[code_idx].y_advance / 64.;
++					numspecs++;
++				} else {
++					/* If it's not found, try to fetch it through the font cache. */
++					rune = glyphs[start + idx].u;
++					for (f = 0; f < frclen; f++) {
++						glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
++						/* Everything correct. */
++						if (glyphidx && frc[f].flags == frcflags)
++							break;
++						/* We got a default font for a not found glyph. */
++						if (!glyphidx && frc[f].flags == frcflags
++								&& frc[f].unicodep == rune) {
++							break;
++						}
++					}
++
++					/* Nothing was found. Use fontconfig to find matching font. */
++					if (f >= frclen) {
++						if (!font->set)
++							font->set = FcFontSort(0, font->pattern,
++																		 1, 0, &fcres);
++						fcsets[0] = font->set;
++
++						/*
++						 * Nothing was found in the cache. Now use
++						 * some dozen of Fontconfig calls to get the
++						 * font for one single character.
++						 *
++						 * Xft and fontconfig are design failures.
++						 */
++						fcpattern = FcPatternDuplicate(font->pattern);
++						fccharset = FcCharSetCreate();
++
++						FcCharSetAddChar(fccharset, rune);
++						FcPatternAddCharSet(fcpattern, FC_CHARSET,
++								fccharset);
++						FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
++
++						FcConfigSubstitute(0, fcpattern,
++								FcMatchPattern);
++						FcDefaultSubstitute(fcpattern);
++
++						fontpattern = FcFontSetMatch(0, fcsets, 1,
++								fcpattern, &fcres);
++
++						/* Allocate memory for the new cache entry. */
++						if (frclen >= frccap) {
++							frccap += 16;
++							frc = xrealloc(frc, frccap * sizeof(Fontcache));
++						}
++
++						frc[frclen].font = XftFontOpenPattern(xw.dpy,
++								fontpattern);
++						if (!frc[frclen].font)
++							die("XftFontOpenPattern failed seeking fallback font: %s\n",
++								strerror(errno));
++						frc[frclen].flags = frcflags;
++						frc[frclen].unicodep = rune;
++
++						glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
++
++						f = frclen;
++						frclen++;
++
++						FcPatternDestroy(fcpattern);
++						FcCharSetDestroy(fccharset);
++					}
++
++					specs[numspecs].font = frc[f].font;
++					specs[numspecs].glyph = glyphidx;
++					specs[numspecs].x = (short)xp;
++					specs[numspecs].y = (short)yp;
++					numspecs++;
 +				}
  			}
 -		}
@@ -454,7 +505,10 @@ index bd23686..2bf3b72 100644
 -				font->set = FcFontSort(0, font->pattern,
 -				                       1, 0, &fcres);
 -			fcsets[0] = font->set;
--
++			/* Cleanup and get ready for next segment. */
++			hbcleanup(&shaped);
++			start = i;
+ 
 -			/*
 -			 * Nothing was found in the cache. Now use
 -			 * some dozen of Fontconfig calls to get the
@@ -481,58 +535,13 @@ index bd23686..2bf3b72 100644
 -			if (frclen >= frccap) {
 -				frccap += 16;
 -				frc = xrealloc(frc, frccap * sizeof(Fontcache));
-+			/* Nothing was found. Use fontconfig to find matching font. */
-+			if (f >= frclen) {
-+				if (!font->set)
-+					font->set = FcFontSort(0, font->pattern,
-+							       1, 0, &fcres);
-+				fcsets[0] = font->set;
-+
-+				/*
-+				 * Nothing was found in the cache. Now use
-+				 * some dozen of Fontconfig calls to get the
-+				 * font for one single character.
-+				 *
-+				 * Xft and fontconfig are design failures.
-+				 */
-+				fcpattern = FcPatternDuplicate(font->pattern);
-+				fccharset = FcCharSetCreate();
-+
-+				FcCharSetAddChar(fccharset, rune);
-+				FcPatternAddCharSet(fcpattern, FC_CHARSET,
-+						fccharset);
-+				FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
-+
-+				FcConfigSubstitute(0, fcpattern,
-+						FcMatchPattern);
-+				FcDefaultSubstitute(fcpattern);
-+
-+				fontpattern = FcFontSetMatch(0, fcsets, 1,
-+						fcpattern, &fcres);
-+
-+				/* Allocate memory for the new cache entry. */
-+				if (frclen >= frccap) {
-+					frccap += 16;
-+					frc = xrealloc(frc, frccap * sizeof(Fontcache));
-+				}
-+
-+				frc[frclen].font = XftFontOpenPattern(xw.dpy,
-+						fontpattern);
-+				if (!frc[frclen].font)
-+					die("XftFontOpenPattern failed seeking fallback font: %s\n",
-+						strerror(errno));
-+				frc[frclen].flags = frcflags;
-+				frc[frclen].unicodep = rune;
-+
-+				glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
-+
-+				f = frclen;
-+				frclen++;
-+
-+				FcPatternDestroy(fcpattern);
-+				FcCharSetDestroy(fccharset);
++			/* Determine font for glyph if different from previous glyph. */
++			if (prevmode != mode) {
++				prevmode = mode;
++				xresetfontsettings(mode, &font, &frcflags);
++				yp = winy + font->ascent;
  			}
- 
+-
 -			frc[frclen].font = XftFontOpenPattern(xw.dpy,
 -					fontpattern);
 -			if (!frc[frclen].font)
@@ -548,11 +557,6 @@ index bd23686..2bf3b72 100644
 -
 -			FcPatternDestroy(fcpattern);
 -			FcCharSetDestroy(fccharset);
-+			specs[numspecs].font = frc[f].font;
-+			specs[numspecs].glyph = glyphidx;
-+			specs[numspecs].x = (short)xp;
-+			specs[numspecs].y = (short)yp;
-+			numspecs++;
  		}
 -
 -		specs[numspecs].font = frc[f].font;
@@ -563,7 +567,6 @@ index bd23686..2bf3b72 100644
 -		numspecs++;
  	}
  
-+	/* Cleanup and get ready for next segment. */
 +	hbcleanup(&shaped);
  	return numspecs;
  }
@@ -576,9 +579,7 @@ index bd23686..2bf3b72 100644
  	int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
  	    width = charlen * win.cw;
  	Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
- 	XRenderColor colfg, colbg;
-@@ -1509,23 +1525,26 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
- void
+@@ -1521,21 +1573,24 @@ void
  xdrawglyph(Glyph g, int x, int y)
  {
  	int numspecs;
@@ -608,9 +609,7 @@ index bd23686..2bf3b72 100644
  
  	if (IS_SET(MODE_HIDE))
  		return;
- 
-@@ -1657,30 +1676,30 @@ xdrawline(Line line, int x1, int y1, int x2)
- 	int i, x, ox, numspecs;
+@@ -1663,18 +1718,16 @@ xdrawline(Line line, int x1, int y1, int x2)
  	Glyph base, new;
  	XftGlyphFontSpec *specs = xw.specbuf;
  
@@ -633,8 +632,7 @@ index bd23686..2bf3b72 100644
  			i = 0;
  		}
  		if (i == 0) {
- 			ox = x;
- 			base = new;
+@@ -1683,8 +1736,10 @@ xdrawline(Line line, int x1, int y1, int x2)
  		}
  		i++;
  	}
@@ -647,4 +645,3 @@ index bd23686..2bf3b72 100644
  }
  
  void
- xfinishdraw(void)