From 68240c3d132dda186c100eed157149b4776dc81d Mon Sep 17 00:00:00 2001 From: nick black Date: Fri, 19 Nov 2021 14:49:09 -0500 Subject: [PATCH] use ncplane_putwc_utf32 for all unicode 13 in notcurses-info #2358 --- src/info/main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/info/main.c b/src/info/main.c index 21c4681d8..91ce6186f 100644 --- a/src/info/main.c +++ b/src/info/main.c @@ -46,8 +46,9 @@ tinfo_debug_style(struct ncplane* n, const char* name, int style, char ch){ static void wviz(struct ncplane* n, const wchar_t* wp){ - for(const wchar_t* w = wp ; *w ; ++w){ - if(ncplane_putwc(n, *w) <= 0){ + unsigned wchars; + for(const wchar_t* w = wp ; *w ; w += wchars){ + if(ncplane_putwc_utf32(n, w, &wchars) <= 0){ ncplane_putchar(n, ' '); } } @@ -160,13 +161,13 @@ static int legacy_viz(struct ncplane* n, const char* indent, const wchar_t* eighths, const wchar_t* anglesr, const wchar_t* anglesl){ ncplane_printf(n, "%s ", indent); - for(const wchar_t* e = eighths ; *e ; ++e){ - if(ncplane_putwc(n, *e) <= 0){ + unsigned wchars; + for(const wchar_t* e = eighths ; *e ; e += wchars){ + if(ncplane_putwc_utf32(n, e, &wchars) <= 0){ ncplane_putchar(n, ' '); } } ncplane_putchar(n, ' '); - unsigned wchars; const wchar_t* r = anglesr; const wchar_t* l = anglesl; while(*r){