felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-17 06:48:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix another instance of mis-counting display width.

Browse Source
This commit is contained in:
Dianne Skoll
2020-11-01 10:13:51 -05:00
parent b8d6472974
commit 3f0a4e5c39
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/calendar.c
View File

@@ -889,6 +889,7 @@ static void PrintCentered(char const *s, int width, char *pad)
for (i=d+len; i<width; i++) fputs(pad, stdout);
#else
size_t len = mbstowcs(NULL, s, 0);
int display_len;
int i;
wchar_t static_buf[128];
wchar_t *buf;
@@ -912,11 +913,21 @@ static void PrintCentered(char const *s, int width, char *pad)
}
}
(void) mbstowcs(buf, s, len+1);
d = (width - len) / 2;
display_len = wcswidth(buf, len+1);
d = (width - display_len) / 2;
if (d < 0) d = 0;
ws = buf;
for (i=0; i<d; i++) fputs(pad, stdout);
for (i=0; i<width; i++) {
if (*ws) PutWideChar(*ws++); else break;
if (*ws) {
PutWideChar(*ws++);
if (wcwidth(*ws) == 0) {
/* Don't count this character... it's zero-width */
i--;
}
} else {
break;
}
}
for (i=d+len; i<width; i++) fputs(pad, stdout);
if (buf != static_buf) free(buf);