dwm

commit 7abbb2ee805b41064c929c9052f1aff225283215
parent b51d258b0a546b46c04b44fc89a3bf6f5c7d761d
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Fri, 20 Aug 2021 23:09:48 +0200

Revert "Improve speed of drw_text when provided with large strings"

This reverts commit b51d258b0a546b46c04b44fc89a3bf6f5c7d761d.

It causes issues with truncation of characters when the text does not fit and
so on.  The patch should be reworked and properly tested.

Diffstat:
M
drw.c
 | 
7
++-----

1 file changed, 2 insertions(+), 5 deletions(-)
diff --git 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);