sam
/
dmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Improve speed of drw_text when provided with large strings" 

This reverts commit c585e8e498.

It causes issues with truncation of characters when the text does not fit and
so on.  The patch should be reworked and properly tested.
This commit is contained in:
Hiltjo Posthuma 2021-08-20 23:05:53 +02:00
parent cd2133a5f6
commit d78ff08d99
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drw.c
View File

@ -310,11 +310,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
if (utf8strlen) { if (utf8strlen) {
drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL); drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL);
/* shorten text if necessary */ /* shorten text if necessary */
if (ew > w) for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--)
for (ew = 0, len = 0; ew < w - lpad * 2 && len < MIN(utf8strlen, sizeof(buf) - 1); len++)
drw_font_getexts(usedfont, utf8str, len, &ew, NULL); drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
else
len = MIN(utf8strlen, sizeof(buf) - 1);
if (len) { if (len) {
memcpy(buf, utf8str, len); memcpy(buf, utf8str, len);