wide glyph patch

1 files changed, 63 insertions, 61 deletions

diff --git a/x.c b/x.c
index e394882..d96dffd 100644
--- a/x.c
+++ b/x.c
@@ -153,7 +153,8 @@ typedef struct {
 static inline ushort sixd_to_16bit(int);
 static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int,
                                int);
-static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
+static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int,
+                                int);
 static void xdrawglyph(Glyph, int, int);
 static void xclear(int, int, int, int);
 static int xgeommasktogravity(int);
@@ -1336,7 +1337,7 @@ int xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len,
 }
 
 void xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len,
-                         int x, int y) {
+                         int x, int y, int dmode) {
   int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
   int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
       width = charlen * win.cw;
@@ -1420,44 +1421,38 @@ void xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len,
   if (base.mode & ATTR_INVISIBLE)
     fg = bg;
 
-  /* Intelligent cleaning up of the borders. */
-  if (x == 0) {
-    xclear(0, (y == 0) ? 0 : winy, borderpx,
-           winy + win.ch + ((winy + win.ch >= borderpx + win.th) ? win.h : 0));
-  }
-  if (winx + width >= borderpx + win.tw) {
-    xclear(winx + width, (y == 0) ? 0 : winy, win.w,
-           ((winy + win.ch >= borderpx + win.th) ? win.h : (winy + win.ch)));
-  }
-  if (y == 0)
-    xclear(winx, 0, winx + width, borderpx);
-  if (winy + win.ch >= borderpx + win.th)
-    xclear(winx, winy + win.ch, winx + width, win.h);
-
-  /* Clean up the region we want to draw to. */
-  XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
-
-  /* Set the clip region because Xft is sometimes dirty. */
-  r.x = 0;
-  r.y = 0;
-  r.height = win.ch;
-  r.width = width;
-  XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
-
-  /* Render the glyphs. */
-  XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
-
-  /* Render underline and strikethrough. */
-  if (base.mode & ATTR_UNDERLINE) {
-    XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1, width, 1);
+  if (dmode & DRAW_BG) {
+    /* Intelligent cleaning up of the borders. */
+    if (x == 0) {
+      xclear(0, (y == 0) ? 0 : winy, borderpx,
+             winy + win.ch +
+                 ((winy + win.ch >= borderpx + win.th) ? win.h : 0));
+    }
+    if (winx + width >= borderpx + win.tw) {
+      xclear(winx + width, (y == 0) ? 0 : winy, win.w,
+             ((winy + win.ch >= borderpx + win.th) ? win.h : (winy + win.ch)));
+    }
+    if (y == 0)
+      xclear(winx, 0, winx + width, borderpx);
+    if (winy + win.ch >= borderpx + win.th)
+      xclear(winx, winy + win.ch, winx + width, win.h);
+    /* Fill the background */
+    XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
   }
 
-  if (base.mode & ATTR_STRUCK) {
-    XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3, width, 1);
-  }
+  if (dmode & DRAW_FG) {
+    /* Render the glyphs. */
+    XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
+
+    /* Render underline and strikethrough. */
+    if (base.mode & ATTR_UNDERLINE) {
+      XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1, width, 1);
+    }
 
-  /* Reset clip to none. */
-  XftDrawSetClip(xw.draw, 0);
+    if (base.mode & ATTR_STRUCK) {
+      XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3, width, 1);
+    }
+  }
 }
 
 void xdrawglyph(Glyph g, int x, int y) {
@@ -1465,7 +1460,7 @@ void xdrawglyph(Glyph g, int x, int y) {
   XftGlyphFontSpec spec;
 
   numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y);
-  xdrawglyphfontspecs(&spec, g, numspecs, x, y);
+  xdrawglyphfontspecs(&spec, g, numspecs, x, y, DRAW_BG | DRAW_FG);
 }
 
 void xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) {
@@ -1608,32 +1603,39 @@ int xstartdraw(void) {
 }
 
 void xdrawline(Line line, int x1, int y1, int x2) {
-  int i, x, ox, numspecs;
+  int i, x, ox, numspecs, numspecs_cached;
   Glyph base, new;
-  XftGlyphFontSpec *specs = xw.specbuf;
-
-  numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1);
-  i = ox = 0;
-  for (x = x1; x < x2 && i < numspecs; x++) {
-    new = line[x];
-    if (new.mode == ATTR_WDUMMY)
-      continue;
-    if (selected(x, y1))
-      new.mode ^= ATTR_REVERSE;
-    if (i > 0 && ATTRCMP(base, new)) {
-      xdrawglyphfontspecs(specs, base, i, ox, y1);
-      specs += i;
-      numspecs -= i;
-      i = 0;
-    }
-    if (i == 0) {
-      ox = x;
-      base = new;
+  XftGlyphFontSpec *specs;
+
+  numspecs_cached = xmakeglyphfontspecs(xw.specbuf, &line[x1], x2 - x1, x1, y1);
+
+  /* Draw line in 2 passes: background and foreground. This way wide glyphs
+        won't get truncated (#223) */
+  for (int dmode = DRAW_BG; dmode <= DRAW_FG; dmode <<= 1) {
+    specs = xw.specbuf;
+    numspecs = numspecs_cached;
+    i = ox = 0;
+    for (x = x1; x < x2 && i < numspecs; x++) {
+      new = line[x];
+      if (new.mode == ATTR_WDUMMY)
+        continue;
+      if (selected(x, y1))
+        new.mode ^= ATTR_REVERSE;
+      if (i > 0 && ATTRCMP(base, new)) {
+        xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
+        specs += i;
+        numspecs -= i;
+        i = 0;
+      }
+      if (i == 0) {
+        ox = x;
+        base = new;
+      }
+      i++;
     }
-    i++;
+    if (i > 0)
+      xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
   }
-  if (i > 0)
-    xdrawglyphfontspecs(specs, base, i, ox, y1);
 }
 
 void xfinishdraw(void) {