Compare commits

...

5 Commits

@ -4,7 +4,8 @@
* Review the testing checklist (doc/testing-checklist.md) * Review the testing checklist (doc/testing-checklist.md)
* clang-tidy check with something like: * clang-tidy check with something like:
* `cmake "-DCMAKE_CXX_CLANG_TIDY=/usr/bin/clang-tidy-11;-checks=-*,clang-analyzer-*,modernize-*,performance-*" ..` * `cmake "-DCMAKE_CXX_CLANG_TIDY=/usr/bin/clang-tidy-15\;-checks=-*,clang-analyzer-*,modernize-*,performance-*" ..`
or
* `scan-build cmake .. && scan-build make` * `scan-build cmake .. && scan-build make`
* Verify that rust + python compile * Verify that rust + python compile

@ -33,7 +33,11 @@ drop_bricks(struct notcurses* nc, struct ncplane** arr, int arrcount){
} }
} }
do{ do{
DEMO_RENDER(nc); int e = demo_render(nc);
if(e){
free(speeds);
return e;
}
// don't allow gaps in the active range. so long as felloff is true, we've only handled // don't allow gaps in the active range. so long as felloff is true, we've only handled
// planes which have fallen off the screen, and can be collected. // planes which have fallen off the screen, and can be collected.
bool felloff = true; bool felloff = true;

@ -1090,9 +1090,8 @@ int ncplane_destroy_family(ncplane *ncp){
// called setlocale() themselves, and set the NCOPTION_INHIBIT_SETLOCALE flag. // called setlocale() themselves, and set the NCOPTION_INHIBIT_SETLOCALE flag.
// if that flag is set, we take the locale and encoding as we get them. // if that flag is set, we take the locale and encoding as we get them.
void init_lang(void){ void init_lang(void){
char* setret;
#ifdef __MINGW32__ #ifdef __MINGW32__
if((setret = setlocale(LC_ALL, ".UTF8")) == NULL){ if(setlocale(LC_ALL, ".UTF8") == NULL){
logwarn("couldn't set LC_ALL to utf8"); logwarn("couldn't set LC_ALL to utf8");
} }
#endif #endif
@ -1107,7 +1106,7 @@ void init_lang(void){
return; return;
} }
#ifndef __MINGW32__ #ifndef __MINGW32__
if((setret = setlocale(LC_ALL, "")) == NULL){ if(setlocale(LC_ALL, "") == NULL){
logwarn("setting locale based on LANG failed"); logwarn("setting locale based on LANG failed");
} }
#endif #endif

@ -286,7 +286,6 @@ putpara(struct ncplane* p, const char* text){
curend = macend; curend = macend;
break; break;
}else{ }else{
inescape = false;
cur = curend++; cur = curend++;
break; break;
} }
@ -670,7 +669,7 @@ int main(int argc, char** argv){
if(nc == NULL){ if(nc == NULL){
return EXIT_FAILURE; return EXIT_FAILURE;
} }
bool success; bool success = false;
for(int i = 0 ; i < argc - nonopt ; ++i){ for(int i = 0 ; i < argc - nonopt ; ++i){
success = false; success = false;
if(tfman(nc, argv[nonopt + i], noui)){ if(tfman(nc, argv[nonopt + i], noui)){

Loading…
Cancel
Save