diff options
author | Miles Alan | 2021-08-09 18:24:14 +0200 |
---|---|---|
committer | Hiltjo Posthuma | 2021-08-09 18:25:19 +0200 |
commit | 716233534b35f74dba5a46ade8f1a6f8cc72fea4 (patch) | |
tree | 4686918cd9beeb6920b1e93462d312cacd81f5aa | |
parent | 138b405f0c8aa24d8a040cc1a1cf6e3eb5a0ebc7 (diff) |
Improve speed of drw_text when provided with large strings
Calculates len & ew in drw_font_getexts loop by incrementing instead of
decrementing; as such avoids proportional increase in time spent in loop
based on provided strings size.
-rw-r--r-- | drw.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -310,8 +310,11 @@ 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 */ - for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--) - drw_font_getexts(usedfont, utf8str, len, &ew, NULL); + 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); if (len) { memcpy(buf, utf8str, len); |