diff options
| author | Mateja <mail@matejamaric.com> | 2021-04-08 15:24:18 +0200 |
|---|---|---|
| committer | Mateja <mail@matejamaric.com> | 2021-04-08 15:40:20 +0200 |
| commit | 081aa95b38c53b5a9ea47907496e0ff043fdffe3 (patch) | |
| tree | c0be6daa9077c38ef68a545068b6704a4ede3fd4 /x.c | |
| parent | e9bb39d56fe9982b8a1b6e3f6864a10b4a35aa51 (diff) | |
| download | st-081aa95b38c53b5a9ea47907496e0ff043fdffe3.tar.gz st-081aa95b38c53b5a9ea47907496e0ff043fdffe3.zip | |
Switched to Fira Code font and applied `boxdraw` patch.v1.1.0
Diffstat (limited to 'x.c')
| -rw-r--r-- | x.c | 21 |
1 files changed, 16 insertions, 5 deletions
@@ -1222,6 +1222,8 @@ xinit(int cols, int rows) xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0); if (xsel.xtarget == None) xsel.xtarget = XA_STRING; + + boxdraw_xinit(xw.dpy, xw.cmap, xw.draw, xw.vis); } int @@ -1268,8 +1270,13 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x yp = winy + font->ascent; } - /* Lookup character index with default font. */ - glyphidx = XftCharIndex(xw.dpy, font->match, rune); + if (mode & ATTR_BOXDRAW) { + /* minor shoehorning: boxdraw uses only this ushort */ + glyphidx = boxdrawindex(&glyphs[i]); + } else { + /* Lookup character index with default font. */ + glyphidx = XftCharIndex(xw.dpy, font->match, rune); + } if (glyphidx) { specs[numspecs].font = font->match; specs[numspecs].glyph = glyphidx; @@ -1469,8 +1476,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i r.width = width; XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1); - /* Render the glyphs. */ - XftDrawGlyphFontSpec(xw.draw, fg, specs, len); + if (base.mode & ATTR_BOXDRAW) { + drawboxes(winx, winy, width / len, win.ch, fg, bg, specs, len); + } else { + /* Render the glyphs. */ + XftDrawGlyphFontSpec(xw.draw, fg, specs, len); + } /* Render underline and strikethrough. */ if (base.mode & ATTR_UNDERLINE) { @@ -1513,7 +1524,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) /* * Select the right color for the right mode. */ - g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE; + g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE|ATTR_BOXDRAW; if (IS_SET(MODE_REVERSE)) { g.mode |= ATTR_REVERSE; |