[wiki] [sites] [st][ligatures] Updated for 0.8.3 release. || Alexander Rogachev from git_AT_suckless.org on 2020-04-30 (wiki mail list archive)

From: <git_AT_suckless.org>
Date: Thu, 30 Apr 2020 17:58:59 +0200

commit 16e541a01f28b2f90db4dd5d7f7166ed50dcb787
Author: Alexander Rogachev <sorryforbadname_AT_gmail.com>
Date: Thu Apr 30 18:58:36 2020 +0300

[st][ligatures] Updated for 0.8.3 release.

diff --git a/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-20200430-0.8.3.diff b/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-20200430-0.8.3.diff
new file mode 100644
index 00000000..ebf6bd20
--- /dev/null
+++ b/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-20200430-0.8.3.diff
_AT_@ -0,0 +1,307 @@
+diff --git a/Makefile b/Makefile
+index 470ac86..38240da 100644
+--- a/Makefile
++++ b/Makefile
+_AT_@ -4,7 +4,7 @@
+
+ include config.mk
+
+-SRC = st.c x.c
++SRC = st.c x.c hb.c
+ OBJ = $(SRC:.c=.o)
+
+ all: options st
+_AT_@ -22,7 +22,8 @@ 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
++hb.o: st.h
+
+ $(OBJ): config.h config.mk
+
+diff --git a/config.mk b/config.mk
+index beafc35..3df5c83 100644
+--- a/config.mk
++++ b/config.mk
+_AT_@ -15,10 +15,12 @@ PKG_CONFIG = pkg-config
+ # includes and libs
+ INCS = -I$(X11INC) \
+ `$(PKG_CONFIG) --cflags fontconfig` \
+- `$(PKG_CONFIG) --cflags freetype2`
++ `$(PKG_CONFIG) --cflags freetype2` \
++ `$(PKG_CONFIG) --cflags harfbuzz`
+ LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
+ `$(PKG_CONFIG) --libs fontconfig` \
+- `$(PKG_CONFIG) --libs freetype2`
++ `$(PKG_CONFIG) --libs freetype2` \
++ `$(PKG_CONFIG) --libs harfbuzz`
+
+ # flags
+ STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
+diff --git a/hb.c b/hb.c
+new file mode 100644
+index 0000000..7df2828
+--- /dev/null
++++ b/hb.c
+_AT_@ -0,0 +1,136 @@
++#include <stdlib.h>
++#include <stdio.h>
++#include <math.h>
++#include <X11/Xft/Xft.h>
++#include <hb.h>
++#include <hb-ft.h>
++
++#include "st.h"
++
++void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
++hb_font_t *hbfindfont(XftFont *match);
++
++typedef struct {
++ XftFont *match;
++ hb_font_t *font;
++} HbFontMatch;
++
++static int hbfontslen = 0;
++static HbFontMatch *hbfontcache = NULL;
++
++void
++hbunloadfonts()
++{
++ for (int i = 0; i < hbfontslen; i++) {
++ hb_font_destroy(hbfontcache[i].font);
++ XftUnlockFace(hbfontcache[i].match);
++ }
++
++ if (hbfontcache != NULL) {
++ free(hbfontcache);
++ hbfontcache = NULL;
++ }
++ hbfontslen = 0;
++}
++
++hb_font_t *
++hbfindfont(XftFont *match)
++{
++ for (int i = 0; i < hbfontslen; i++) {
++ if (hbfontcache[i].match == match)
++ return hbfontcache[i].font;
++ }
++
++ /* Font not found in cache, caching it now. */
++ hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 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[hbfontslen].match = match;
++ hbfontcache[hbfontslen].font = font;
++ hbfontslen += 1;
++
++ return font;
++}
++
++void
++hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y)
++{
++ int start = 0, length = 1, gstart = 0;
++ hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t));
++
++ for (int idx = 1, specidx = 1; idx < len; idx++) {
++ if (glyphs[idx].mode & ATTR_WDUMMY) {
++ length += 1;
++ continue;
++ }
++
++ if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) {
++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
++
++ /* Reset the sequence. */
++ length = 1;
++ start = specidx;
++ gstart = idx;
++ } else {
++ length += 1;
++ }
++
++ specidx++;
++ }
++
++ /* EOL. */
++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
++
++ /* Apply the transformation to glyph specs. */
++ for (int i = 0, specidx = 0; i < len; i++) {
++ if (glyphs[i].mode & ATTR_WDUMMY)
++ continue;
++
++ if (codepoints[i] != specs[specidx].glyph)
++ ((Glyph *)glyphs)[i].mode |= ATTR_LIGA;
++
++ specs[specidx++].glyph = codepoints[i];
++ }
++
++ free(codepoints);
++}
++
++void
++hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length)
++{
++ hb_font_t *font = hbfindfont(xfont);
++ if (font == NULL)
++ return;
++
++ Rune rune;
++ ushort mode = USHRT_MAX;
++ hb_buffer_t *buffer = hb_buffer_create();
++ hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
++
++ /* Fill buffer with codepoints. */
++ for (int i = start; i < (start+length); i++) {
++ rune = string[i].u;
++ mode = string[i].mode;
++ if (mode & ATTR_WDUMMY)
++ rune = 0x0020;
++ hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1);
++ }
++
++ /* Shape the segment. */
++ hb_shape(font, buffer, NULL, 0);
++
++ /* Get new glyph info. */
++ hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
++
++ /* Write new codepoints. */
++ for (int i = 0; i < length; i++) {
++ hb_codepoint_t gid = info[i].codepoint;
++ codepoints[start+i] = gid;
++ }
++
++ /* Cleanup. */
++ hb_buffer_destroy(buffer);
++}
+diff --git a/hb.h b/hb.h
+new file mode 100644
+index 0000000..b3e02d0
+--- /dev/null
++++ b/hb.h
+_AT_@ -0,0 +1,7 @@
++#include <X11/Xft/Xft.h>
++#include <hb.h>
++#include <hb-ft.h>
++
++void hbunloadfonts();
++void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int);
++
+diff --git a/st.c b/st.c
+index 2bf133f..747f7b4 100644
+--- a/st.c
++++ b/st.c
+_AT_@ -2599,7 +2599,8 @@ 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.ocx, term.ocy, term.line[term.ocy][term.ocx],
++ term.line[term.ocy], term.col);
+ term.ocx = cx;
+ term.ocy = term.c.y;
+ xfinishdraw();
+diff --git a/st.h b/st.h
+index d978458..c9b279b 100644
+--- a/st.h
++++ b/st.h
+_AT_@ -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)
+-#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \
++#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \
++ (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)
+_AT_@ -33,6 +34,7 @@ enum glyph_attribute {
+ ATTR_WRAP = 1 << 8,
+ ATTR_WIDE = 1 << 9,
+ ATTR_WDUMMY = 1 << 10,
++ ATTR_LIGA = 1 << 11,
+ ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
+ };
+
+diff --git a/win.h b/win.h
+index a6ef1b9..bc0d180 100644
+--- a/win.h
++++ b/win.h
+_AT_@ -25,7 +25,7 @@ enum win_mode {
+
+ void xbell(void);
+ void xclipcopy(void);
+-void xdrawcursor(int, int, Glyph, int, int, Glyph);
++void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int);
+ void xdrawline(Line, int, int, int);
+ void xfinishdraw(void);
+ void xloadcols(void);
+diff --git a/x.c b/x.c
+index e5f1737..3334a83 100644
+--- a/x.c
++++ b/x.c
+_AT_@ -19,6 +19,7 @@ char *argv0;
+ #include "arg.h"
+ #include "st.h"
+ #include "win.h"
++#include "hb.h"
+
+ /* types used in config.h */
+ typedef struct {
+_AT_@ -1031,6 +1032,9 @@ xunloadfont(Font *f)
+ void
+ xunloadfonts(void)
+ {
++ /* Clear Harfbuzz font cache. */
++ hbunloadfonts();
++
+ /* Free the loaded fonts in the font cache. */
+ while (frclen > 0)
+ XftFontClose(xw.dpy, frc[--frclen].font);
+_AT_@ -1229,7 +1233,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+ mode = glyphs[i].mode;
+
+ /* Skip dummy wide-character spacing. */
+- if (mode == ATTR_WDUMMY)
++ if (mode & ATTR_WDUMMY)
+ continue;
+
+ /* Determine font for glyph if different from previous glyph. */
+_AT_@ -1336,6 +1340,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+ numspecs++;
+ }
+
++ /* Harfbuzz transformation for ligatures. */
++ hbtransform(specs, glyphs, len, x, y);
++
+ return numspecs;
+ }
+
+_AT_@ -1485,14 +1492,17 @@ xdrawglyph(Glyph g, int x, int y)
+ }
+
+ void
+-xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
++xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len)
+ {
+ Color drawcol;
+
+ /* remove the old cursor */
+ if (selected(ox, oy))
+ og.mode ^= ATTR_REVERSE;
+- xdrawglyph(og, ox, oy);
++
++ /* Redraw the line where cursor was previously.
++ * It will restore the ligatures broken by the cursor. */
++ xdrawline(line, 0, oy, len);
+
+ if (IS_SET(MODE_HIDE))
+ return;
diff --git a/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-alpha-20200430-0.8.3.diff b/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-alpha-20200430-0.8.3.diff
new file mode 100644
index 00000000..8fb3df98
--- /dev/null
+++ b/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-alpha-20200430-0.8.3.diff
_AT_@ -0,0 +1,307 @@
+diff --git a/Makefile b/Makefile
+index 470ac86..38240da 100644
+--- a/Makefile
++++ b/Makefile
+_AT_@ -4,7 +4,7 @@
+
+ include config.mk
+
+-SRC = st.c x.c
++SRC = st.c x.c hb.c
+ OBJ = $(SRC:.c=.o)
+
+ all: options st
+_AT_@ -22,7 +22,8 @@ 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
++hb.o: st.h
+
+ $(OBJ): config.h config.mk
+
+diff --git a/config.mk b/config.mk
+index ddc65ae..07a3d14 100644
+--- a/config.mk
++++ b/config.mk
+_AT_@ -15,10 +15,12 @@ PKG_CONFIG = pkg-config
+ # includes and libs
+ INCS = -I$(X11INC) \
+ `$(PKG_CONFIG) --cflags fontconfig` \
+- `$(PKG_CONFIG) --cflags freetype2`
++ `$(PKG_CONFIG) --cflags freetype2` \
++ `$(PKG_CONFIG) --cflags harfbuzz`
+ LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
+ `$(PKG_CONFIG) --libs fontconfig` \
+- `$(PKG_CONFIG) --libs freetype2`
++ `$(PKG_CONFIG) --libs freetype2` \
++ `$(PKG_CONFIG) --libs harfbuzz`
+
+ # flags
+ STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
+diff --git a/hb.c b/hb.c
+new file mode 100644
+index 0000000..7df2828
+--- /dev/null
++++ b/hb.c
+_AT_@ -0,0 +1,136 @@
++#include <stdlib.h>
++#include <stdio.h>
++#include <math.h>
++#include <X11/Xft/Xft.h>
++#include <hb.h>
++#include <hb-ft.h>
++
++#include "st.h"
++
++void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
++hb_font_t *hbfindfont(XftFont *match);
++
++typedef struct {
++ XftFont *match;
++ hb_font_t *font;
++} HbFontMatch;
++
++static int hbfontslen = 0;
++static HbFontMatch *hbfontcache = NULL;
++
++void
++hbunloadfonts()
++{
++ for (int i = 0; i < hbfontslen; i++) {
++ hb_font_destroy(hbfontcache[i].font);
++ XftUnlockFace(hbfontcache[i].match);
++ }
++
++ if (hbfontcache != NULL) {
++ free(hbfontcache);
++ hbfontcache = NULL;
++ }
++ hbfontslen = 0;
++}
++
++hb_font_t *
++hbfindfont(XftFont *match)
++{
++ for (int i = 0; i < hbfontslen; i++) {
++ if (hbfontcache[i].match == match)
++ return hbfontcache[i].font;
++ }
++
++ /* Font not found in cache, caching it now. */
++ hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 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[hbfontslen].match = match;
++ hbfontcache[hbfontslen].font = font;
++ hbfontslen += 1;
++
++ return font;
++}
++
++void
++hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y)
++{
++ int start = 0, length = 1, gstart = 0;
++ hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t));
++
++ for (int idx = 1, specidx = 1; idx < len; idx++) {
++ if (glyphs[idx].mode & ATTR_WDUMMY) {
++ length += 1;
++ continue;
++ }
++
++ if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) {
++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
++
++ /* Reset the sequence. */
++ length = 1;
++ start = specidx;
++ gstart = idx;
++ } else {
++ length += 1;
++ }
++
++ specidx++;
++ }
++
++ /* EOL. */
++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
++
++ /* Apply the transformation to glyph specs. */
++ for (int i = 0, specidx = 0; i < len; i++) {
++ if (glyphs[i].mode & ATTR_WDUMMY)
++ continue;
++
++ if (codepoints[i] != specs[specidx].glyph)
++ ((Glyph *)glyphs)[i].mode |= ATTR_LIGA;
++
++ specs[specidx++].glyph = codepoints[i];
++ }
++
++ free(codepoints);
++}
++
++void
++hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length)
++{
++ hb_font_t *font = hbfindfont(xfont);
++ if (font == NULL)
++ return;
++
++ Rune rune;
++ ushort mode = USHRT_MAX;
++ hb_buffer_t *buffer = hb_buffer_create();
++ hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
++
++ /* Fill buffer with codepoints. */
++ for (int i = start; i < (start+length); i++) {
++ rune = string[i].u;
++ mode = string[i].mode;
++ if (mode & ATTR_WDUMMY)
++ rune = 0x0020;
++ hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1);
++ }
++
++ /* Shape the segment. */
++ hb_shape(font, buffer, NULL, 0);
++
++ /* Get new glyph info. */
++ hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
++
++ /* Write new codepoints. */
++ for (int i = 0; i < length; i++) {
++ hb_codepoint_t gid = info[i].codepoint;
++ codepoints[start+i] = gid;
++ }
++
++ /* Cleanup. */
++ hb_buffer_destroy(buffer);
++}
+diff --git a/hb.h b/hb.h
+new file mode 100644
+index 0000000..b3e02d0
+--- /dev/null
++++ b/hb.h
+_AT_@ -0,0 +1,7 @@
++#include <X11/Xft/Xft.h>
++#include <hb.h>
++#include <hb-ft.h>
++
++void hbunloadfonts();
++void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int);
++
+diff --git a/st.c b/st.c
+index 0ce6ac2..3201490 100644
+--- a/st.c
++++ b/st.c
+_AT_@ -2599,7 +2599,8 @@ 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.ocx, term.ocy, term.line[term.ocy][term.ocx],
++ term.line[term.ocy], term.col);
+ term.ocx = cx;
+ term.ocy = term.c.y;
+ xfinishdraw();
+diff --git a/st.h b/st.h
+index 2c656af..f5390d2 100644
+--- a/st.h
++++ b/st.h
+_AT_@ -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)
+-#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \
++#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \
++ (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)
+_AT_@ -33,6 +34,7 @@ enum glyph_attribute {
+ ATTR_WRAP = 1 << 8,
+ ATTR_WIDE = 1 << 9,
+ ATTR_WDUMMY = 1 << 10,
++ ATTR_LIGA = 1 << 11,
+ ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
+ };
+
+diff --git a/win.h b/win.h
+index a6ef1b9..bc0d180 100644
+--- a/win.h
++++ b/win.h
+_AT_@ -25,7 +25,7 @@ enum win_mode {
+
+ void xbell(void);
+ void xclipcopy(void);
+-void xdrawcursor(int, int, Glyph, int, int, Glyph);
++void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int);
+ void xdrawline(Line, int, int, int);
+ void xfinishdraw(void);
+ void xloadcols(void);
+diff --git a/x.c b/x.c
+index 50da23c..bec3e76 100644
+--- a/x.c
++++ b/x.c
+_AT_@ -19,6 +19,7 @@ char *argv0;
+ #include "arg.h"
+ #include "st.h"
+ #include "win.h"
++#include "hb.h"
+
+ /* types used in config.h */
+ typedef struct {
+_AT_@ -1040,6 +1041,9 @@ xunloadfont(Font *f)
+ void
+ xunloadfonts(void)
+ {
++ /* Clear Harfbuzz font cache. */
++ hbunloadfonts();
++
+ /* Free the loaded fonts in the font cache. */
+ while (frclen > 0)
+ XftFontClose(xw.dpy, frc[--frclen].font);
+_AT_@ -1246,7 +1250,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+ mode = glyphs[i].mode;
+
+ /* Skip dummy wide-character spacing. */
+- if (mode == ATTR_WDUMMY)
++ if (mode & ATTR_WDUMMY)
+ continue;
+
+ /* Determine font for glyph if different from previous glyph. */
+_AT_@ -1353,6 +1357,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+ numspecs++;
+ }
+
++ /* Harfbuzz transformation for ligatures. */
++ hbtransform(specs, glyphs, len, x, y);
++
+ return numspecs;
+ }
+
+_AT_@ -1502,14 +1509,17 @@ xdrawglyph(Glyph g, int x, int y)
+ }
+
+ void
+-xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
++xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len)
+ {
+ Color drawcol;
+
+ /* remove the old cursor */
+ if (selected(ox, oy))
+ og.mode ^= ATTR_REVERSE;
+- xdrawglyph(og, ox, oy);
++
++ /* Redraw the line where cursor was previously.
++ * It will restore the ligatures broken by the cursor. */
++ xdrawline(line, 0, oy, len);
+
+ if (IS_SET(MODE_HIDE))
+ return;
diff --git a/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-alpha-scrollback-20200430-0.8.3.diff b/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-alpha-scrollback-20200430-0.8.3.diff
new file mode 100644
index 00000000..cfd59ec6
--- /dev/null
+++ b/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-alpha-scrollback-20200430-0.8.3.diff
_AT_@ -0,0 +1,307 @@
+diff --git a/Makefile b/Makefile
+index 470ac86..38240da 100644
+--- a/Makefile
++++ b/Makefile
+_AT_@ -4,7 +4,7 @@
+
+ include config.mk
+
+-SRC = st.c x.c
++SRC = st.c x.c hb.c
+ OBJ = $(SRC:.c=.o)
+
+ all: options st
+_AT_@ -22,7 +22,8 @@ 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
++hb.o: st.h
+
+ $(OBJ): config.h config.mk
+
+diff --git a/config.mk b/config.mk
+index ddc65ae..07a3d14 100644
+--- a/config.mk
++++ b/config.mk
+_AT_@ -15,10 +15,12 @@ PKG_CONFIG = pkg-config
+ # includes and libs
+ INCS = -I$(X11INC) \
+ `$(PKG_CONFIG) --cflags fontconfig` \
+- `$(PKG_CONFIG) --cflags freetype2`
++ `$(PKG_CONFIG) --cflags freetype2` \
++ `$(PKG_CONFIG) --cflags harfbuzz`
+ LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
+ `$(PKG_CONFIG) --libs fontconfig` \
+- `$(PKG_CONFIG) --libs freetype2`
++ `$(PKG_CONFIG) --libs freetype2` \
++ `$(PKG_CONFIG) --libs harfbuzz`
+
+ # flags
+ STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
+diff --git a/hb.c b/hb.c
+new file mode 100644
+index 0000000..7df2828
+--- /dev/null
++++ b/hb.c
+_AT_@ -0,0 +1,136 @@
++#include <stdlib.h>
++#include <stdio.h>
++#include <math.h>
++#include <X11/Xft/Xft.h>
++#include <hb.h>
++#include <hb-ft.h>
++
++#include "st.h"
++
++void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
++hb_font_t *hbfindfont(XftFont *match);
++
++typedef struct {
++ XftFont *match;
++ hb_font_t *font;
++} HbFontMatch;
++
++static int hbfontslen = 0;
++static HbFontMatch *hbfontcache = NULL;
++
++void
++hbunloadfonts()
++{
++ for (int i = 0; i < hbfontslen; i++) {
++ hb_font_destroy(hbfontcache[i].font);
++ XftUnlockFace(hbfontcache[i].match);
++ }
++
++ if (hbfontcache != NULL) {
++ free(hbfontcache);
++ hbfontcache = NULL;
++ }
++ hbfontslen = 0;
++}
++
++hb_font_t *
++hbfindfont(XftFont *match)
++{
++ for (int i = 0; i < hbfontslen; i++) {
++ if (hbfontcache[i].match == match)
++ return hbfontcache[i].font;
++ }
++
++ /* Font not found in cache, caching it now. */
++ hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 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[hbfontslen].match = match;
++ hbfontcache[hbfontslen].font = font;
++ hbfontslen += 1;
++
++ return font;
++}
++
++void
++hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y)
++{
++ int start = 0, length = 1, gstart = 0;
++ hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t));
++
++ for (int idx = 1, specidx = 1; idx < len; idx++) {
++ if (glyphs[idx].mode & ATTR_WDUMMY) {
++ length += 1;
++ continue;
++ }
++
++ if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) {
++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
++
++ /* Reset the sequence. */
++ length = 1;
++ start = specidx;
++ gstart = idx;
++ } else {
++ length += 1;
++ }
++
++ specidx++;
++ }
++
++ /* EOL. */
++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
++
++ /* Apply the transformation to glyph specs. */
++ for (int i = 0, specidx = 0; i < len; i++) {
++ if (glyphs[i].mode & ATTR_WDUMMY)
++ continue;
++
++ if (codepoints[i] != specs[specidx].glyph)
++ ((Glyph *)glyphs)[i].mode |= ATTR_LIGA;
++
++ specs[specidx++].glyph = codepoints[i];
++ }
++
++ free(codepoints);
++}
++
++void
++hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length)
++{
++ hb_font_t *font = hbfindfont(xfont);
++ if (font == NULL)
++ return;
++
++ Rune rune;
++ ushort mode = USHRT_MAX;
++ hb_buffer_t *buffer = hb_buffer_create();
++ hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
++
++ /* Fill buffer with codepoints. */
++ for (int i = start; i < (start+length); i++) {
++ rune = string[i].u;
++ mode = string[i].mode;
++ if (mode & ATTR_WDUMMY)
++ rune = 0x0020;
++ hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1);
++ }
++
++ /* Shape the segment. */
++ hb_shape(font, buffer, NULL, 0);
++
++ /* Get new glyph info. */
++ hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
++
++ /* Write new codepoints. */
++ for (int i = 0; i < length; i++) {
++ hb_codepoint_t gid = info[i].codepoint;
++ codepoints[start+i] = gid;
++ }
++
++ /* Cleanup. */
++ hb_buffer_destroy(buffer);
++}
+diff --git a/hb.h b/hb.h
+new file mode 100644
+index 0000000..b3e02d0
+--- /dev/null
++++ b/hb.h
+_AT_@ -0,0 +1,7 @@
++#include <X11/Xft/Xft.h>
++#include <hb.h>
++#include <hb-ft.h>
++
++void hbunloadfonts();
++void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int);
++
+diff --git a/st.c b/st.c
+index 641edc0..14a0b66 100644
+--- a/st.c
++++ b/st.c
+_AT_@ -2670,7 +2670,8 @@ draw(void)
+ drawregion(0, 0, term.col, term.row);
+ if (term.scr == 0)
+ xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
+- term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
++ term.ocx, term.ocy, term.line[term.ocy][term.ocx],
++ term.line[term.ocy], term.col);
+ term.ocx = cx;
+ term.ocy = term.c.y;
+ xfinishdraw();
+diff --git a/st.h b/st.h
+index 2b2ba94..01bfb05 100644
+--- a/st.h
++++ b/st.h
+_AT_@ -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)
+-#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \
++#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \
++ (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)
+_AT_@ -33,6 +34,7 @@ enum glyph_attribute {
+ ATTR_WRAP = 1 << 8,
+ ATTR_WIDE = 1 << 9,
+ ATTR_WDUMMY = 1 << 10,
++ ATTR_LIGA = 1 << 11,
+ ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
+ };
+
+diff --git a/win.h b/win.h
+index a6ef1b9..bc0d180 100644
+--- a/win.h
++++ b/win.h
+_AT_@ -25,7 +25,7 @@ enum win_mode {
+
+ void xbell(void);
+ void xclipcopy(void);
+-void xdrawcursor(int, int, Glyph, int, int, Glyph);
++void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int);
+ void xdrawline(Line, int, int, int);
+ void xfinishdraw(void);
+ void xloadcols(void);
+diff --git a/x.c b/x.c
+index 50da23c..bec3e76 100644
+--- a/x.c
++++ b/x.c
+_AT_@ -19,6 +19,7 @@ char *argv0;
+ #include "arg.h"
+ #include "st.h"
+ #include "win.h"
++#include "hb.h"
+
+ /* types used in config.h */
+ typedef struct {
+_AT_@ -1040,6 +1041,9 @@ xunloadfont(Font *f)
+ void
+ xunloadfonts(void)
+ {
++ /* Clear Harfbuzz font cache. */
++ hbunloadfonts();
++
+ /* Free the loaded fonts in the font cache. */
+ while (frclen > 0)
+ XftFontClose(xw.dpy, frc[--frclen].font);
+_AT_@ -1246,7 +1250,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+ mode = glyphs[i].mode;
+
+ /* Skip dummy wide-character spacing. */
+- if (mode == ATTR_WDUMMY)
++ if (mode & ATTR_WDUMMY)
+ continue;
+
+ /* Determine font for glyph if different from previous glyph. */
+_AT_@ -1353,6 +1357,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+ numspecs++;
+ }
+
++ /* Harfbuzz transformation for ligatures. */
++ hbtransform(specs, glyphs, len, x, y);
++
+ return numspecs;
+ }
+
+_AT_@ -1502,14 +1509,17 @@ xdrawglyph(Glyph g, int x, int y)
+ }
+
+ void
+-xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
++xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len)
+ {
+ Color drawcol;
+
+ /* remove the old cursor */
+ if (selected(ox, oy))
+ og.mode ^= ATTR_REVERSE;
+- xdrawglyph(og, ox, oy);
++
++ /* Redraw the line where cursor was previously.
++ * It will restore the ligatures broken by the cursor. */
++ xdrawline(line, 0, oy, len);
+
+ if (IS_SET(MODE_HIDE))
+ return;
diff --git a/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-boxdraw-20200430-0.8.3.diff b/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-boxdraw-20200430-0.8.3.diff
new file mode 100644
index 00000000..f92c28dc
--- /dev/null
+++ b/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-boxdraw-20200430-0.8.3.diff
_AT_@ -0,0 +1,311 @@
+diff --git a/Makefile b/Makefile
+index 6dfa212..2ffd3c8 100644
+--- a/Makefile
++++ b/Makefile
+_AT_@ -4,7 +4,7 @@
+
+ include config.mk
+
+-SRC = st.c x.c boxdraw.c
++SRC = st.c x.c boxdraw.c hb.c
+ OBJ = $(SRC:.c=.o)
+
+ all: options st
+_AT_@ -22,7 +22,8 @@ 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
++hb.o: st.h
+ boxdraw.o: config.h st.h boxdraw_data.h
+
+ $(OBJ): config.h config.mk
+diff --git a/config.mk b/config.mk
+index beafc35..3df5c83 100644
+--- a/config.mk
++++ b/config.mk
+_AT_@ -15,10 +15,12 @@ PKG_CONFIG = pkg-config
+ # includes and libs
+ INCS = -I$(X11INC) \
+ `$(PKG_CONFIG) --cflags fontconfig` \
+- `$(PKG_CONFIG) --cflags freetype2`
++ `$(PKG_CONFIG) --cflags freetype2` \
++ `$(PKG_CONFIG) --cflags harfbuzz`
+ LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
+ `$(PKG_CONFIG) --libs fontconfig` \
+- `$(PKG_CONFIG) --libs freetype2`
++ `$(PKG_CONFIG) --libs freetype2` \
++ `$(PKG_CONFIG) --libs harfbuzz`
+
+ # flags
+ STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
+diff --git a/hb.c b/hb.c
+new file mode 100644
+index 0000000..467bcac
+--- /dev/null
++++ b/hb.c
+_AT_@ -0,0 +1,140 @@
++#include <stdlib.h>
++#include <stdio.h>
++#include <math.h>
++#include <X11/Xft/Xft.h>
++#include <hb.h>
++#include <hb-ft.h>
++
++#include "st.h"
++
++void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
++hb_font_t *hbfindfont(XftFont *match);
++
++typedef struct {
++ XftFont *match;
++ hb_font_t *font;
++} HbFontMatch;
++
++static int hbfontslen = 0;
++static HbFontMatch *hbfontcache = NULL;
++
++void
++hbunloadfonts()
++{
++ for (int i = 0; i < hbfontslen; i++) {
++ hb_font_destroy(hbfontcache[i].font);
++ XftUnlockFace(hbfontcache[i].match);
++ }
++
++ if (hbfontcache != NULL) {
++ free(hbfontcache);
++ hbfontcache = NULL;
++ }
++ hbfontslen = 0;
++}
++
++hb_font_t *
++hbfindfont(XftFont *match)
++{
++ for (int i = 0; i < hbfontslen; i++) {
++ if (hbfontcache[i].match == match)
++ return hbfontcache[i].font;
++ }
++
++ /* Font not found in cache, caching it now. */
++ hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 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[hbfontslen].match = match;
++ hbfontcache[hbfontslen].font = font;
++ hbfontslen += 1;
++
++ return font;
++}
++
++void
++hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y)
++{
++ int start = 0, length = 1, gstart = 0;
++ hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t));
++
++ for (int idx = 1, specidx = 1; idx < len; idx++) {
++ if (glyphs[idx].mode & ATTR_WDUMMY) {
++ length += 1;
++ continue;
++ }
++
++ if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) {
++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
++
++ /* Reset the sequence. */
++ length = 1;
++ start = specidx;
++ gstart = idx;
++ } else {
++ length += 1;
++ }
++
++ specidx++;
++ }
++
++ /* EOL. */
++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
++
++ /* Apply the transformation to glyph specs. */
++ for (int i = 0, specidx = 0; i < len; i++) {
++ if (glyphs[i].mode & ATTR_WDUMMY)
++ continue;
++ if (glyphs[i].mode & ATTR_BOXDRAW) {
++ specidx++;
++ continue;
++ }
++
++ if (codepoints[i] != specs[specidx].glyph)
++ ((Glyph *)glyphs)[i].mode |= ATTR_LIGA;
++
++ specs[specidx++].glyph = codepoints[i];
++ }
++
++ free(codepoints);
++}
++
++void
++hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length)
++{
++ hb_font_t *font = hbfindfont(xfont);
++ if (font == NULL)
++ return;
++
++ Rune rune;
++ ushort mode = USHRT_MAX;
++ hb_buffer_t *buffer = hb_buffer_create();
++ hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
++
++ /* Fill buffer with codepoints. */
++ for (int i = start; i < (start+length); i++) {
++ rune = string[i].u;
++ mode = string[i].mode;
++ if (mode & ATTR_WDUMMY)
++ rune = 0x0020;
++ hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1);
++ }
++
++ /* Shape the segment. */
++ hb_shape(font, buffer, NULL, 0);
++
++ /* Get new glyph info. */
++ hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
++
++ /* Write new codepoints. */
++ for (int i = 0; i < length; i++) {
++ hb_codepoint_t gid = info[i].codepoint;
++ codepoints[start+i] = gid;
++ }
++
++ /* Cleanup. */
++ hb_buffer_destroy(buffer);
++}
+diff --git a/hb.h b/hb.h
+new file mode 100644
+index 0000000..b3e02d0
+--- /dev/null
++++ b/hb.h
+_AT_@ -0,0 +1,7 @@
++#include <X11/Xft/Xft.h>
++#include <hb.h>
++#include <hb-ft.h>
++
++void hbunloadfonts();
++void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int);
++
+diff --git a/st.c b/st.c
+index c035e19..13cbcf7 100644
+--- a/st.c
++++ b/st.c
+_AT_@ -2602,7 +2602,8 @@ 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.ocx, term.ocy, term.line[term.ocy][term.ocx],
++ term.line[term.ocy], term.col);
+ term.ocx = cx;
+ term.ocy = term.c.y;
+ xfinishdraw();
+diff --git a/st.h b/st.h
+index a6c382a..c7e79c6 100644
+--- a/st.h
++++ b/st.h
+_AT_@ -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)
+-#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \
++#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \
++ (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)
+_AT_@ -34,6 +35,7 @@ enum glyph_attribute {
+ ATTR_WIDE = 1 << 9,
+ ATTR_WDUMMY = 1 << 10,
+ ATTR_BOXDRAW = 1 << 11,
++ ATTR_LIGA = 1 << 12,
+ ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
+ };
+
+diff --git a/win.h b/win.h
+index a6ef1b9..bc0d180 100644
+--- a/win.h
++++ b/win.h
+_AT_@ -25,7 +25,7 @@ enum win_mode {
+
+ void xbell(void);
+ void xclipcopy(void);
+-void xdrawcursor(int, int, Glyph, int, int, Glyph);
++void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int);
+ void xdrawline(Line, int, int, int);
+ void xfinishdraw(void);
+ void xloadcols(void);
+diff --git a/x.c b/x.c
+index 6f7ea2c..a79384c 100644
+--- a/x.c
++++ b/x.c
+_AT_@ -19,6 +19,7 @@ char *argv0;
+ #include "arg.h"
+ #include "st.h"
+ #include "win.h"
++#include "hb.h"
+
+ /* types used in config.h */
+ typedef struct {
+_AT_@ -1031,6 +1032,9 @@ xunloadfont(Font *f)
+ void
+ xunloadfonts(void)
+ {
++ /* Clear Harfbuzz font cache. */
++ hbunloadfonts();
++
+ /* Free the loaded fonts in the font cache. */
+ while (frclen > 0)
+ XftFontClose(xw.dpy, frc[--frclen].font);
+_AT_@ -1231,7 +1235,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+ mode = glyphs[i].mode;
+
+ /* Skip dummy wide-character spacing. */
+- if (mode == ATTR_WDUMMY)
++ if (mode & ATTR_WDUMMY)
+ continue;
+
+ /* Determine font for glyph if different from previous glyph. */
+_AT_@ -1343,6 +1347,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+ numspecs++;
+ }
+
++ /* Harfbuzz transformation for ligatures. */
++ hbtransform(specs, glyphs, len, x, y);
++
+ return numspecs;
+ }
+
+_AT_@ -1496,14 +1503,17 @@ xdrawglyph(Glyph g, int x, int y)
+ }
+
+ void
+-xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
++xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len)
+ {
+ Color drawcol;
+
+ /* remove the old cursor */
+ if (selected(ox, oy))
+ og.mode ^= ATTR_REVERSE;
+- xdrawglyph(og, ox, oy);
++
++ /* Redraw the line where cursor was previously.
++ * It will restore the ligatures broken by the cursor. */
++ xdrawline(line, 0, oy, len);
+
+ if (IS_SET(MODE_HIDE))
+ return;
diff --git a/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-scrollback-20200430-0.8.3.diff b/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-scrollback-20200430-0.8.3.diff
new file mode 100644
index 00000000..ed7d36f4
--- /dev/null
+++ b/st.suckless.org/patches/ligatures/0.8.3/st-ligatures-scrollback-20200430-0.8.3.diff
_AT_@ -0,0 +1,307 @@
+diff --git a/Makefile b/Makefile
+index 470ac86..38240da 100644
+--- a/Makefile
++++ b/Makefile
+_AT_@ -4,7 +4,7 @@
+
+ include config.mk
+
+-SRC = st.c x.c
++SRC = st.c x.c hb.c
+ OBJ = $(SRC:.c=.o)
+
+ all: options st
+_AT_@ -22,7 +22,8 @@ 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
++hb.o: st.h
+
+ $(OBJ): config.h config.mk
+
+diff --git a/config.mk b/config.mk
+index beafc35..3df5c83 100644
+--- a/config.mk
++++ b/config.mk
+_AT_@ -15,10 +15,12 @@ PKG_CONFIG = pkg-config
+ # includes and libs
+ INCS = -I$(X11INC) \
+ `$(PKG_CONFIG) --cflags fontconfig` \
+- `$(PKG_CONFIG) --cflags freetype2`
++ `$(PKG_CONFIG) --cflags freetype2` \
++ `$(PKG_CONFIG) --cflags harfbuzz`
+ LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
+ `$(PKG_CONFIG) --libs fontconfig` \
+- `$(PKG_CONFIG) --libs freetype2`
++ `$(PKG_CONFIG) --libs freetype2` \
++ `$(PKG_CONFIG) --libs harfbuzz`
+
+ # flags
+ STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
+diff --git a/hb.c b/hb.c
+new file mode 100644
+index 0000000..7df2828
+--- /dev/null
++++ b/hb.c
+_AT_@ -0,0 +1,136 @@
++#include <stdlib.h>
++#include <stdio.h>
++#include <math.h>
++#include <X11/Xft/Xft.h>
++#include <hb.h>
++#include <hb-ft.h>
++
++#include "st.h"
++
++void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
++hb_font_t *hbfindfont(XftFont *match);
++
++typedef struct {
++ XftFont *match;
++ hb_font_t *font;
++} HbFontMatch;
++
++static int hbfontslen = 0;
++static HbFontMatch *hbfontcache = NULL;
++
++void
++hbunloadfonts()
++{
++ for (int i = 0; i < hbfontslen; i++) {
++ hb_font_destroy(hbfontcache[i].font);
++ XftUnlockFace(hbfontcache[i].match);
++ }
++
++ if (hbfontcache != NULL) {
++ free(hbfontcache);
++ hbfontcache = NULL;
++ }
++ hbfontslen = 0;
++}
++
++hb_font_t *
++hbfindfont(XftFont *match)
++{
++ for (int i = 0; i < hbfontslen; i++) {
++ if (hbfontcache[i].match == match)
++ return hbfontcache[i].font;
++ }
++
++ /* Font not found in cache, caching it now. */
++ hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 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[hbfontslen].match = match;
++ hbfontcache[hbfontslen].font = font;
++ hbfontslen += 1;
++
++ return font;
++}
++
++void
++hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y)
++{
++ int start = 0, length = 1, gstart = 0;
++ hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t));
++
++ for (int idx = 1, specidx = 1; idx < len; idx++) {
++ if (glyphs[idx].mode & ATTR_WDUMMY) {
++ length += 1;
++ continue;
++ }
++
++ if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) {
++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
++
++ /* Reset the sequence. */
++ length = 1;
++ start = specidx;
++ gstart = idx;
++ } else {
++ length += 1;
++ }
++
++ specidx++;
++ }
++
++ /* EOL. */
++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
++
++ /* Apply the transformation to glyph specs. */
++ for (int i = 0, specidx = 0; i < len; i++) {
++ if (glyphs[i].mode & ATTR_WDUMMY)
++ continue;
++
++ if (codepoints[i] != specs[specidx].glyph)
++ ((Glyph *)glyphs)[i].mode |= ATTR_LIGA;
++
++ specs[specidx++].glyph = codepoints[i];
++ }
++
++ free(codepoints);
++}
++
++void
++hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length)
++{
++ hb_font_t *font = hbfindfont(xfont);
++ if (font == NULL)
++ return;
++
++ Rune rune;
++ ushort mode = USHRT_MAX;
++ hb_buffer_t *buffer = hb_buffer_create();
++ hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
++
++ /* Fill buffer with codepoints. */
++ for (int i = start; i < (start+length); i++) {
++ rune = string[i].u;
++ mode = string[i].mode;
++ if (mode & ATTR_WDUMMY)
++ rune = 0x0020;
++ hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1);
++ }
++
++ /* Shape the segment. */
++ hb_shape(font, buffer, NULL, 0);
++
++ /* Get new glyph info. */
++ hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
++
++ /* Write new codepoints. */
++ for (int i = 0; i < length; i++) {
++ hb_codepoint_t gid = info[i].codepoint;
++ codepoints[start+i] = gid;
++ }
++
++ /* Cleanup. */
++ hb_buffer_destroy(buffer);
++}
+diff --git a/hb.h b/hb.h
+new file mode 100644
+index 0000000..b3e02d0
+--- /dev/null
++++ b/hb.h
+_AT_@ -0,0 +1,7 @@
++#include <X11/Xft/Xft.h>
++#include <hb.h>
++#include <hb-ft.h>
++
++void hbunloadfonts();
++void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int);
++
+diff --git a/st.c b/st.c
+index 641edc0..14a0b66 100644
+--- a/st.c
++++ b/st.c
+_AT_@ -2670,7 +2670,8 @@ draw(void)
+ drawregion(0, 0, term.col, term.row);
+ if (term.scr == 0)
+ xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
+- term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
++ term.ocx, term.ocy, term.line[term.ocy][term.ocx],
++ term.line[term.ocy], term.col);
+ term.ocx = cx;
+ term.ocy = term.c.y;
+ xfinishdraw();
+diff --git a/st.h b/st.h
+index b9a4eeb..b49b84a 100644
+--- a/st.h
++++ b/st.h
+_AT_@ -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)
+-#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \
++#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \
++ (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)
+_AT_@ -33,6 +34,7 @@ enum glyph_attribute {
+ ATTR_WRAP = 1 << 8,
+ ATTR_WIDE = 1 << 9,
+ ATTR_WDUMMY = 1 << 10,
++ ATTR_LIGA = 1 << 11,
+ ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
+ };
+
+diff --git a/win.h b/win.h
+index a6ef1b9..bc0d180 100644
+--- a/win.h
++++ b/win.h
+_AT_@ -25,7 +25,7 @@ enum win_mode {
+
+ void xbell(void);
+ void xclipcopy(void);
+-void xdrawcursor(int, int, Glyph, int, int, Glyph);
++void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int);
+ void xdrawline(Line, int, int, int);
+ void xfinishdraw(void);
+ void xloadcols(void);
+diff --git a/x.c b/x.c
+index e5f1737..3334a83 100644
+--- a/x.c
++++ b/x.c
+_AT_@ -19,6 +19,7 @@ char *argv0;
+ #include "arg.h"
+ #include "st.h"
+ #include "win.h"
++#include "hb.h"
+
+ /* types used in config.h */
+ typedef struct {
+_AT_@ -1031,6 +1032,9 @@ xunloadfont(Font *f)
+ void
+ xunloadfonts(void)
+ {
++ /* Clear Harfbuzz font cache. */
++ hbunloadfonts();
++
+ /* Free the loaded fonts in the font cache. */
+ while (frclen > 0)
+ XftFontClose(xw.dpy, frc[--frclen].font);
+_AT_@ -1229,7 +1233,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+ mode = glyphs[i].mode;
+
+ /* Skip dummy wide-character spacing. */
+- if (mode == ATTR_WDUMMY)
++ if (mode & ATTR_WDUMMY)
+ continue;
+
+ /* Determine font for glyph if different from previous glyph. */
+_AT_@ -1336,6 +1340,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+ numspecs++;
+ }
+
++ /* Harfbuzz transformation for ligatures. */
++ hbtransform(specs, glyphs, len, x, y);
++
+ return numspecs;
+ }
+
+_AT_@ -1485,14 +1492,17 @@ xdrawglyph(Glyph g, int x, int y)
+ }
+
+ void
+-xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
++xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len)
+ {
+ Color drawcol;
+
+ /* remove the old cursor */
+ if (selected(ox, oy))
+ og.mode ^= ATTR_REVERSE;
+- xdrawglyph(og, ox, oy);
++
++ /* Redraw the line where cursor was previously.
++ * It will restore the ligatures broken by the cursor. */
++ xdrawline(line, 0, oy, len);
+
+ if (IS_SET(MODE_HIDE))
+ return;
diff --git a/st.suckless.org/patches/ligatures/st-ligatures-20200428-28ad288.diff b/st.suckless.org/patches/ligatures/28ad288/st-ligatures-20200428-28ad288.diff
similarity index 100%
rename from st.suckless.org/patches/ligatures/st-ligatures-20200428-28ad288.diff
rename to st.suckless.org/patches/ligatures/28ad288/st-ligatures-20200428-28ad288.diff
diff --git a/st.suckless.org/patches/ligatures/st-ligatures-alpha-20200428-28ad288.diff b/st.suckless.org/patches/ligatures/28ad288/st-ligatures-alpha-20200428-28ad288.diff
similarity index 100%
rename from st.suckless.org/patches/ligatures/st-ligatures-alpha-20200428-28ad288.diff
rename to st.suckless.org/patches/ligatures/28ad288/st-ligatures-alpha-20200428-28ad288.diff
diff --git a/st.suckless.org/patches/ligatures/st-ligatures-alpha-scrollback-20200428-28ad288.diff b/st.suckless.org/patches/ligatures/28ad288/st-ligatures-alpha-scrollback-20200428-28ad288.diff
similarity index 100%
rename from st.suckless.org/patches/ligatures/st-ligatures-alpha-scrollback-20200428-28ad288.diff
rename to st.suckless.org/patches/ligatures/28ad288/st-ligatures-alpha-scrollback-20200428-28ad288.diff
diff --git a/st.suckless.org/patches/ligatures/st-ligatures-boxdraw-20200428-28ad288.diff b/st.suckless.org/patches/ligatures/28ad288/st-ligatures-boxdraw-20200428-28ad288.diff
similarity index 100%
rename from st.suckless.org/patches/ligatures/st-ligatures-boxdraw-20200428-28ad288.diff
rename to st.suckless.org/patches/ligatures/28ad288/st-ligatures-boxdraw-20200428-28ad288.diff
diff --git a/st.suckless.org/patches/ligatures/st-ligatures-scrollback-20200428-28ad288.diff b/st.suckless.org/patches/ligatures/28ad288/st-ligatures-scrollback-20200428-28ad288.diff
similarity index 100%
rename from st.suckless.org/patches/ligatures/st-ligatures-scrollback-20200428-28ad288.diff
rename to st.suckless.org/patches/ligatures/28ad288/st-ligatures-scrollback-20200428-28ad288.diff
diff --git a/st.suckless.org/patches/ligatures/index.md b/st.suckless.org/patches/ligatures/index.md
index 3b5505c8..dc304073 100644
--- a/st.suckless.org/patches/ligatures/index.md
+++ b/st.suckless.org/patches/ligatures/index.md
_AT_@ -16,21 +16,30 @@ Taken with Fira Code Regular 14pt:
Notes
-----
* The patch adds additional dependency on Harfbuzz library and headers.
-* Original patch was made for clean version of ST from latest master commit. It is not 100% compatible with Scrollback and Alpha patches, so I made a modified versions that you can apply on top of a Scrollback and/or Alpha patch.
+* Original patch was made for vanilla version of ST from latest master commit. It is not 100% compatible with Scrollback and Alpha patches, so I made modified versions that you can apply on top of a Scrollback and/or Alpha patch.
* Due to some limitations in drawing engine, ligatures will break when crossing colors, font styles or selection. They will still render properly as separate symbols, just not as ligatures.

-boxdraw
+Boxdraw
-------
-* The original patch does not work very well with the boxdraw. Since it requires some additional changes in the code to make ligatures compatible with boxdraw, a special version of the patch was added, that you can apply on top of the boxdraw patch.
+* The original patch does not work very well with the boxdraw patch. Since it requires some additional changes in the code to make ligatures compatible with boxdraw, a special version of the patch was added, that you can apply on top of the boxdraw patch.
* It does not include Alpha or Scrollback patches.

Download
--------
-* [st-ligatures](st-ligatures-20200428-28ad288.diff)
-* [st-ligatures-scrollback](st-ligatures-scrollback-20200428-28ad288.diff)
-* [st-ligatures-alpha](st-ligatures-alpha-20200428-28ad288.diff)
-* [st-ligatures-alpha-scrollback](st-ligatures-alpha-scrollback-20200428-28ad288.diff)
-* [st-ligatures-boxdraw](st-ligatures-boxdraw-20200428-28ad288.diff)
+**0.8.3**:
+* [st-ligatures-0.8.3](0.8.3/st-ligatures-20200430-0.8.3.diff)
+* [st-ligatures-scrollback-0.8.3](0.8.3/st-ligatures-scrollback-20200430-0.8.3.diff)
+* [st-ligatures-alpha-0.8.3](0.8.3/st-ligatures-alpha-20200430-0.8.3.diff)
+* [st-ligatures-alpha-scrollback-0.8.3](0.8.3/st-ligatures-alpha-scrollback-20200430-0.8.3.diff)
+* [st-ligatures-boxdraw-0.8.3](0.8.3/st-ligatures-boxdraw-20200430-0.8.3.diff)
+
+**0.8.2-28ad288**:
+* [st-ligatures](28ad288/st-ligatures-20200428-28ad288.diff)
+* [st-ligatures-scrollback](28ad288/st-ligatures-scrollback-20200428-28ad288.diff)
+* [st-ligatures-alpha](28ad288/st-ligatures-alpha-20200428-28ad288.diff)
+* [st-ligatures-alpha-scrollback](28ad288/st-ligatures-alpha-scrollback-20200428-28ad288.diff)
+* [st-ligatures-boxdraw](28ad288/st-ligatures-boxdraw-20200428-28ad288.diff)
+

Authors
-------
Received on Thu Apr 30 2020 - 17:58:59 CEST

This archive was generated by hypermail 2.3.0 : Thu Apr 30 2020 - 18:00:47 CEST