pinentry-dmenu

Commit: 8e0ff2e390159d7cb6fb093f4eed88a949a7b6aa
Parent: 8954cabf6ec1e99efb582dba7724700e252a99cb
Author: Hiltjo Posthuma
Date:   Fri, 20 Aug 2021 23:05:53 +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.

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);