From e0a07a93920addd911486ff5525e5675a7ceda7b Mon Sep 17 00:00:00 2001 From: Shiva Date: Sun, 29 Jan 2017 21:40:45 -0800 Subject: [PATCH] vertically center lines in space available --- st.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/st.c b/st.c index 28cf2e4..916c9a4 100644 --- a/st.c +++ b/st.c @@ -281,6 +281,7 @@ typedef struct { int w, h; /* window width and height */ int ch; /* char height */ int cw; /* char width */ + int cyo; /* char y offset */ char state; /* focus, redraw, visible */ int cursor; /* cursor style */ } XWindow; @@ -3583,6 +3584,7 @@ xloadfonts(char *fontstr, double fontsize) /* Setting character width and height. */ xw.cw = ceilf(dc.font.width * cwscale); xw.ch = ceilf(dc.font.height * chscale); + xw.cyo = ceilf(dc.font.height * (chscale - 1) / 2); FcPatternDel(pattern, FC_SLANT); FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); @@ -3808,7 +3810,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 + xw.cyo; } /* Lookup character index with default font. */ @@ -4019,12 +4021,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 + 1, + XftDrawRect(xw.draw, fg, winx, winy + xw.cyo + dc.font.ascent + 1, width, 1); } if (base.mode & ATTR_STRUCK) { - XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3, + XftDrawRect(xw.draw, fg, winx, winy + xw.cyo + 2 * dc.font.ascent / 3, width, 1); }