drw_text: improve performance when there's no match

[dmenu.git] / drw.c

diff --git a/drw.c b/drw.c
index 7d985b1..a50c9ee 100644 (file)
--- a/drw.c
+++ b/drw.c
@@ -251,7 +251,7 @@ drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int
 int
 drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
 {
 int
 drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
 {

-       int ty, ellipsis_x = 0;
+       int i, ty, ellipsis_x = 0;

        unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len, ellipsis_width;
        XftDraw *d = NULL;
        Fnt *usedfont, *curfont, *nextfont;
        unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len, ellipsis_width;
        XftDraw *d = NULL;
        Fnt *usedfont, *curfont, *nextfont;


@@ -263,6 +263,9 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
        FcPattern *match;
        XftResult result;
        int charexists = 0, overflow = 0;
        FcPattern *match;
        XftResult result;
        int charexists = 0, overflow = 0;

+       /* keep track of a couple codepoints for which we have no match. */
+       enum { nomatches_len = 64 };
+       static struct { long codepoint[nomatches_len]; unsigned int idx; } nomatches;

 
        if (!drw || (render && !drw->scheme) || !text || !drw->fonts)
                return 0;
 
        if (!drw || (render && !drw->scheme) || !text || !drw->fonts)
                return 0;


@@ -346,6 +349,12 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
                         * character must be drawn. */
                        charexists = 1;
 
                         * character must be drawn. */
                        charexists = 1;
 

+                       for (i = 0; i < nomatches_len; ++i) {
+                               /* avoid calling XftFontMatch if we know we won't find a match */
+                               if (utf8codepoint == nomatches.codepoint[i])
+                                       goto no_match;
+                       }
+

                        fccharset = FcCharSetCreate();
                        FcCharSetAddChar(fccharset, utf8codepoint);
 
                        fccharset = FcCharSetCreate();
                        FcCharSetAddChar(fccharset, utf8codepoint);
 


@@ -374,6 +383,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
                                        curfont->next = usedfont;
                                } else {
                                        xfont_free(usedfont);
                                        curfont->next = usedfont;
                                } else {
                                        xfont_free(usedfont);

+                                       nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint;
+no_match:

                                        usedfont = drw->fonts;
                                }
                        }
                                        usedfont = drw->fonts;
                                }
                        }