gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-03-19 17:23:33 +01:00
Code Issues Projects Releases Wiki Activity

Prevent wrong UTF-8 window title truncation

Browse Source 
The patch is fixing a UTF-8 truncation issue that could happen with the window title
when it was shrinked to be displayed in the window list (F11), leading to
an infinite loop.

Issue was reported at https://github.com/window-maker/wmaker/issues/61
This commit is contained in:
David Maciejak
2026-01-14 22:03:56 -05:00
committed by Carlos R. Mafra
parent ac19c4bc07
commit 72942267aa
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/misc.c
View File

@@ -311,7 +311,8 @@ char *ShrinkString(WMFont *font, const char *string, int width)
p1 = 0;
p2 = p;
t = (p2 - p1) / 2;
while (p2 > p1 && p1 != t) {
while (p2 > p1) {
int old_t = t;
/* ensure we cut at UTF-8 character boundary */
utf8_safe_pos = utf8_find_char_start(string, p - t);
t = p - utf8_safe_pos;
@@ -319,12 +320,20 @@ char *ShrinkString(WMFont *font, const char *string, int width)
w = WMWidthOfString(font, &string[utf8_safe_pos], t);
if (w > width) {
p2 = t;
t = p1 + (p2 - p1) / 2;
} else if (w < width) {
p1 = t;
t = p1 + (p2 - p1) / 2;
} else
p2 = p1 = t;
} else {
p1 = t;
break;
}
/* Calculate new t for next iteration */
t = p1 + (p2 - p1) / 2;
/* Prevent infinite loop if we're not making progress */
if (t == old_t || (p2 - p1) <= 1) {
break;
}
}
/* ensure final cut is at UTF-8 character boundary */