it* st + patches and config Err codevoid.de 70 i Err codevoid.de 70 hgit clone git://git.codevoid.de/st-sdk URL:git://git.codevoid.de/st-sdk codevoid.de 70 1Log /git/st-sdk/log.gph codevoid.de 70 1Files /git/st-sdk/files.gph codevoid.de 70 1Refs /git/st-sdk/refs.gph codevoid.de 70 1README /git/st-sdk/file/README.gph codevoid.de 70 1LICENSE /git/st-sdk/file/LICENSE.gph codevoid.de 70 i--- Err codevoid.de 70 1commit 1ba04986ac35ac7e14dc46d3e85d59b16570492b /git/st-sdk/commit/1ba04986ac35ac7e14dc46d3e85d59b16570492b.gph codevoid.de 70 1parent 7f8357954492f2039f30b4281519f64591802883 /git/st-sdk/commit/7f8357954492f2039f30b4281519f64591802883.gph codevoid.de 70 hAuthor: Stefan Hagen URL:mailto:sh+git[at]codevoid[dot]de codevoid.de 70 iDate: Wed, 28 Aug 2019 21:15:39 +0200 Err codevoid.de 70 i Err codevoid.de 70 iAdd and enable boxdraw patch Err codevoid.de 70 i Err codevoid.de 70 iDiffstat: Err codevoid.de 70 i M Makefile | 3 ++- Err codevoid.de 70 i A boxdraw.c | 194 ++++++++++++++++++++++++++++++ Err codevoid.de 70 i A boxdraw_data.h | 214 +++++++++++++++++++++++++++++++ Err codevoid.de 70 i M config.def.h | 12 ++++++++++++ Err codevoid.de 70 i M config.h | 12 ++++++++++++ Err codevoid.de 70 i A patches/st-boxdraw_v2-0.8.2.diff | 598 +++++++++++++++++++++++++++++++ Err codevoid.de 70 i M st.c | 3 +++ Err codevoid.de 70 i M st.h | 10 ++++++++++ Err codevoid.de 70 i M x.c | 21 ++++++++++++++++----- Err codevoid.de 70 i Err codevoid.de 70 i9 files changed, 1061 insertions(+), 6 deletions(-) Err codevoid.de 70 i--- Err codevoid.de 70 1diff --git a/Makefile b/Makefile /git/st-sdk/file/Makefile.gph codevoid.de 70 it@@ -4,7 +4,7 @@ Err codevoid.de 70 i Err codevoid.de 70 i include config.mk Err codevoid.de 70 i Err codevoid.de 70 i-SRC = st.c x.c Err codevoid.de 70 i+SRC = st.c x.c boxdraw.c Err codevoid.de 70 i OBJ = $(SRC:.c=.o) Err codevoid.de 70 i Err codevoid.de 70 i all: options st Err codevoid.de 70 it@@ -23,6 +23,7 @@ config.h: Err codevoid.de 70 i Err codevoid.de 70 i st.o: config.h st.h win.h Err codevoid.de 70 i x.o: arg.h st.h win.h Err codevoid.de 70 i+boxdraw.o: config.h st.h boxdraw_data.h Err codevoid.de 70 i Err codevoid.de 70 i $(OBJ): config.h config.mk Err codevoid.de 70 i Err codevoid.de 70 1diff --git a/boxdraw.c b/boxdraw.c /git/st-sdk/file/boxdraw.c.gph codevoid.de 70 it@@ -0,0 +1,194 @@ Err codevoid.de 70 i+/* Err codevoid.de 70 i+ * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih Err codevoid.de 70 i+ * MIT/X Consortium License Err codevoid.de 70 i+ */ Err codevoid.de 70 i+ Err codevoid.de 70 i+#include Err codevoid.de 70 i+#include "st.h" Err codevoid.de 70 i+#include "boxdraw_data.h" Err codevoid.de 70 i+ Err codevoid.de 70 i+/* Rounded non-negative integers division of n / d */ Err codevoid.de 70 i+#define DIV(n, d) (((n) + (d) / 2) / (d)) Err codevoid.de 70 i+ Err codevoid.de 70 i+static Display *xdpy; Err codevoid.de 70 i+static Colormap xcmap; Err codevoid.de 70 i+static XftDraw *xd; Err codevoid.de 70 i+static Visual *xvis; Err codevoid.de 70 i+ Err codevoid.de 70 i+static void drawbox(int, int, int, int, XftColor *, XftColor *, ushort); Err codevoid.de 70 i+static void drawboxlines(int, int, int, int, XftColor *, ushort); Err codevoid.de 70 i+ Err codevoid.de 70 i+/* public API */ Err codevoid.de 70 i+ Err codevoid.de 70 i+void Err codevoid.de 70 i+boxdraw_xinit(Display *dpy, Colormap cmap, XftDraw *draw, Visual *vis) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ xdpy = dpy; xcmap = cmap; xd = draw, xvis = vis; Err codevoid.de 70 i+} Err codevoid.de 70 i+ Err codevoid.de 70 i+int Err codevoid.de 70 i+isboxdraw(Rune u) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ Rune block = u & ~0xff; Err codevoid.de 70 i+ return (boxdraw && block == 0x2500 && boxdata[(uint8_t)u]) || Err codevoid.de 70 i+ (boxdraw_braille && block == 0x2800); Err codevoid.de 70 i+} Err codevoid.de 70 i+ Err codevoid.de 70 i+/* the "index" is actually the entire shape data encoded as ushort */ Err codevoid.de 70 i+ushort Err codevoid.de 70 i+boxdrawindex(const Glyph *g) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ if (boxdraw_braille && (g->u & ~0xff) == 0x2800) Err codevoid.de 70 i+ return BRL | (uint8_t)g->u; Err codevoid.de 70 i+ if (boxdraw_bold && (g->mode & ATTR_BOLD)) Err codevoid.de 70 i+ return BDB | boxdata[(uint8_t)g->u]; Err codevoid.de 70 i+ return boxdata[(uint8_t)g->u]; Err codevoid.de 70 i+} Err codevoid.de 70 i+ Err codevoid.de 70 i+void Err codevoid.de 70 i+drawboxes(int x, int y, int cw, int ch, XftColor *fg, XftColor *bg, Err codevoid.de 70 i+ const XftGlyphFontSpec *specs, int len) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ for ( ; len-- > 0; x += cw, specs++) Err codevoid.de 70 i+ drawbox(x, y, cw, ch, fg, bg, (ushort)specs->glyph); Err codevoid.de 70 i+} Err codevoid.de 70 i+ Err codevoid.de 70 i+/* implementation */ Err codevoid.de 70 i+ Err codevoid.de 70 i+void Err codevoid.de 70 i+drawbox(int x, int y, int w, int h, XftColor *fg, XftColor *bg, ushort bd) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ ushort cat = bd & ~(BDB | 0xff); /* mask out bold and data */ Err codevoid.de 70 i+ if (bd & (BDL | BDA)) { Err codevoid.de 70 i+ /* lines (light/double/heavy/arcs) */ Err codevoid.de 70 i+ drawboxlines(x, y, w, h, fg, bd); Err codevoid.de 70 i+ Err codevoid.de 70 i+ } else if (cat == BBD) { Err codevoid.de 70 i+ /* lower (8-X)/8 block */ Err codevoid.de 70 i+ int d = DIV((uint8_t)bd * h, 8); Err codevoid.de 70 i+ XftDrawRect(xd, fg, x, y + d, w, h - d); Err codevoid.de 70 i+ Err codevoid.de 70 i+ } else if (cat == BBU) { Err codevoid.de 70 i+ /* upper X/8 block */ Err codevoid.de 70 i+ XftDrawRect(xd, fg, x, y, w, DIV((uint8_t)bd * h, 8)); Err codevoid.de 70 i+ Err codevoid.de 70 i+ } else if (cat == BBL) { Err codevoid.de 70 i+ /* left X/8 block */ Err codevoid.de 70 i+ XftDrawRect(xd, fg, x, y, DIV((uint8_t)bd * w, 8), h); Err codevoid.de 70 i+ Err codevoid.de 70 i+ } else if (cat == BBR) { Err codevoid.de 70 i+ /* right (8-X)/8 block */ Err codevoid.de 70 i+ int d = DIV((uint8_t)bd * w, 8); Err codevoid.de 70 i+ XftDrawRect(xd, fg, x + d, y, w - d, h); Err codevoid.de 70 i+ Err codevoid.de 70 i+ } else if (cat == BBQ) { Err codevoid.de 70 i+ /* Quadrants */ Err codevoid.de 70 i+ int w2 = DIV(w, 2), h2 = DIV(h, 2); Err codevoid.de 70 i+ if (bd & TL) Err codevoid.de 70 i+ XftDrawRect(xd, fg, x, y, w2, h2); Err codevoid.de 70 i+ if (bd & TR) Err codevoid.de 70 i+ XftDrawRect(xd, fg, x + w2, y, w - w2, h2); Err codevoid.de 70 i+ if (bd & BL) Err codevoid.de 70 i+ XftDrawRect(xd, fg, x, y + h2, w2, h - h2); Err codevoid.de 70 i+ if (bd & BR) Err codevoid.de 70 i+ XftDrawRect(xd, fg, x + w2, y + h2, w - w2, h - h2); Err codevoid.de 70 i+ Err codevoid.de 70 i+ } else if (bd & BBS) { Err codevoid.de 70 i+ /* Shades - data is 1/2/3 for 25%/50%/75% alpha, respectively */ Err codevoid.de 70 i+ int d = (uint8_t)bd; Err codevoid.de 70 i+ XftColor xfc; Err codevoid.de 70 i+ XRenderColor xrc = { .alpha = 0xffff }; Err codevoid.de 70 i+ Err codevoid.de 70 i+ xrc.red = DIV(fg->color.red * d + bg->color.red * (4 - d), 4); Err codevoid.de 70 i+ xrc.green = DIV(fg->color.green * d + bg->color.green * (4 - d), 4); Err codevoid.de 70 i+ xrc.blue = DIV(fg->color.blue * d + bg->color.blue * (4 - d), 4); Err codevoid.de 70 i+ Err codevoid.de 70 i+ XftColorAllocValue(xdpy, xvis, xcmap, &xrc, &xfc); Err codevoid.de 70 i+ XftDrawRect(xd, &xfc, x, y, w, h); Err codevoid.de 70 i+ XftColorFree(xdpy, xvis, xcmap, &xfc); Err codevoid.de 70 i+ Err codevoid.de 70 i+ } else if (cat == BRL) { Err codevoid.de 70 i+ /* braille, each data bit corresponds to one dot at 2x4 grid */ Err codevoid.de 70 i+ int w1 = DIV(w, 2); Err codevoid.de 70 i+ int h1 = DIV(h, 4), h2 = DIV(h, 2), h3 = DIV(3 * h, 4); Err codevoid.de 70 i+ Err codevoid.de 70 i+ if (bd & 1) XftDrawRect(xd, fg, x, y, w1, h1); Err codevoid.de 70 i+ if (bd & 2) XftDrawRect(xd, fg, x, y + h1, w1, h2 - h1); Err codevoid.de 70 i+ if (bd & 4) XftDrawRect(xd, fg, x, y + h2, w1, h3 - h2); Err codevoid.de 70 i+ if (bd & 8) XftDrawRect(xd, fg, x + w1, y, w - w1, h1); Err codevoid.de 70 i+ if (bd & 16) XftDrawRect(xd, fg, x + w1, y + h1, w - w1, h2 - h1); Err codevoid.de 70 i+ if (bd & 32) XftDrawRect(xd, fg, x + w1, y + h2, w - w1, h3 - h2); Err codevoid.de 70 i+ if (bd & 64) XftDrawRect(xd, fg, x, y + h3, w1, h - h3); Err codevoid.de 70 i+ if (bd & 128) XftDrawRect(xd, fg, x + w1, y + h3, w - w1, h - h3); Err codevoid.de 70 i+ Err codevoid.de 70 i+ } Err codevoid.de 70 i+} Err codevoid.de 70 i+ Err codevoid.de 70 i+void Err codevoid.de 70 i+drawboxlines(int x, int y, int w, int h, XftColor *fg, ushort bd) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ /* s: stem thickness. width/8 roughly matches underscore thickness. */ Err codevoid.de 70 i+ /* We draw bold as 1.5 * normal-stem and at least 1px thicker. */ Err codevoid.de 70 i+ /* doubles draw at least 3px, even when w or h < 3. bold needs 6px. */ Err codevoid.de 70 i+ int mwh = MIN(w, h); Err codevoid.de 70 i+ int base_s = MAX(1, DIV(mwh, 8)); Err codevoid.de 70 i+ int bold = (bd & BDB) && mwh >= 6; /* possibly ignore boldness */ Err codevoid.de 70 i+ int s = bold ? MAX(base_s + 1, DIV(3 * base_s, 2)) : base_s; Err codevoid.de 70 i+ int w2 = DIV(w - s, 2), h2 = DIV(h - s, 2); Err codevoid.de 70 i+ /* the s-by-s square (x + w2, y + h2, s, s) is the center texel. */ Err codevoid.de 70 i+ /* The base length (per direction till edge) includes this square. */ Err codevoid.de 70 i+ Err codevoid.de 70 i+ int light = bd & (LL | LU | LR | LD); Err codevoid.de 70 i+ int double_ = bd & (DL | DU | DR | DD); Err codevoid.de 70 i+ Err codevoid.de 70 i+ if (light) { Err codevoid.de 70 i+ /* d: additional (negative) length to not-draw the center */ Err codevoid.de 70 i+ /* texel - at arcs and avoid drawing inside (some) doubles */ Err codevoid.de 70 i+ int arc = bd & BDA; Err codevoid.de 70 i+ int multi_light = light & (light - 1); Err codevoid.de 70 i+ int multi_double = double_ & (double_ - 1); Err codevoid.de 70 i+ /* light crosses double only at DH+LV, DV+LH (ref. shapes) */ Err codevoid.de 70 i+ int d = arc || (multi_double && !multi_light) ? -s : 0; Err codevoid.de 70 i+ Err codevoid.de 70 i+ if (bd & LL) Err codevoid.de 70 i+ XftDrawRect(xd, fg, x, y + h2, w2 + s + d, s); Err codevoid.de 70 i+ if (bd & LU) Err codevoid.de 70 i+ XftDrawRect(xd, fg, x + w2, y, s, h2 + s + d); Err codevoid.de 70 i+ if (bd & LR) Err codevoid.de 70 i+ XftDrawRect(xd, fg, x + w2 - d, y + h2, w - w2 + d, s); Err codevoid.de 70 i+ if (bd & LD) Err codevoid.de 70 i+ XftDrawRect(xd, fg, x + w2, y + h2 - d, s, h - h2 + d); Err codevoid.de 70 i+ } Err codevoid.de 70 i+ Err codevoid.de 70 i+ /* double lines - also align with light to form heavy when combined */ Err codevoid.de 70 i+ if (double_) { Err codevoid.de 70 i+ /* Err codevoid.de 70 i+ * going clockwise, for each double-ray: p is additional length Err codevoid.de 70 i+ * to the single-ray nearer to the previous direction, and n to Err codevoid.de 70 i+ * the next. p and n adjust from the base length to lengths Err codevoid.de 70 i+ * which consider other doubles - shorter to avoid intersections Err codevoid.de 70 i+ * (p, n), or longer to draw the far-corner texel (n). Err codevoid.de 70 i+ */ Err codevoid.de 70 i+ int dl = bd & DL, du = bd & DU, dr = bd & DR, dd = bd & DD; Err codevoid.de 70 i+ if (dl) { Err codevoid.de 70 i+ int p = dd ? -s : 0, n = du ? -s : dd ? s : 0; Err codevoid.de 70 i+ XftDrawRect(xd, fg, x, y + h2 + s, w2 + s + p, s); Err codevoid.de 70 i+ XftDrawRect(xd, fg, x, y + h2 - s, w2 + s + n, s); Err codevoid.de 70 i+ } Err codevoid.de 70 i+ if (du) { Err codevoid.de 70 i+ int p = dl ? -s : 0, n = dr ? -s : dl ? s : 0; Err codevoid.de 70 i+ XftDrawRect(xd, fg, x + w2 - s, y, s, h2 + s + p); Err codevoid.de 70 i+ XftDrawRect(xd, fg, x + w2 + s, y, s, h2 + s + n); Err codevoid.de 70 i+ } Err codevoid.de 70 i+ if (dr) { Err codevoid.de 70 i+ int p = du ? -s : 0, n = dd ? -s : du ? s : 0; Err codevoid.de 70 i+ XftDrawRect(xd, fg, x + w2 - p, y + h2 - s, w - w2 + p, s); Err codevoid.de 70 i+ XftDrawRect(xd, fg, x + w2 - n, y + h2 + s, w - w2 + n, s); Err codevoid.de 70 i+ } Err codevoid.de 70 i+ if (dd) { Err codevoid.de 70 i+ int p = dr ? -s : 0, n = dl ? -s : dr ? s : 0; Err codevoid.de 70 i+ XftDrawRect(xd, fg, x + w2 + s, y + h2 - p, s, h - h2 + p); Err codevoid.de 70 i+ XftDrawRect(xd, fg, x + w2 - s, y + h2 - n, s, h - h2 + n); Err codevoid.de 70 i+ } Err codevoid.de 70 i+ } Err codevoid.de 70 i+} Err codevoid.de 70 1diff --git a/boxdraw_data.h b/boxdraw_data.h /git/st-sdk/file/boxdraw_data.h.gph codevoid.de 70 it@@ -0,0 +1,214 @@ Err codevoid.de 70 i+/* Err codevoid.de 70 i+ * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih Err codevoid.de 70 i+ * MIT/X Consortium License Err codevoid.de 70 i+ */ Err codevoid.de 70 i+ Err codevoid.de 70 i+/* Err codevoid.de 70 i+ * U+25XX codepoints data Err codevoid.de 70 i+ * Err codevoid.de 70 i+ * References: Err codevoid.de 70 i+ * http://www.unicode.org/charts/PDF/U2500.pdf Err codevoid.de 70 i+ * http://www.unicode.org/charts/PDF/U2580.pdf Err codevoid.de 70 i+ * Err codevoid.de 70 i+ * Test page: Err codevoid.de 70 i+ * https://github.com/GNOME/vte/blob/master/doc/boxes.txt Err codevoid.de 70 i+ */ Err codevoid.de 70 i+ Err codevoid.de 70 i+/* Each shape is encoded as 16-bits. Higher bits are category, lower are data */ Err codevoid.de 70 i+/* Categories (mutually exclusive except BDB): */ Err codevoid.de 70 i+/* For convenience, BDL/BDA/BBS/BDB are 1 bit each, the rest are enums */ Err codevoid.de 70 i+#define BDL (1<<8) /* Box Draw Lines (light/double/heavy) */ Err codevoid.de 70 i+#define BDA (1<<9) /* Box Draw Arc (light) */ Err codevoid.de 70 i+ Err codevoid.de 70 i+#define BBD (1<<10) /* Box Block Down (lower) X/8 */ Err codevoid.de 70 i+#define BBL (2<<10) /* Box Block Left X/8 */ Err codevoid.de 70 i+#define BBU (3<<10) /* Box Block Upper X/8 */ Err codevoid.de 70 i+#define BBR (4<<10) /* Box Block Right X/8 */ Err codevoid.de 70 i+#define BBQ (5<<10) /* Box Block Quadrants */ Err codevoid.de 70 i+#define BRL (6<<10) /* Box Braille (data is lower byte of U28XX) */ Err codevoid.de 70 i+ Err codevoid.de 70 i+#define BBS (1<<14) /* Box Block Shades */ Err codevoid.de 70 i+#define BDB (1<<15) /* Box Draw is Bold */ Err codevoid.de 70 i+ Err codevoid.de 70 i+/* (BDL/BDA) Light/Double/Heavy x Left/Up/Right/Down/Horizontal/Vertical */ Err codevoid.de 70 i+/* Heavy is light+double (literally drawing light+double align to form heavy) */ Err codevoid.de 70 i+#define LL (1<<0) Err codevoid.de 70 i+#define LU (1<<1) Err codevoid.de 70 i+#define LR (1<<2) Err codevoid.de 70 i+#define LD (1<<3) Err codevoid.de 70 i+#define LH (LL+LR) Err codevoid.de 70 i+#define LV (LU+LD) Err codevoid.de 70 i+ Err codevoid.de 70 i+#define DL (1<<4) Err codevoid.de 70 i+#define DU (1<<5) Err codevoid.de 70 i+#define DR (1<<6) Err codevoid.de 70 i+#define DD (1<<7) Err codevoid.de 70 i+#define DH (DL+DR) Err codevoid.de 70 i+#define DV (DU+DD) Err codevoid.de 70 i+ Err codevoid.de 70 i+#define HL (LL+DL) Err codevoid.de 70 i+#define HU (LU+DU) Err codevoid.de 70 i+#define HR (LR+DR) Err codevoid.de 70 i+#define HD (LD+DD) Err codevoid.de 70 i+#define HH (HL+HR) Err codevoid.de 70 i+#define HV (HU+HD) Err codevoid.de 70 i+ Err codevoid.de 70 i+/* (BBQ) Quadrants Top/Bottom x Left/Right */ Err codevoid.de 70 i+#define TL (1<<0) Err codevoid.de 70 i+#define TR (1<<1) Err codevoid.de 70 i+#define BL (1<<2) Err codevoid.de 70 i+#define BR (1<<3) Err codevoid.de 70 i+ Err codevoid.de 70 i+/* Data for U+2500 - U+259F except dashes/diagonals */ Err codevoid.de 70 i+static const unsigned short boxdata[256] = { Err codevoid.de 70 i+ /* light lines */ Err codevoid.de 70 i+ [0x00] = BDL + LH, /* light horizontal */ Err codevoid.de 70 i+ [0x02] = BDL + LV, /* light vertical */ Err codevoid.de 70 i+ [0x0c] = BDL + LD + LR, /* light down and right */ Err codevoid.de 70 i+ [0x10] = BDL + LD + LL, /* light down and left */ Err codevoid.de 70 i+ [0x14] = BDL + LU + LR, /* light up and right */ Err codevoid.de 70 i+ [0x18] = BDL + LU + LL, /* light up and left */ Err codevoid.de 70 i+ [0x1c] = BDL + LV + LR, /* light vertical and right */ Err codevoid.de 70 i+ [0x24] = BDL + LV + LL, /* light vertical and left */ Err codevoid.de 70 i+ [0x2c] = BDL + LH + LD, /* light horizontal and down */ Err codevoid.de 70 i+ [0x34] = BDL + LH + LU, /* light horizontal and up */ Err codevoid.de 70 i+ [0x3c] = BDL + LV + LH, /* light vertical and horizontal */ Err codevoid.de 70 i+ [0x74] = BDL + LL, /* light left */ Err codevoid.de 70 i+ [0x75] = BDL + LU, /* light up */ Err codevoid.de 70 i+ [0x76] = BDL + LR, /* light right */ Err codevoid.de 70 i+ [0x77] = BDL + LD, /* light down */ Err codevoid.de 70 i+ Err codevoid.de 70 i+ /* heavy [+light] lines */ Err codevoid.de 70 i+ [0x01] = BDL + HH, Err codevoid.de 70 i+ [0x03] = BDL + HV, Err codevoid.de 70 i+ [0x0d] = BDL + HR + LD, Err codevoid.de 70 i+ [0x0e] = BDL + HD + LR, Err codevoid.de 70 i+ [0x0f] = BDL + HD + HR, Err codevoid.de 70 i+ [0x11] = BDL + HL + LD, Err codevoid.de 70 i+ [0x12] = BDL + HD + LL, Err codevoid.de 70 i+ [0x13] = BDL + HD + HL, Err codevoid.de 70 i+ [0x15] = BDL + HR + LU, Err codevoid.de 70 i+ [0x16] = BDL + HU + LR, Err codevoid.de 70 i+ [0x17] = BDL + HU + HR, Err codevoid.de 70 i+ [0x19] = BDL + HL + LU, Err codevoid.de 70 i+ [0x1a] = BDL + HU + LL, Err codevoid.de 70 i+ [0x1b] = BDL + HU + HL, Err codevoid.de 70 i+ [0x1d] = BDL + HR + LV, Err codevoid.de 70 i+ [0x1e] = BDL + HU + LD + LR, Err codevoid.de 70 i+ [0x1f] = BDL + HD + LR + LU, Err codevoid.de 70 i+ [0x20] = BDL + HV + LR, Err codevoid.de 70 i+ [0x21] = BDL + HU + HR + LD, Err codevoid.de 70 i+ [0x22] = BDL + HD + HR + LU, Err codevoid.de 70 i+ [0x23] = BDL + HV + HR, Err codevoid.de 70 i+ [0x25] = BDL + HL + LV, Err codevoid.de 70 i+ [0x26] = BDL + HU + LD + LL, Err codevoid.de 70 i+ [0x27] = BDL + HD + LU + LL, Err codevoid.de 70 i+ [0x28] = BDL + HV + LL, Err codevoid.de 70 i+ [0x29] = BDL + HU + HL + LD, Err codevoid.de 70 i+ [0x2a] = BDL + HD + HL + LU, Err codevoid.de 70 i+ [0x2b] = BDL + HV + HL, Err codevoid.de 70 i+ [0x2d] = BDL + HL + LD + LR, Err codevoid.de 70 i+ [0x2e] = BDL + HR + LL + LD, Err codevoid.de 70 i+ [0x2f] = BDL + HH + LD, Err codevoid.de 70 i+ [0x30] = BDL + HD + LH, Err codevoid.de 70 i+ [0x31] = BDL + HD + HL + LR, Err codevoid.de 70 i+ [0x32] = BDL + HR + HD + LL, Err codevoid.de 70 i+ [0x33] = BDL + HH + HD, Err codevoid.de 70 i+ [0x35] = BDL + HL + LU + LR, Err codevoid.de 70 i+ [0x36] = BDL + HR + LU + LL, Err codevoid.de 70 i+ [0x37] = BDL + HH + LU, Err codevoid.de 70 i+ [0x38] = BDL + HU + LH, Err codevoid.de 70 i+ [0x39] = BDL + HU + HL + LR, Err codevoid.de 70 i+ [0x3a] = BDL + HU + HR + LL, Err codevoid.de 70 i+ [0x3b] = BDL + HH + HU, Err codevoid.de 70 i+ [0x3d] = BDL + HL + LV + LR, Err codevoid.de 70 i+ [0x3e] = BDL + HR + LV + LL, Err codevoid.de 70 i+ [0x3f] = BDL + HH + LV, Err codevoid.de 70 i+ [0x40] = BDL + HU + LH + LD, Err codevoid.de 70 i+ [0x41] = BDL + HD + LH + LU, Err codevoid.de 70 i+ [0x42] = BDL + HV + LH, Err codevoid.de 70 i+ [0x43] = BDL + HU + HL + LD + LR, Err codevoid.de 70 i+ [0x44] = BDL + HU + HR + LD + LL, Err codevoid.de 70 i+ [0x45] = BDL + HD + HL + LU + LR, Err codevoid.de 70 i+ [0x46] = BDL + HD + HR + LU + LL, Err codevoid.de 70 i+ [0x47] = BDL + HH + HU + LD, Err codevoid.de 70 i+ [0x48] = BDL + HH + HD + LU, Err codevoid.de 70 i+ [0x49] = BDL + HV + HL + LR, Err codevoid.de 70 i+ [0x4a] = BDL + HV + HR + LL, Err codevoid.de 70 i+ [0x4b] = BDL + HV + HH, Err codevoid.de 70 i+ [0x78] = BDL + HL, Err codevoid.de 70 i+ [0x79] = BDL + HU, Err codevoid.de 70 i+ [0x7a] = BDL + HR, Err codevoid.de 70 i+ [0x7b] = BDL + HD, Err codevoid.de 70 i+ [0x7c] = BDL + HR + LL, Err codevoid.de 70 i+ [0x7d] = BDL + HD + LU, Err codevoid.de 70 i+ [0x7e] = BDL + HL + LR, Err codevoid.de 70 i+ [0x7f] = BDL + HU + LD, Err codevoid.de 70 i+ Err codevoid.de 70 i+ /* double [+light] lines */ Err codevoid.de 70 i+ [0x50] = BDL + DH, Err codevoid.de 70 i+ [0x51] = BDL + DV, Err codevoid.de 70 i+ [0x52] = BDL + DR + LD, Err codevoid.de 70 i+ [0x53] = BDL + DD + LR, Err codevoid.de 70 i+ [0x54] = BDL + DR + DD, Err codevoid.de 70 i+ [0x55] = BDL + DL + LD, Err codevoid.de 70 i+ [0x56] = BDL + DD + LL, Err codevoid.de 70 i+ [0x57] = BDL + DL + DD, Err codevoid.de 70 i+ [0x58] = BDL + DR + LU, Err codevoid.de 70 i+ [0x59] = BDL + DU + LR, Err codevoid.de 70 i+ [0x5a] = BDL + DU + DR, Err codevoid.de 70 i+ [0x5b] = BDL + DL + LU, Err codevoid.de 70 i+ [0x5c] = BDL + DU + LL, Err codevoid.de 70 i+ [0x5d] = BDL + DL + DU, Err codevoid.de 70 i+ [0x5e] = BDL + DR + LV, Err codevoid.de 70 i+ [0x5f] = BDL + DV + LR, Err codevoid.de 70 i+ [0x60] = BDL + DV + DR, Err codevoid.de 70 i+ [0x61] = BDL + DL + LV, Err codevoid.de 70 i+ [0x62] = BDL + DV + LL, Err codevoid.de 70 i+ [0x63] = BDL + DV + DL, Err codevoid.de 70 i+ [0x64] = BDL + DH + LD, Err codevoid.de 70 i+ [0x65] = BDL + DD + LH, Err codevoid.de 70 i+ [0x66] = BDL + DD + DH, Err codevoid.de 70 i+ [0x67] = BDL + DH + LU, Err codevoid.de 70 i+ [0x68] = BDL + DU + LH, Err codevoid.de 70 i+ [0x69] = BDL + DH + DU, Err codevoid.de 70 i+ [0x6a] = BDL + DH + LV, Err codevoid.de 70 i+ [0x6b] = BDL + DV + LH, Err codevoid.de 70 i+ [0x6c] = BDL + DH + DV, Err codevoid.de 70 i+ Err codevoid.de 70 i+ /* (light) arcs */ Err codevoid.de 70 i+ [0x6d] = BDA + LD + LR, Err codevoid.de 70 i+ [0x6e] = BDA + LD + LL, Err codevoid.de 70 i+ [0x6f] = BDA + LU + LL, Err codevoid.de 70 i+ [0x70] = BDA + LU + LR, Err codevoid.de 70 i+ Err codevoid.de 70 i+ /* Lower (Down) X/8 block (data is 8 - X) */ Err codevoid.de 70 i+ [0x81] = BBD + 7, [0x82] = BBD + 6, [0x83] = BBD + 5, [0x84] = BBD + 4, Err codevoid.de 70 i+ [0x85] = BBD + 3, [0x86] = BBD + 2, [0x87] = BBD + 1, [0x88] = BBD + 0, Err codevoid.de 70 i+ Err codevoid.de 70 i+ /* Left X/8 block (data is X) */ Err codevoid.de 70 i+ [0x89] = BBL + 7, [0x8a] = BBL + 6, [0x8b] = BBL + 5, [0x8c] = BBL + 4, Err codevoid.de 70 i+ [0x8d] = BBL + 3, [0x8e] = BBL + 2, [0x8f] = BBL + 1, Err codevoid.de 70 i+ Err codevoid.de 70 i+ /* upper 1/2 (4/8), 1/8 block (X), right 1/2, 1/8 block (8-X) */ Err codevoid.de 70 i+ [0x80] = BBU + 4, [0x94] = BBU + 1, Err codevoid.de 70 i+ [0x90] = BBR + 4, [0x95] = BBR + 7, Err codevoid.de 70 i+ Err codevoid.de 70 i+ /* Quadrants */ Err codevoid.de 70 i+ [0x96] = BBQ + BL, Err codevoid.de 70 i+ [0x97] = BBQ + BR, Err codevoid.de 70 i+ [0x98] = BBQ + TL, Err codevoid.de 70 i+ [0x99] = BBQ + TL + BL + BR, Err codevoid.de 70 i+ [0x9a] = BBQ + TL + BR, Err codevoid.de 70 i+ [0x9b] = BBQ + TL + TR + BL, Err codevoid.de 70 i+ [0x9c] = BBQ + TL + TR + BR, Err codevoid.de 70 i+ [0x9d] = BBQ + TR, Err codevoid.de 70 i+ [0x9e] = BBQ + BL + TR, Err codevoid.de 70 i+ [0x9f] = BBQ + BL + TR + BR, Err codevoid.de 70 i+ Err codevoid.de 70 i+ /* Shades, data is an alpha value in 25% units (1/4, 1/2, 3/4) */ Err codevoid.de 70 i+ [0x91] = BBS + 1, [0x92] = BBS + 2, [0x93] = BBS + 3, Err codevoid.de 70 i+ Err codevoid.de 70 i+ /* U+2504 - U+250B, U+254C - U+254F: unsupported (dashes) */ Err codevoid.de 70 i+ /* U+2571 - U+2573: unsupported (diagonals) */ Err codevoid.de 70 i+}; Err codevoid.de 70 1diff --git a/config.def.h b/config.def.h /git/st-sdk/file/config.def.h.gph codevoid.de 70 it@@ -57,6 +57,18 @@ static unsigned int blinktimeout = 800; Err codevoid.de 70 i static unsigned int cursorthickness = 2; Err codevoid.de 70 i Err codevoid.de 70 i /* Err codevoid.de 70 i+ * 1: render most of the lines/blocks characters without using the font for Err codevoid.de 70 i+ * perfect alignment between cells (U2500 - U259F except dashes/diagonals). Err codevoid.de 70 i+ * Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored. Err codevoid.de 70 i+ * 0: disable (render all U25XX glyphs normally from the font). Err codevoid.de 70 i+ */ Err codevoid.de 70 i+const int boxdraw = 0; Err codevoid.de 70 i+const int boxdraw_bold = 0; Err codevoid.de 70 i+ Err codevoid.de 70 i+/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */ Err codevoid.de 70 i+const int boxdraw_braille = 0; Err codevoid.de 70 i+ Err codevoid.de 70 i+/* Err codevoid.de 70 i * bell volume. It must be a value between -100 and 100. Use 0 for disabling Err codevoid.de 70 i * it Err codevoid.de 70 i */ Err codevoid.de 70 1diff --git a/config.h b/config.h /git/st-sdk/file/config.h.gph codevoid.de 70 it@@ -64,6 +64,18 @@ static unsigned int blinktimeout = 0; Err codevoid.de 70 i static unsigned int cursorthickness = 2; Err codevoid.de 70 i Err codevoid.de 70 i /* Err codevoid.de 70 i+ * 1: render most of the lines/blocks characters without using the font for Err codevoid.de 70 i+ * perfect alignment between cells (U2500 - U259F except dashes/diagonals). Err codevoid.de 70 i+ * Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored. Err codevoid.de 70 i+ * 0: disable (render all U25XX glyphs normally from the font). Err codevoid.de 70 i+ */ Err codevoid.de 70 i+const int boxdraw = 1; Err codevoid.de 70 i+const int boxdraw_bold = 0; Err codevoid.de 70 i+ Err codevoid.de 70 i+/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */ Err codevoid.de 70 i+const int boxdraw_braille = 1; Err codevoid.de 70 i+ Err codevoid.de 70 i+/* Err codevoid.de 70 i * bell volume. It must be a value between -100 and 100. Use 0 for disabling Err codevoid.de 70 i * it Err codevoid.de 70 i */ Err codevoid.de 70 1diff --git a/patches/st-boxdraw_v2-0.8.2.diff b/patches/st-boxdraw_v2-0.8.2.diff /git/st-sdk/file/patches/st-boxdraw_v2-0.8.2.diff.gph codevoid.de 70 it@@ -0,0 +1,598 @@ Err codevoid.de 70 i+From 318ae7fe1bd614cb937c8f43d855a1c2e8e93fd4 Mon Sep 17 00:00:00 2001 Err codevoid.de 70 i+From: "Avi Halachmi (:avih)" Err codevoid.de 70 i+Date: Wed, 26 Dec 2018 14:51:45 +0200 Err codevoid.de 70 i+Subject: [PATCH] boxdraw_v2: custom render lines/blocks/braille for perfect Err codevoid.de 70 i+ alignment Err codevoid.de 70 i+ Err codevoid.de 70 i+It seems impossible to ensure that blocks and line drawing glyphs Err codevoid.de 70 i+align without visible gaps for all combinations of arbitrary font, Err codevoid.de 70 i+size and width/height scale factor. Err codevoid.de 70 i+ Err codevoid.de 70 i+This commit adds options to render most of the lines/blocks and Err codevoid.de 70 i+braille codepoints without using the font such that they align Err codevoid.de 70 i+perfectly regardless of font, size or other configuration values. Err codevoid.de 70 i+ Err codevoid.de 70 i+Supported codepoints are U+2500 - U+259F except dashes/diagonals, Err codevoid.de 70 i+and U28XX. Err codevoid.de 70 i+ Err codevoid.de 70 i+The lines/blocks data is stored as 16-bit values at boxdraw_data.h Err codevoid.de 70 i+ Err codevoid.de 70 i+boxdraw/braille are independent, disabled by default at config[.def].h Err codevoid.de 70 i+--- Err codevoid.de 70 i+ Makefile | 3 +- Err codevoid.de 70 i+ boxdraw.c | 194 ++++++++++++++++++++++++++++++++++++++++++++ Err codevoid.de 70 i+ boxdraw_data.h | 214 +++++++++++++++++++++++++++++++++++++++++++++++++ Err codevoid.de 70 i+ config.def.h | 12 +++ Err codevoid.de 70 i+ st.c | 3 + Err codevoid.de 70 i+ st.h | 10 +++ Err codevoid.de 70 i+ x.c | 21 +++-- Err codevoid.de 70 i+ 7 files changed, 451 insertions(+), 6 deletions(-) Err codevoid.de 70 i+ create mode 100644 boxdraw.c Err codevoid.de 70 i+ create mode 100644 boxdraw_data.h Err codevoid.de 70 i+ Err codevoid.de 70 i+diff --git a/Makefile b/Makefile Err codevoid.de 70 i+index 470ac86..6dfa212 100644 Err codevoid.de 70 i+--- a/Makefile Err codevoid.de 70 i++++ b/Makefile Err codevoid.de 70 i+@@ -4,7 +4,7 @@ Err codevoid.de 70 i+ Err codevoid.de 70 i+ include config.mk Err codevoid.de 70 i+ Err codevoid.de 70 i+-SRC = st.c x.c Err codevoid.de 70 i++SRC = st.c x.c boxdraw.c Err codevoid.de 70 i+ OBJ = $(SRC:.c=.o) Err codevoid.de 70 i+ Err codevoid.de 70 i+ all: options st Err codevoid.de 70 i+@@ -23,6 +23,7 @@ config.h: Err codevoid.de 70 i+ Err codevoid.de 70 i+ st.o: config.h st.h win.h Err codevoid.de 70 i+ x.o: arg.h config.h st.h win.h Err codevoid.de 70 i++boxdraw.o: config.h st.h boxdraw_data.h Err codevoid.de 70 i+ Err codevoid.de 70 i+ $(OBJ): config.h config.mk Err codevoid.de 70 i+ Err codevoid.de 70 i+diff --git a/boxdraw.c b/boxdraw.c Err codevoid.de 70 i+new file mode 100644 Err codevoid.de 70 i+index 0000000..28a92d0 Err codevoid.de 70 i+--- /dev/null Err codevoid.de 70 i++++ b/boxdraw.c Err codevoid.de 70 i+@@ -0,0 +1,194 @@ Err codevoid.de 70 i++/* Err codevoid.de 70 i++ * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih Err codevoid.de 70 i++ * MIT/X Consortium License Err codevoid.de 70 i++ */ Err codevoid.de 70 i++ Err codevoid.de 70 i++#include Err codevoid.de 70 i++#include "st.h" Err codevoid.de 70 i++#include "boxdraw_data.h" Err codevoid.de 70 i++ Err codevoid.de 70 i++/* Rounded non-negative integers division of n / d */ Err codevoid.de 70 i++#define DIV(n, d) (((n) + (d) / 2) / (d)) Err codevoid.de 70 i++ Err codevoid.de 70 i++static Display *xdpy; Err codevoid.de 70 i++static Colormap xcmap; Err codevoid.de 70 i++static XftDraw *xd; Err codevoid.de 70 i++static Visual *xvis; Err codevoid.de 70 i++ Err codevoid.de 70 i++static void drawbox(int, int, int, int, XftColor *, XftColor *, ushort); Err codevoid.de 70 i++static void drawboxlines(int, int, int, int, XftColor *, ushort); Err codevoid.de 70 i++ Err codevoid.de 70 i++/* public API */ Err codevoid.de 70 i++ Err codevoid.de 70 i++void Err codevoid.de 70 i++boxdraw_xinit(Display *dpy, Colormap cmap, XftDraw *draw, Visual *vis) Err codevoid.de 70 i++{ Err codevoid.de 70 i++ xdpy = dpy; xcmap = cmap; xd = draw, xvis = vis; Err codevoid.de 70 i++} Err codevoid.de 70 i++ Err codevoid.de 70 i++int Err codevoid.de 70 i++isboxdraw(Rune u) Err codevoid.de 70 i++{ Err codevoid.de 70 i++ Rune block = u & ~0xff; Err codevoid.de 70 i++ return (boxdraw && block == 0x2500 && boxdata[(uint8_t)u]) || Err codevoid.de 70 i++ (boxdraw_braille && block == 0x2800); Err codevoid.de 70 i++} Err codevoid.de 70 i++ Err codevoid.de 70 i++/* the "index" is actually the entire shape data encoded as ushort */ Err codevoid.de 70 i++ushort Err codevoid.de 70 i++boxdrawindex(const Glyph *g) Err codevoid.de 70 i++{ Err codevoid.de 70 i++ if (boxdraw_braille && (g->u & ~0xff) == 0x2800) Err codevoid.de 70 i++ return BRL | (uint8_t)g->u; Err codevoid.de 70 i++ if (boxdraw_bold && (g->mode & ATTR_BOLD)) Err codevoid.de 70 i++ return BDB | boxdata[(uint8_t)g->u]; Err codevoid.de 70 i++ return boxdata[(uint8_t)g->u]; Err codevoid.de 70 i++} Err codevoid.de 70 i++ Err codevoid.de 70 i++void Err codevoid.de 70 i++drawboxes(int x, int y, int cw, int ch, XftColor *fg, XftColor *bg, Err codevoid.de 70 i++ const XftGlyphFontSpec *specs, int len) Err codevoid.de 70 i++{ Err codevoid.de 70 i++ for ( ; len-- > 0; x += cw, specs++) Err codevoid.de 70 i++ drawbox(x, y, cw, ch, fg, bg, (ushort)specs->glyph); Err codevoid.de 70 i++} Err codevoid.de 70 i++ Err codevoid.de 70 i++/* implementation */ Err codevoid.de 70 i++ Err codevoid.de 70 i++void Err codevoid.de 70 i++drawbox(int x, int y, int w, int h, XftColor *fg, XftColor *bg, ushort bd) Err codevoid.de 70 i++{ Err codevoid.de 70 i++ ushort cat = bd & ~(BDB | 0xff); /* mask out bold and data */ Err codevoid.de 70 i++ if (bd & (BDL | BDA)) { Err codevoid.de 70 i++ /* lines (light/double/heavy/arcs) */ Err codevoid.de 70 i++ drawboxlines(x, y, w, h, fg, bd); Err codevoid.de 70 i++ Err codevoid.de 70 i++ } else if (cat == BBD) { Err codevoid.de 70 i++ /* lower (8-X)/8 block */ Err codevoid.de 70 i++ int d = DIV((uint8_t)bd * h, 8); Err codevoid.de 70 i++ XftDrawRect(xd, fg, x, y + d, w, h - d); Err codevoid.de 70 i++ Err codevoid.de 70 i++ } else if (cat == BBU) { Err codevoid.de 70 i++ /* upper X/8 block */ Err codevoid.de 70 i++ XftDrawRect(xd, fg, x, y, w, DIV((uint8_t)bd * h, 8)); Err codevoid.de 70 i++ Err codevoid.de 70 i++ } else if (cat == BBL) { Err codevoid.de 70 i++ /* left X/8 block */ Err codevoid.de 70 i++ XftDrawRect(xd, fg, x, y, DIV((uint8_t)bd * w, 8), h); Err codevoid.de 70 i++ Err codevoid.de 70 i++ } else if (cat == BBR) { Err codevoid.de 70 i++ /* right (8-X)/8 block */ Err codevoid.de 70 i++ int d = DIV((uint8_t)bd * w, 8); Err codevoid.de 70 i++ XftDrawRect(xd, fg, x + d, y, w - d, h); Err codevoid.de 70 i++ Err codevoid.de 70 i++ } else if (cat == BBQ) { Err codevoid.de 70 i++ /* Quadrants */ Err codevoid.de 70 i++ int w2 = DIV(w, 2), h2 = DIV(h, 2); Err codevoid.de 70 i++ if (bd & TL) Err codevoid.de 70 i++ XftDrawRect(xd, fg, x, y, w2, h2); Err codevoid.de 70 i++ if (bd & TR) Err codevoid.de 70 i++ XftDrawRect(xd, fg, x + w2, y, w - w2, h2); Err codevoid.de 70 i++ if (bd & BL) Err codevoid.de 70 i++ XftDrawRect(xd, fg, x, y + h2, w2, h - h2); Err codevoid.de 70 i++ if (bd & BR) Err codevoid.de 70 i++ XftDrawRect(xd, fg, x + w2, y + h2, w - w2, h - h2); Err codevoid.de 70 i++ Err codevoid.de 70 i++ } else if (bd & BBS) { Err codevoid.de 70 i++ /* Shades - data is 1/2/3 for 25%/50%/75% alpha, respectively */ Err codevoid.de 70 i++ int d = (uint8_t)bd; Err codevoid.de 70 i++ XftColor xfc; Err codevoid.de 70 i++ XRenderColor xrc = { .alpha = 0xffff }; Err codevoid.de 70 i++ Err codevoid.de 70 i++ xrc.red = DIV(fg->color.red * d + bg->color.red * (4 - d), 4); Err codevoid.de 70 i++ xrc.green = DIV(fg->color.green * d + bg->color.green * (4 - d), 4); Err codevoid.de 70 i++ xrc.blue = DIV(fg->color.blue * d + bg->color.blue * (4 - d), 4); Err codevoid.de 70 i++ Err codevoid.de 70 i++ XftColorAllocValue(xdpy, xvis, xcmap, &xrc, &xfc); Err codevoid.de 70 i++ XftDrawRect(xd, &xfc, x, y, w, h); Err codevoid.de 70 i++ XftColorFree(xdpy, xvis, xcmap, &xfc); Err codevoid.de 70 i++ Err codevoid.de 70 i++ } else if (cat == BRL) { Err codevoid.de 70 i++ /* braille, each data bit corresponds to one dot at 2x4 grid */ Err codevoid.de 70 i++ int w1 = DIV(w, 2); Err codevoid.de 70 i++ int h1 = DIV(h, 4), h2 = DIV(h, 2), h3 = DIV(3 * h, 4); Err codevoid.de 70 i++ Err codevoid.de 70 i++ if (bd & 1) XftDrawRect(xd, fg, x, y, w1, h1); Err codevoid.de 70 i++ if (bd & 2) XftDrawRect(xd, fg, x, y + h1, w1, h2 - h1); Err codevoid.de 70 i++ if (bd & 4) XftDrawRect(xd, fg, x, y + h2, w1, h3 - h2); Err codevoid.de 70 i++ if (bd & 8) XftDrawRect(xd, fg, x + w1, y, w - w1, h1); Err codevoid.de 70 i++ if (bd & 16) XftDrawRect(xd, fg, x + w1, y + h1, w - w1, h2 - h1); Err codevoid.de 70 i++ if (bd & 32) XftDrawRect(xd, fg, x + w1, y + h2, w - w1, h3 - h2); Err codevoid.de 70 i++ if (bd & 64) XftDrawRect(xd, fg, x, y + h3, w1, h - h3); Err codevoid.de 70 i++ if (bd & 128) XftDrawRect(xd, fg, x + w1, y + h3, w - w1, h - h3); Err codevoid.de 70 i++ Err codevoid.de 70 i++ } Err codevoid.de 70 i++} Err codevoid.de 70 i++ Err codevoid.de 70 i++void Err codevoid.de 70 i++drawboxlines(int x, int y, int w, int h, XftColor *fg, ushort bd) Err codevoid.de 70 i++{ Err codevoid.de 70 i++ /* s: stem thickness. width/8 roughly matches underscore thickness. */ Err codevoid.de 70 i++ /* We draw bold as 1.5 * normal-stem and at least 1px thicker. */ Err codevoid.de 70 i++ /* doubles draw at least 3px, even when w or h < 3. bold needs 6px. */ Err codevoid.de 70 i++ int mwh = MIN(w, h); Err codevoid.de 70 i++ int base_s = MAX(1, DIV(mwh, 8)); Err codevoid.de 70 i++ int bold = (bd & BDB) && mwh >= 6; /* possibly ignore boldness */ Err codevoid.de 70 i++ int s = bold ? MAX(base_s + 1, DIV(3 * base_s, 2)) : base_s; Err codevoid.de 70 i++ int w2 = DIV(w - s, 2), h2 = DIV(h - s, 2); Err codevoid.de 70 i++ /* the s-by-s square (x + w2, y + h2, s, s) is the center texel. */ Err codevoid.de 70 i++ /* The base length (per direction till edge) includes this square. */ Err codevoid.de 70 i++ Err codevoid.de 70 i++ int light = bd & (LL | LU | LR | LD); Err codevoid.de 70 i++ int double_ = bd & (DL | DU | DR | DD); Err codevoid.de 70 i++ Err codevoid.de 70 i++ if (light) { Err codevoid.de 70 i++ /* d: additional (negative) length to not-draw the center */ Err codevoid.de 70 i++ /* texel - at arcs and avoid drawing inside (some) doubles */ Err codevoid.de 70 i++ int arc = bd & BDA; Err codevoid.de 70 i++ int multi_light = light & (light - 1); Err codevoid.de 70 i++ int multi_double = double_ & (double_ - 1); Err codevoid.de 70 i++ /* light crosses double only at DH+LV, DV+LH (ref. shapes) */ Err codevoid.de 70 i++ int d = arc || (multi_double && !multi_light) ? -s : 0; Err codevoid.de 70 i++ Err codevoid.de 70 i++ if (bd & LL) Err codevoid.de 70 i++ XftDrawRect(xd, fg, x, y + h2, w2 + s + d, s); Err codevoid.de 70 i++ if (bd & LU) Err codevoid.de 70 i++ XftDrawRect(xd, fg, x + w2, y, s, h2 + s + d); Err codevoid.de 70 i++ if (bd & LR) Err codevoid.de 70 i++ XftDrawRect(xd, fg, x + w2 - d, y + h2, w - w2 + d, s); Err codevoid.de 70 i++ if (bd & LD) Err codevoid.de 70 i++ XftDrawRect(xd, fg, x + w2, y + h2 - d, s, h - h2 + d); Err codevoid.de 70 i++ } Err codevoid.de 70 i++ Err codevoid.de 70 i++ /* double lines - also align with light to form heavy when combined */ Err codevoid.de 70 i++ if (double_) { Err codevoid.de 70 i++ /* Err codevoid.de 70 i++ * going clockwise, for each double-ray: p is additional length Err codevoid.de 70 i++ * to the single-ray nearer to the previous direction, and n to Err codevoid.de 70 i++ * the next. p and n adjust from the base length to lengths Err codevoid.de 70 i++ * which consider other doubles - shorter to avoid intersections Err codevoid.de 70 i++ * (p, n), or longer to draw the far-corner texel (n). Err codevoid.de 70 i++ */ Err codevoid.de 70 i++ int dl = bd & DL, du = bd & DU, dr = bd & DR, dd = bd & DD; Err codevoid.de 70 i++ if (dl) { Err codevoid.de 70 i++ int p = dd ? -s : 0, n = du ? -s : dd ? s : 0; Err codevoid.de 70 i++ XftDrawRect(xd, fg, x, y + h2 + s, w2 + s + p, s); Err codevoid.de 70 i++ XftDrawRect(xd, fg, x, y + h2 - s, w2 + s + n, s); Err codevoid.de 70 i++ } Err codevoid.de 70 i++ if (du) { Err codevoid.de 70 i++ int p = dl ? -s : 0, n = dr ? -s : dl ? s : 0; Err codevoid.de 70 i++ XftDrawRect(xd, fg, x + w2 - s, y, s, h2 + s + p); Err codevoid.de 70 i++ XftDrawRect(xd, fg, x + w2 + s, y, s, h2 + s + n); Err codevoid.de 70 i++ } Err codevoid.de 70 i++ if (dr) { Err codevoid.de 70 i++ int p = du ? -s : 0, n = dd ? -s : du ? s : 0; Err codevoid.de 70 i++ XftDrawRect(xd, fg, x + w2 - p, y + h2 - s, w - w2 + p, s); Err codevoid.de 70 i++ XftDrawRect(xd, fg, x + w2 - n, y + h2 + s, w - w2 + n, s); Err codevoid.de 70 i++ } Err codevoid.de 70 i++ if (dd) { Err codevoid.de 70 i++ int p = dr ? -s : 0, n = dl ? -s : dr ? s : 0; Err codevoid.de 70 i++ XftDrawRect(xd, fg, x + w2 + s, y + h2 - p, s, h - h2 + p); Err codevoid.de 70 i++ XftDrawRect(xd, fg, x + w2 - s, y + h2 - n, s, h - h2 + n); Err codevoid.de 70 i++ } Err codevoid.de 70 i++ } Err codevoid.de 70 i++} Err codevoid.de 70 i+diff --git a/boxdraw_data.h b/boxdraw_data.h Err codevoid.de 70 i+new file mode 100644 Err codevoid.de 70 i+index 0000000..7890500 Err codevoid.de 70 i+--- /dev/null Err codevoid.de 70 i++++ b/boxdraw_data.h Err codevoid.de 70 i+@@ -0,0 +1,214 @@ Err codevoid.de 70 i++/* Err codevoid.de 70 i++ * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih Err codevoid.de 70 i++ * MIT/X Consortium License Err codevoid.de 70 i++ */ Err codevoid.de 70 i++ Err codevoid.de 70 i++/* Err codevoid.de 70 i++ * U+25XX codepoints data Err codevoid.de 70 i++ * Err codevoid.de 70 i++ * References: Err codevoid.de 70 i++ * http://www.unicode.org/charts/PDF/U2500.pdf Err codevoid.de 70 i++ * http://www.unicode.org/charts/PDF/U2580.pdf Err codevoid.de 70 i++ * Err codevoid.de 70 i++ * Test page: Err codevoid.de 70 i++ * https://github.com/GNOME/vte/blob/master/doc/boxes.txt Err codevoid.de 70 i++ */ Err codevoid.de 70 i++ Err codevoid.de 70 i++/* Each shape is encoded as 16-bits. Higher bits are category, lower are data */ Err codevoid.de 70 i++/* Categories (mutually exclusive except BDB): */ Err codevoid.de 70 i++/* For convenience, BDL/BDA/BBS/BDB are 1 bit each, the rest are enums */ Err codevoid.de 70 i++#define BDL (1<<8) /* Box Draw Lines (light/double/heavy) */ Err codevoid.de 70 i++#define BDA (1<<9) /* Box Draw Arc (light) */ Err codevoid.de 70 i++ Err codevoid.de 70 i++#define BBD (1<<10) /* Box Block Down (lower) X/8 */ Err codevoid.de 70 i++#define BBL (2<<10) /* Box Block Left X/8 */ Err codevoid.de 70 i++#define BBU (3<<10) /* Box Block Upper X/8 */ Err codevoid.de 70 i++#define BBR (4<<10) /* Box Block Right X/8 */ Err codevoid.de 70 i++#define BBQ (5<<10) /* Box Block Quadrants */ Err codevoid.de 70 i++#define BRL (6<<10) /* Box Braille (data is lower byte of U28XX) */ Err codevoid.de 70 i++ Err codevoid.de 70 i++#define BBS (1<<14) /* Box Block Shades */ Err codevoid.de 70 i++#define BDB (1<<15) /* Box Draw is Bold */ Err codevoid.de 70 i++ Err codevoid.de 70 i++/* (BDL/BDA) Light/Double/Heavy x Left/Up/Right/Down/Horizontal/Vertical */ Err codevoid.de 70 i++/* Heavy is light+double (literally drawing light+double align to form heavy) */ Err codevoid.de 70 i++#define LL (1<<0) Err codevoid.de 70 i++#define LU (1<<1) Err codevoid.de 70 i++#define LR (1<<2) Err codevoid.de 70 i++#define LD (1<<3) Err codevoid.de 70 i++#define LH (LL+LR) Err codevoid.de 70 i++#define LV (LU+LD) Err codevoid.de 70 i++ Err codevoid.de 70 i++#define DL (1<<4) Err codevoid.de 70 i++#define DU (1<<5) Err codevoid.de 70 i++#define DR (1<<6) Err codevoid.de 70 i++#define DD (1<<7) Err codevoid.de 70 i++#define DH (DL+DR) Err codevoid.de 70 i++#define DV (DU+DD) Err codevoid.de 70 i++ Err codevoid.de 70 i++#define HL (LL+DL) Err codevoid.de 70 i++#define HU (LU+DU) Err codevoid.de 70 i++#define HR (LR+DR) Err codevoid.de 70 i++#define HD (LD+DD) Err codevoid.de 70 i++#define HH (HL+HR) Err codevoid.de 70 i++#define HV (HU+HD) Err codevoid.de 70 i++ Err codevoid.de 70 i++/* (BBQ) Quadrants Top/Bottom x Left/Right */ Err codevoid.de 70 i++#define TL (1<<0) Err codevoid.de 70 i++#define TR (1<<1) Err codevoid.de 70 i++#define BL (1<<2) Err codevoid.de 70 i++#define BR (1<<3) Err codevoid.de 70 i++ Err codevoid.de 70 i++/* Data for U+2500 - U+259F except dashes/diagonals */ Err codevoid.de 70 i++static const unsigned short boxdata[256] = { Err codevoid.de 70 i++ /* light lines */ Err codevoid.de 70 i++ [0x00] = BDL + LH, /* light horizontal */ Err codevoid.de 70 i++ [0x02] = BDL + LV, /* light vertical */ Err codevoid.de 70 i++ [0x0c] = BDL + LD + LR, /* light down and right */ Err codevoid.de 70 i++ [0x10] = BDL + LD + LL, /* light down and left */ Err codevoid.de 70 i++ [0x14] = BDL + LU + LR, /* light up and right */ Err codevoid.de 70 i++ [0x18] = BDL + LU + LL, /* light up and left */ Err codevoid.de 70 i++ [0x1c] = BDL + LV + LR, /* light vertical and right */ Err codevoid.de 70 i++ [0x24] = BDL + LV + LL, /* light vertical and left */ Err codevoid.de 70 i++ [0x2c] = BDL + LH + LD, /* light horizontal and down */ Err codevoid.de 70 i++ [0x34] = BDL + LH + LU, /* light horizontal and up */ Err codevoid.de 70 i++ [0x3c] = BDL + LV + LH, /* light vertical and horizontal */ Err codevoid.de 70 i++ [0x74] = BDL + LL, /* light left */ Err codevoid.de 70 i++ [0x75] = BDL + LU, /* light up */ Err codevoid.de 70 i++ [0x76] = BDL + LR, /* light right */ Err codevoid.de 70 i++ [0x77] = BDL + LD, /* light down */ Err codevoid.de 70 i++ Err codevoid.de 70 i++ /* heavy [+light] lines */ Err codevoid.de 70 i++ [0x01] = BDL + HH, Err codevoid.de 70 i++ [0x03] = BDL + HV, Err codevoid.de 70 i++ [0x0d] = BDL + HR + LD, Err codevoid.de 70 i++ [0x0e] = BDL + HD + LR, Err codevoid.de 70 i++ [0x0f] = BDL + HD + HR, Err codevoid.de 70 i++ [0x11] = BDL + HL + LD, Err codevoid.de 70 i++ [0x12] = BDL + HD + LL, Err codevoid.de 70 i++ [0x13] = BDL + HD + HL, Err codevoid.de 70 i++ [0x15] = BDL + HR + LU, Err codevoid.de 70 i++ [0x16] = BDL + HU + LR, Err codevoid.de 70 i++ [0x17] = BDL + HU + HR, Err codevoid.de 70 i++ [0x19] = BDL + HL + LU, Err codevoid.de 70 i++ [0x1a] = BDL + HU + LL, Err codevoid.de 70 i++ [0x1b] = BDL + HU + HL, Err codevoid.de 70 i++ [0x1d] = BDL + HR + LV, Err codevoid.de 70 i++ [0x1e] = BDL + HU + LD + LR, Err codevoid.de 70 i++ [ Err codevoid.de 70 .