fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make display_item() UTF-8 compatible

Browse Source 
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2011-06-06 22:45:28 +02:00
parent 39d2671495
commit c8a745fe23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/day.c
View File

@ -347,14 +347,15 @@ display_item_date (int incolor, struct apoint *i, int type, long date,
* Print an item description in the corresponding panel window. * Print an item description in the corresponding panel window.
*/ */
static void static void
display_item (int incolor, char *msg, int recur, int note, int len, int y, display_item (int incolor, char *msg, int recur, int note, int width, int y,
int x) int x)
{ {
WINDOW *win; WINDOW *win;
int ch_recur, ch_note; int ch_recur, ch_note;
char buf[len]; char buf[width * 6];
int i;
if (len <= 0) if (width <= 0)
return; return;
win = apad.ptrwin; win = apad.ptrwin;
@ -362,12 +363,20 @@ display_item (int incolor, char *msg, int recur, int note, int len, int y,
ch_note = (note) ? '>' : ' '; ch_note = (note) ? '>' : ' ';
if (incolor == 0) if (incolor == 0)
custom_apply_attr (win, ATTR_HIGHEST); custom_apply_attr (win, ATTR_HIGHEST);
if (strlen (msg) < len) if (utf8_strwidth (msg) < width)
mvwprintw (win, y, x, " %c%c%s", ch_recur, ch_note, msg); mvwprintw (win, y, x, " %c%c%s", ch_recur, ch_note, msg);
else else
{ {
(void)strncpy (buf, msg, len - 1); for (i = 0; msg[i] && width > 0; i++)
buf[len - 1] = '\0'; {
if (!UTF8_ISCONT (msg[i]))
width -= utf8_width (&msg[i]);
buf[i] = msg[i];
}
if (i)
buf[i - 1] = 0;
else
buf[0] = 0;
mvwprintw (win, y, x, " %c%c%s...", ch_recur, ch_note, buf); mvwprintw (win, y, x, " %c%c%s...", ch_recur, ch_note, buf);
} }
if (incolor == 0) if (incolor == 0)