commit d78ff08d99780a73447d5a95bf1e358e8c23aa3c
Author:     Hiltjo Posthuma <[email protected]>
AuthorDate: Fri Aug 20 23:05:53 2021 +0200
Commit:     Hiltjo Posthuma <[email protected]>
CommitDate: Fri Aug 20 23:05:53 2021 +0200

    Revert "Improve speed of drw_text when provided with large strings"
    
    This reverts commit c585e8e498ec6f9c423ab8ea07cf853ee5b05fbe.
    
    It causes issues with truncation of characters when the text does not fit 
and
    so on.  The patch should be reworked and properly tested.

diff --git a/drw.c b/drw.c
index 9c39086..4cdbcbe 100644
--- a/drw.c
+++ b/drw.c
@@ -310,11 +310,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