summaryrefslogtreecommitdiff
path: root/drw.c
diff options
context:
space:
mode:
authorHiltjo Posthuma <hiltjo@codemadness.org>2021-08-20 23:05:53 +0200
committerHiltjo Posthuma <hiltjo@codemadness.org>2021-08-20 23:05:53 +0200
commitd78ff08d99780a73447d5a95bf1e358e8c23aa3c (patch)
tree6a2dd2b801362af53e1af85cf2f8e8e23442b76e /drw.c
parentcd2133a5f66b42f992a9a1b92bbbce11dc26b941 (diff)
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 (limited to 'drw.c')
-rw-r--r--drw.c7
1 files changed, 2 insertions, 5 deletions
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);