Improve speed of drw_text when provided with large strings

[dwm.git] / drw.c

diff --git a/drw.c b/drw.c
index 319eb6b..9c39086 100644 (file)
--- a/drw.c
+++ b/drw.c
@@ -95,6 +95,7 @@ drw_free(Drw *drw)
 {
        XFreePixmap(drw->dpy, drw->drawable);
        XFreeGC(drw->dpy, drw->gc);
+       drw_fontset_free(drw->fonts);
        free(drw);
 }
 
@@ -132,6 +133,19 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
                die("no font specified.");
        }
 
+       /* Do not allow using color fonts. This is a workaround for a BadLength
+        * error from Xft with color glyphs. Modelled on the Xterm workaround. See
+        * https://bugzilla.redhat.com/show_bug.cgi?id=1498269
+        * https://lists.suckless.org/dev/1701/30932.html
+        * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
+        * and lots more all over the internet.
+        */
+       FcBool iscol;
+       if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
+               XftFontClose(drw->dpy, xfont);
+               return NULL;
+       }
+
        font = ecalloc(1, sizeof(Fnt));
        font->xfont = xfont;
        font->pattern = pattern;
@@ -180,7 +194,7 @@ drw_fontset_free(Fnt *font)
 }
 
 void
-drw_clr_create(Drw *drw, XftColor *dest, const char *clrname)
+drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
 {
        if (!drw || !dest || !clrname)
                return;
@@ -193,11 +207,11 @@ drw_clr_create(Drw *drw, XftColor *dest, const char *clrname)
 
 /* Wrapper to create color schemes. The caller has to call free(3) on the
  * returned color scheme when done using it. */
-Scm
+Clr *
 drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
 {
        size_t i;
-       Scm ret;
+       Clr *ret;
 
        /* need at least two colors for a scheme */
        if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
@@ -216,7 +230,7 @@ drw_setfontset(Drw *drw, Fnt *set)
 }
 
 void
-drw_setscheme(Drw *drw, Scm scm)
+drw_setscheme(Drw *drw, Clr *scm)
 {
        if (drw)
                drw->scheme = scm;
@@ -296,8 +310,11 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
                if (utf8strlen) {
                        drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL);
                        /* shorten text if necessary */
-                       for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--)
-                               drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
+                       if (ew > w)
+                               for (ew = 0, len = 0; ew < w - lpad * 2 && len < MIN(utf8strlen, sizeof(buf) - 1); len++)
+                                       drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
+                       else
+                               len = MIN(utf8strlen, sizeof(buf) - 1);
 
                        if (len) {
                                memcpy(buf, utf8str, len);
@@ -337,6 +354,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
                        fcpattern = FcPatternDuplicate(drw->fonts->pattern);
                        FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
                        FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
+                       FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
 
                        FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
                        FcDefaultSubstitute(fcpattern);