[hackers] [dmenu] drw_text: account for fallback fonts in ellipsis_width || NRK

From: <git_AT_suckless.org>
Date: Sat, 16 Apr 2022 16:21:42 +0200 (CEST)

commit 33685b06e9332638769e677e77b257e24e069fd1
Author: NRK <nrk_AT_disroot.org>
AuthorDate: Mon Mar 28 21:38:49 2022 +0600
Commit: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
CommitDate: Sat Apr 16 16:21:01 2022 +0200

    drw_text: account for fallback fonts in ellipsis_width
    
    additionally, ellipsis_width (which shouldn't change) is made static to
    avoid re-calculating it on each drw_text() call.

diff --git a/drw.c b/drw.c
index 2f3a5df..ced7d37 100644
--- a/drw.c
+++ b/drw.c
_AT_@ -252,7 +252,7 @@ int
 drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
 {
         int i, ty, ellipsis_x = 0;
- unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len, ellipsis_width;
+ unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len;
         XftDraw *d = NULL;
         Fnt *usedfont, *curfont, *nextfont;
         int utf8strlen, utf8charlen, render = x || y || w || h;
_AT_@ -266,6 +266,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
         /* 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;
+ static unsigned int ellipsis_width = 0;
 
         if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
                 return 0;
_AT_@ -283,7 +284,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
         }
 
         usedfont = drw->fonts;
- drw_font_getexts(usedfont, "...", 3, &ellipsis_width, NULL);
+ if (!ellipsis_width && render)
+ ellipsis_width = drw_fontset_getwidth(drw, "...");
         while (1) {
                 ew = ellipsis_len = utf8strlen = 0;
                 utf8str = text;
Received on Sat Apr 16 2022 - 16:21:42 CEST