1 files changed, 16 insertions, 5 deletions

diff --git a/x.c b/x.c
index 18d258e..58c2d98 100644
--- a/x.c
+++ b/x.c
@@ -1294,6 +1294,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
@@ -1340,8 +1342,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;
@@ -1545,8 +1552,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) {
@@ -1589,7 +1600,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;