commit 86f1eafc2d02340e202c799a2b0db4fae9519f4e
Author:     Hiltjo Posthuma <[email protected]>
AuthorDate: Fri Aug 20 23:10:12 2021 +0200
Commit:     Hiltjo Posthuma <[email protected]>
CommitDate: Fri Aug 20 23:10:12 2021 +0200

    Revert "sync drw.c: improve speed of large fonts and free fontset"
    
    This reverts commit 1faf5f475161b2362b077be9f3ddde84a95514ce.

diff --git a/drw.c b/drw.c
index 9c39086..8fd1ca4 100644
--- a/drw.c
+++ b/drw.c
@@ -95,7 +95,6 @@ drw_free(Drw *drw)
 {
        XFreePixmap(drw->dpy, drw->drawable);
        XFreeGC(drw->dpy, drw->gc);
-       drw_fontset_free(drw->fonts);
        free(drw);
 }
 
@@ -310,11 +309,8 @@ 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 */
-                       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);
+                       for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew 
> w; len--)
+                               drw_font_getexts(usedfont, utf8str, len, &ew, 
NULL);
 
                        if (len) {
                                memcpy(buf, utf8str, len);

Reply via email to