osama/st
1
0
Fork 0
mirror of https://github.com/mintycube/st.git synced 2024-09-20 11:05:55 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118

Browse Source
This commit is contained in:
Bakkeby 2024-03-10 22:18:05 +01:00
parent f87d3de2cf
commit 1da419eb35
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
st.h
View File

@ -142,9 +142,7 @@ typedef Glyph *Line;
#if LIGATURES_PATCH #if LIGATURES_PATCH
typedef struct { typedef struct {
int ox; int ox;
#if WIDE_GLYPHS_PATCH
int charlen; int charlen;
#endif // WIDE_GLYPHS_PATCH
int numspecs; int numspecs;
Glyph base; Glyph base;
} GlyphFontSeq; } GlyphFontSeq;

53
x.c
View File

@ -80,11 +80,13 @@ static void zoomreset(const Arg *);
static inline ushort sixd_to_16bit(int); static inline ushort sixd_to_16bit(int);
static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int); static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int);
#if WIDE_GLYPHS_PATCH #if LIGATURES_PATCH && WIDE_GLYPHS_PATCH
static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int, int, int); static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int, int, int);
#elif LIGATURES_PATCH || WIDE_GLYPHS_PATCH
static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int, int);
#else #else
static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int); static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
#endif // WIDE_GLYPHS_PATCH #endif // WIDE_GLYPHS_PATCH | LIGATURES_PATCH
#if LIGATURES_PATCH #if LIGATURES_PATCH
static inline void xresetfontsettings(uint32_t mode, Font **font, int *frcflags); static inline void xresetfontsettings(uint32_t mode, Font **font, int *frcflags);
#endif // LIGATURES_PATCH #endif // LIGATURES_PATCH
@ -1623,15 +1625,18 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
FcPattern *fcpattern, *fontpattern; FcPattern *fcpattern, *fontpattern;
FcFontSet *fcsets[] = { NULL }; FcFontSet *fcsets[] = { NULL };
FcCharSet *fccharset; FcCharSet *fccharset;
int f, numspecs = 0; int i, f, numspecs = 0;
int i;
#if LIGATURES_PATCH #if LIGATURES_PATCH
float cluster_xp, cluster_yp; float cluster_xp, cluster_yp;
HbTransformData shaped; HbTransformData shaped;
/* Initial values. */ /* Initial values. */
xresetfontsettings(glyphs[0].mode, &font, &frcflags); xresetfontsettings(glyphs[0].mode, &font, &frcflags);
#if VERTCENTER_PATCH
xp = winx, yp = winy + font->ascent + win.cyo; xp = winx, yp = winy + font->ascent + win.cyo;
#else
xp = winx, yp = winy + font->ascent;
#endif // VERTCENTER_PATCH
cluster_xp = xp; cluster_yp = yp; cluster_xp = xp; cluster_yp = yp;
/* Shape the segment. */ /* Shape the segment. */
hbtransform(&shaped, font->match, glyphs, 0, len); hbtransform(&shaped, font->match, glyphs, 0, len);
@ -1924,13 +1929,15 @@ static int getSlope (int x, int iPoint, int waveWidth)
#endif // UNDERCURL_PATCH #endif // UNDERCURL_PATCH
void void
#if WIDE_GLYPHS_PATCH xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y, int dmode, int charlen)
#else
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
#endif // WIDE_GLYPHS_PATCH
{
#if WIDE_GLYPHS_PATCH #if WIDE_GLYPHS_PATCH
,int dmode
#endif // WIDE_GLYPHS_PATCH
#if LIGATURES_PATCH
, int charlen
#endif // LIGATURES_PATCH
) {
#if LIGATURES_PATCH
int width = charlen * win.cw; int width = charlen * win.cw;
#else #else
int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1); int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
@ -2549,11 +2556,14 @@ xdrawglyph(Glyph g, int x, int y)
XftGlyphFontSpec spec; XftGlyphFontSpec spec;
numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y); numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y);
#if WIDE_GLYPHS_PATCH xdrawglyphfontspecs(&spec, g, numspecs, x, y
xdrawglyphfontspecs(&spec, g, numspecs, x, y, DRAW_BG | DRAW_FG, (g.mode & ATTR_WIDE) ? 2 : 1); #if WIDE_GLYPHS_PATCH
#else ,DRAW_BG | DRAW_FG
xdrawglyphfontspecs(&spec, g, numspecs, x, y); #endif // WIDE_GLYPHS_PATCH
#endif // WIDE_GLYPHS_PATCH #if LIGATURES_PATCH
,(g.mode & ATTR_WIDE) ? 2 : 1
#endif // LIGATURES_PATCH
);
} }
void void
@ -2859,7 +2869,7 @@ xstartdraw(void)
return IS_SET(MODE_VISIBLE); return IS_SET(MODE_VISIBLE);
} }
#if WIDE_GLYPHS_PATCH && LIGATURES_PATCH #if LIGATURES_PATCH && WIDE_GLYPHS_PATCH
void void
xdrawline(Line line, int x1, int y1, int x2) xdrawline(Line line, int x1, int y1, int x2)
{ {
@ -2920,7 +2930,7 @@ xdrawline(Line line, int x1, int y1, int x2)
Glyph base, new; Glyph base, new;
XftGlyphFontSpec *specs = xw.specbuf; XftGlyphFontSpec *specs = xw.specbuf;
numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1);
i = ox = 0; i = ox = 0;
for (x = x1; x < x2; x++) { for (x = x1; x < x2; x++) {
new = line[x]; new = line[x];
@ -2934,7 +2944,7 @@ xdrawline(Line line, int x1, int y1, int x2)
#endif // SELECTION_COLORS_PATCH #endif // SELECTION_COLORS_PATCH
if ((i > 0) && ATTRCMP(base, new)) { if ((i > 0) && ATTRCMP(base, new)) {
numspecs = xmakeglyphfontspecs(specs, &line[ox], x - ox, ox, y1); numspecs = xmakeglyphfontspecs(specs, &line[ox], x - ox, ox, y1);
xdrawglyphfontspecs(specs, base, numspecs, ox, y1); xdrawglyphfontspecs(specs, base, numspecs, ox, y1, x - ox);
i = 0; i = 0;
} }
if (i == 0) { if (i == 0) {
@ -2943,10 +2953,9 @@ xdrawline(Line line, int x1, int y1, int x2)
} }
i++; i++;
} }
if (i > 0) { if (i > 0) {
numspecs = xmakeglyphfontspecs(specs, &line[ox], x2 - ox, ox, y1); numspecs = xmakeglyphfontspecs(specs, &line[ox], x2 - ox, ox, y1);
xdrawglyphfontspecs(specs, base, numspecs, ox, y1); xdrawglyphfontspecs(specs, base, numspecs, ox, y1, x2 - ox);
} }
} }
#elif WIDE_GLYPHS_PATCH #elif WIDE_GLYPHS_PATCH
@ -2976,7 +2985,7 @@ xdrawline(Line line, int x1, int y1, int x2)
new.mode ^= ATTR_REVERSE; new.mode ^= ATTR_REVERSE;
#endif // SELECTION_COLORS_PATCH #endif // SELECTION_COLORS_PATCH
if (i > 0 && ATTRCMP(base, new)) { if (i > 0 && ATTRCMP(base, new)) {
xdrawglyphfontspecs(specs, base, i, ox, y1, dmode, x - ox); xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
specs += i; specs += i;
numspecs -= i; numspecs -= i;
i = 0; i = 0;
@ -2988,7 +2997,7 @@ xdrawline(Line line, int x1, int y1, int x2)
i++; i++;
} }
if (i > 0) if (i > 0)
xdrawglyphfontspecs(specs, base, i, ox, y1, dmode, x2 - ox); xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
} }
} }
#else // !WIDE_GLYPHS_PATCH and !LIGATURES_PATCH #else // !WIDE_GLYPHS_PATCH and !LIGATURES_PATCH