diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-02 12:08:34 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-02 12:08:34 +0000 |
| commit | c01251d02388efceca515c47c257e2b5342e3716 (patch) | |
| tree | ca89407cb43bd2caa40a6854ba49ce1720e892ce /utf8.c | |
| parent | 5c275c2a1a963876d4ac392067e42120417dbf43 (diff) | |
| parent | 1466b570eedda0423d5a386d2b16b7ff0c0e477c (diff) | |
| download | rtmux-c01251d02388efceca515c47c257e2b5342e3716.tar.gz rtmux-c01251d02388efceca515c47c257e2b5342e3716.tar.bz2 rtmux-c01251d02388efceca515c47c257e2b5342e3716.zip | |
Merge branch 'master' into 3.2-rc
Diffstat (limited to 'utf8.c')
| -rw-r--r-- | utf8.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -216,7 +216,11 @@ utf8_width(struct utf8_data *ud, int *width) { wchar_t wc; +#ifdef HAVE_UTF8PROC + switch (utf8proc_mbtowc(&wc, ud->data, ud->size)) { +#else switch (mbtowc(&wc, ud->data, ud->size)) { +#endif case -1: log_debug("UTF-8 %.*s, mbtowc() %d", (int)ud->size, ud->data, errno); @@ -225,7 +229,11 @@ utf8_width(struct utf8_data *ud, int *width) case 0: return (UTF8_ERROR); } +#ifdef HAVE_UTF8PROC + *width = utf8proc_wcwidth(wc); +#else *width = wcwidth(wc); +#endif if (*width >= 0 && *width <= 0xff) return (UTF8_DONE); log_debug("UTF-8 %.*s, wcwidth() %d", (int)ud->size, ud->data, *width); |