From 35a662dbdc5d82bc1f0b322a71f84c671a494331 Mon Sep 17 00:00:00 2001 From: wundrweapon Date: Sun, 12 Jul 2020 18:54:32 -0400 Subject: [PATCH] Add support for stylistic sets Other OTF tags may also work --- config.h | 10 ++++++++++ hb.c | 30 +++++++++++++++++++++++------- hb.h | 3 +-- x.c | 2 +- 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/config.h b/config.h index 47ed4d5..1b9f738 100644 --- a/config.h +++ b/config.h @@ -9,6 +9,16 @@ static char *font = "mono:pixelsize=14:antialias=true:autohint=true"; static char *font2[] = { "JoyPixels:pixelsize=10:antialias=true:autohint=true" }; static int borderpx = 2; +/* + * Extra font features; generally used for stylistic sets + * Ensure numuserfeats is equal to the length of the userfeats array + * Note: value will always be set to 1; should be fine for stylistic sets + * + * Example array for numuserfeats = 3: {"ss02", "ss08", "onum"} + */ +static int numuserfeats = 0; +static char *userfeats[] = {}; + /* * What program is execed by st depends of these precedence rules: * 1: program passed with -e diff --git a/hb.c b/hb.c index 467bcac..bd22de5 100644 --- a/hb.c +++ b/hb.c @@ -1,13 +1,14 @@ #include #include #include +#include #include #include #include #include "st.h" -void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length); +void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length, char **userfeats, int numuserfeats); hb_font_t *hbfindfont(XftFont *match); typedef struct { @@ -56,7 +57,7 @@ hbfindfont(XftFont *match) } void -hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y) +hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y, char **userfeats, int numuserfeats) { int start = 0, length = 1, gstart = 0; hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t)); @@ -68,7 +69,7 @@ hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int } 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); + hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length, userfeats, numuserfeats); /* Reset the sequence. */ length = 1; @@ -82,7 +83,7 @@ hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int } /* EOL. */ - hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length); + hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length, userfeats, numuserfeats); /* Apply the transformation to glyph specs. */ for (int i = 0, specidx = 0; i < len; i++) { @@ -103,7 +104,7 @@ hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int } void -hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length) +hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length, char **userfeats, int numuserfeats) { hb_font_t *font = hbfindfont(xfont); if (font == NULL) @@ -123,8 +124,23 @@ hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoin hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1); } - /* Shape the segment. */ - hb_shape(font, buffer, NULL, 0); + /* Prep user features for OpenType tags. */ + hb_feature_t *ufeats = calloc(numuserfeats, sizeof(hb_feature_t)); + if (errno == ENOMEM) + ufeats = NULL; + + if (ufeats) { + for (int i = 0; i < numuserfeats; i++) { + ufeats[i].tag = HB_TAG(userfeats[i][0], userfeats[i][1], userfeats[i][2], userfeats[i][3]); + ufeats[i].value = 1; + ufeats[i].start = HB_FEATURE_GLOBAL_START; + ufeats[i].end = HB_FEATURE_GLOBAL_END; + } + } + + /* Shape the segment and free the calloc'd feature array. */ + hb_shape(font, buffer, ufeats, ufeats ? numuserfeats : 0); + free(ufeats); /* Get new glyph info. */ hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL); diff --git a/hb.h b/hb.h index b3e02d0..fe46a0a 100644 --- a/hb.h +++ b/hb.h @@ -3,5 +3,4 @@ #include void hbunloadfonts(); -void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int); - +void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int, char **, int); diff --git a/x.c b/x.c index d2ed474..bf16842 100644 --- a/x.c +++ b/x.c @@ -1448,7 +1448,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x } /* Harfbuzz transformation for ligatures. */ - hbtransform(specs, glyphs, len, x, y); + hbtransform(specs, glyphs, len, x, y, userfeats, numuserfeats); return numspecs; }