diff options
Diffstat (limited to 'drw.c')
-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); |