demo: only print 'unknown demo' msg when appropriate

pull/124/head
nick black 5 years ago
parent 222889c7c6
commit 98b323e9a0
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC

@ -223,9 +223,12 @@ ext_demos(struct notcurses* nc, const char* demos){
case 'v': ret = view_demo(nc); break;
case 'w': ret = widecolor_demo(nc); break;
case 'p': ret = panelreel_demo(nc); break;
default:
fprintf(stderr, "Unknown demo specification: %c\n", *demos);
ret = -1;
break;
}
if(ret){
fprintf(stderr, "Unknown demo specification: %c\n", *demos);
return ret;
}
++demos;

@ -131,11 +131,11 @@ int unicodeblocks_demo(struct notcurses* nc){
cell c = CELL_TRIVIAL_INITIALIZER;
// 16 to a line
for(z = 0 ; z < CHUNKSIZE ; ++z){
mbstate_t ps;
memset(&ps, 0, sizeof(ps));
wchar_t w[2] = { blockstart + chunk * CHUNKSIZE + z, L'\u200e' };
char utf8arr[MB_CUR_MAX * 2 + 1];
if(wcswidth(w, 2) >= 1 && iswprint(w[0])){
mbstate_t ps;
memset(&ps, 0, sizeof(ps));
const wchar_t *wptr = w;
int bwc = wcsrtombs(utf8arr, &wptr, sizeof(utf8arr), &ps);
if(bwc < 0){

Loading…
Cancel
Save