Skip to content

Commit

Permalink
Revert "Improve speed of drw_text when provided with large strings"
Browse files Browse the repository at this point in the history
This reverts commit 7162335.

It causes issues with truncation of characters when the text does not fit and
so on.  The patch should be reworked and properly tested.
  • Loading branch information
hiltjo committed Aug 20, 2021
1 parent 7162335 commit a786211
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit a786211

Please sign in to comment.