From aa722b78e65949eb1fbfbd5e68e626afcf465496 Mon Sep 17 00:00:00 2001 From: nick black Date: Wed, 4 Aug 2021 16:34:16 -0400 Subject: [PATCH] convert some wchar_t to uint32_t in whiteout/reel --- src/demo/reel.c | 8 ++++---- src/demo/whiteout.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/demo/reel.c b/src/demo/reel.c index 98d478a75..c496cdd7c 100644 --- a/src/demo/reel.c +++ b/src/demo/reel.c @@ -172,7 +172,7 @@ new_tabletctx(struct ncreel* pr, unsigned *id){ return tctx; } -static wchar_t +static uint32_t handle_input(struct notcurses* nc, const struct timespec* deadline, ncinput* ni){ int64_t deadlinens = timespec_to_ns(deadline); @@ -183,7 +183,7 @@ handle_input(struct notcurses* nc, const struct timespec* deadline, return 0; } ns_to_timespec(deadlinens - curns, &pollspec); - wchar_t r = demo_getc(nc, &pollspec, ni); + uint32_t r = demo_getc(nc, &pollspec, ni); return r; } @@ -265,7 +265,7 @@ ncreel_demo_core(struct notcurses* nc){ ncplane_off_styles(std, NCSTYLE_BOLD); // FIXME wclrtoeol(w); ncplane_set_fg_rgb8(std, 0, 55, 218); - wchar_t rw; + uint32_t rw; ncinput ni; pthread_mutex_lock(&renderlock); ncreel_redraw(nr); @@ -279,7 +279,7 @@ ncreel_demo_core(struct notcurses* nc){ ncreel_destroy(nr); return renderret; } - if((rw = handle_input(nc, &deadline, &ni)) == (wchar_t)-1){ + if((rw = handle_input(nc, &deadline, &ni)) == (uint32_t)-1){ break; } // FIXME clrtoeol(); diff --git a/src/demo/whiteout.c b/src/demo/whiteout.c index 5982aabba..bf2577bca 100644 --- a/src/demo/whiteout.c +++ b/src/demo/whiteout.c @@ -459,7 +459,7 @@ int witherworm_demo(struct notcurses* nc){ ncplane_set_scrolling(n, true); ncplane_erase(n); for(i = 0 ; i < screens ; ++i){ - wchar_t key = NCKEY_INVALID; + uint32_t key = NCKEY_INVALID; nccell c; struct timespec screenend; clock_gettime(CLOCK_MONOTONIC, &screenend);