Apply st-vertcenter-20180320-6ac8c8a

1 files changed, 6 insertions, 4 deletions

diff --git a/x.c b/x.c
index 04fd748..d000dcc 100644
--- a/x.c
+++ b/x.c
@@ -84,6 +84,7 @@ typedef struct {
         int hborderpx, vborderpx;
         int ch; /* char height */
         int cw; /* char width  */
+        int cyo; /* char y offset */
         int mode; /* window state/mode flags */
         int cursor; /* cursor style */
 } TermWindow;
@@ -1036,6 +1037,7 @@ xloadfonts(const char *fontstr, double fontsize)
         /* Setting character width and height. */
         win.cw = ceilf(dc.font.width * cwscale);
         win.ch = ceilf(dc.font.height * chscale);
+        win.cyo = ceilf(dc.font.height * (chscale - 1) / 2);
 
         FcPatternDel(pattern, FC_SLANT);
         FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
@@ -1260,7 +1262,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
         FcCharSet *fccharset;
         int i, f, numspecs = 0;
 
-        for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
+        for (i = 0, xp = winx, yp = winy + font->ascent + win.cyo; i < len; ++i) {
                 /* Fetch rune and mode for current glyph. */
                 rune = glyphs[i].u;
                 mode = glyphs[i].mode;
@@ -1285,7 +1287,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
                                 font = &dc.bfont;
                                 frcflags = FRC_BOLD;
                         }
-                        yp = winy + font->ascent;
+                        yp = winy + font->ascent + win.cyo;
                 }
 
                 /* Lookup character index with default font. */
@@ -1498,12 +1500,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
 
         /* Render underline and strikethrough. */
         if (base.mode & ATTR_UNDERLINE) {
-                XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent * chscale + 1,
+                XftDrawRect(xw.draw, fg, winx, winy + win.cyo + dc.font.ascent * chscale + 1,
                                 width, 1);
         }
 
         if (base.mode & ATTR_STRUCK) {
-                XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent * chscale / 3,
+                XftDrawRect(xw.draw, fg, winx, winy + win.cyo + 2 * dc.font.ascent * chscale / 3,
                                 width, 1);
         }