zymon/st
1
0
Fork 0
mirror of https://github.com/LukeSmithxyz/st.git synced 2025-04-05 02:41:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add support for stylistic sets

Browse source 
Other OTF tags may also work
This commit is contained in:
wundrweapon 2020-07-12 18:54:32 -04:00
parent e187610a23
commit 35a662dbdc
No known key found for this signature in database
GPG key ID: BA156835EAB42DC5
4 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config.h
View file

@ -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 char *font2[] = { "JoyPixels:pixelsize=10:antialias=true:autohint=true" };
static int borderpx = 2; 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: * What program is execed by st depends of these precedence rules:
* 1: program passed with -e * 1: program passed with -e

30
hb.c
View file

@ -1,13 +1,14 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <errno.h>
#include <X11/Xft/Xft.h> #include <X11/Xft/Xft.h>
#include <hb.h> #include <hb.h>
#include <hb-ft.h> #include <hb-ft.h>
#include "st.h" #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); hb_font_t *hbfindfont(XftFont *match);
typedef struct { typedef struct {
@ -56,7 +57,7 @@ hbfindfont(XftFont *match)
} }
void 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; int start = 0, length = 1, gstart = 0;
hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t)); 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)) { 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. */ /* Reset the sequence. */
length = 1; length = 1;
@ -82,7 +83,7 @@ hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int
} }
/* EOL. */ /* 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. */ /* Apply the transformation to glyph specs. */
for (int i = 0, specidx = 0; i < len; i++) { 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 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); hb_font_t *font = hbfindfont(xfont);
if (font == NULL) 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); hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1);
} }
/* Shape the segment. */ /* Prep user features for OpenType tags. */
hb_shape(font, buffer, NULL, 0); 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. */ /* Get new glyph info. */
hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL); hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);

3
hb.h
View file

@ -3,5 +3,4 @@
#include <hb-ft.h> #include <hb-ft.h>
void hbunloadfonts(); void hbunloadfonts();
void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int); void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int, char **, int);

2
x.c
View file

@ -1448,7 +1448,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
} }
/* Harfbuzz transformation for ligatures. */ /* Harfbuzz transformation for ligatures. */
hbtransform(specs, glyphs, len, x, y); hbtransform(specs, glyphs, len, x, y, userfeats, numuserfeats);
return numspecs; return numspecs;
} }