diff options
author | Miles Alan <m@milesalan.com> | 2021-08-07 21:34:35 -0400 |
---|---|---|
committer | Hiltjo Posthuma <hiltjo@codemadness.org> | 2021-08-09 18:20:51 +0200 |
commit | c585e8e498ec6f9c423ab8ea07cf853ee5b05fbe (patch) | |
tree | f5e85f3b182436b7a5c059c72791506911ee6c0a | |
parent | 523aa08f51a88c59ad4b1f600f8ce3d122e9e289 (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 | |||
310 | if (utf8strlen) { | 310 | if (utf8strlen) { |
311 | drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL); | 311 | drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL); |
312 | /* shorten text if necessary */ | 312 | /* shorten text if necessary */ |
313 | for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--) | 313 | if (ew > w) |
314 | drw_font_getexts(usedfont, utf8str, len, &ew, NULL); | 314 | for (ew = 0, len = 0; ew < w - lpad * 2 && len < MIN(utf8strlen, sizeof(buf) - 1); len++) |
315 | drw_font_getexts(usedfont, utf8str, len, &ew, NULL); | ||
316 | else | ||
317 | len = MIN(utf8strlen, sizeof(buf) - 1); | ||
315 | 318 | ||
316 | if (len) { | 319 | if (len) { |
317 | memcpy(buf, utf8str, len); | 320 | memcpy(buf, utf8str, len); |