[hackers] [dwm] Revert "Improve speed of drw_text when provided with large strings" || Hiltjo Posthuma

From: <git_AT_suckless.org>
Date: Fri, 20 Aug 2021 23:10:53 +0200 (CEST)

commit a786211d6cb794fba0ea406d86002c7618998afc
Author: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
AuthorDate: Fri Aug 20 23:09:48 2021 +0200
Commit: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
CommitDate: Fri Aug 20 23:09:48 2021 +0200

    Revert "Improve speed of drw_text when provided with large strings"
    
    This reverts commit 716233534b35f74dba5a46ade8f1a6f8cc72fea4.
    
    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
_AT_@ -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);
Received on Fri Aug 20 2021 - 23:10:53 CEST