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

Fix column misalignment with UTF-8 text.

Browse Source
This commit is contained in:
Dianne Skoll
2020-11-01 10:03:32 -05:00
parent 4f6dcde980
commit 6358297724
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/calendar.c
View File

@@ -9,6 +9,7 @@
/* */ /* */
/***************************************************************/ /***************************************************************/
#define _XOPEN_SOURCE
#include "config.h" #include "config.h"
#include <stdio.h> #include <stdio.h>
@@ -21,6 +22,7 @@
#ifdef REM_USE_WCHAR #ifdef REM_USE_WCHAR
#include <wctype.h> #include <wctype.h>
#include <wchar.h>
#endif #endif
#include "types.h" #include "types.h"
@@ -356,6 +358,7 @@ static int make_wchar_versions(CalEntry *e)
if (!buf) return 0; if (!buf) return 0;
(void) mbstowcs(buf, e->text, len+1); (void) mbstowcs(buf, e->text, len+1);
buf[len] = 0;
e->wc_text = buf; e->wc_text = buf;
e->wc_pos = buf; e->wc_pos = buf;
return 1; return 1;
@@ -1006,7 +1009,9 @@ static int WriteOneColLine(int col)
if (!wspace) { if (!wspace) {
for (ws = e->wc_pos; ws - e->wc_pos < ColSpaces; ws++) { for (ws = e->wc_pos; ws - e->wc_pos < ColSpaces; ws++) {
if (!*ws) break; if (!*ws) break;
numwritten++; if (wcwidth(*ws) > 0) {
numwritten += wcwidth(*ws);
}
PutWideChar(*ws); PutWideChar(*ws);
} }
e->wc_pos = ws; e->wc_pos = ws;
@@ -1014,7 +1019,9 @@ static int WriteOneColLine(int col)
/* We found a space - print everything before it. */ /* We found a space - print everything before it. */
for (ws = e->wc_pos; ws<wspace; ws++) { for (ws = e->wc_pos; ws<wspace; ws++) {
if (!*ws) break; if (!*ws) break;
numwritten++; if (wcwidth(*ws) > 0) {
numwritten += wcwidth(*ws);
}
PutWideChar(*ws); PutWideChar(*ws);
} }
} }
@@ -1605,6 +1612,7 @@ static int DoCalRem(ParsePtr p, int col)
if(!e->filename) { if(!e->filename) {
if (e->text) free(e->text); if (e->text) free(e->text);
if (e->raw_text) free(e->raw_text); if (e->raw_text) free(e->raw_text);
if (e->wc_text) free(e->wc_text);
free(e); free(e);
return E_NO_MEM; return E_NO_MEM;
} }