Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-06 03:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

demo: free up menu on exit

Browse Source
This commit is contained in:
nick black 2020-08-16 07:25:23 -04:00
parent 4bc808404a
commit d57e1880e0
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/demo/demo.c
View File

@ -139,12 +139,12 @@ usage(const char* exe, int status){
exit(status); exit(status);
} }
static demoresult* static int
ext_demos(struct notcurses* nc, const char* spec, bool ignore_failures){ ext_demos(struct notcurses* nc, const char* spec, bool ignore_failures){
int ret = 0; int ret = 0;
results = malloc(sizeof(*results) * strlen(spec)); results = malloc(sizeof(*results) * strlen(spec));
if(results == NULL){ if(results == NULL){
return NULL; return -1;
} }
memset(results, 0, sizeof(*results) * strlen(spec)); memset(results, 0, sizeof(*results) * strlen(spec));
democount = strlen(spec); democount = strlen(spec);
@ -188,7 +188,7 @@ ext_demos(struct notcurses* nc, const char* spec, bool ignore_failures){
} }
notcurses_refresh(nc, NULL, NULL); notcurses_refresh(nc, NULL, NULL);
} }
return results; return 0;
} }
// returns the demos to be run as a string. on error, returns NULL. on no // returns the demos to be run as a string. on error, returns NULL. on no
@ -500,6 +500,7 @@ int main(int argc, char** argv){
nanosleep(&demodelay, NULL); nanosleep(&demodelay, NULL);
} }
} }
struct ncmenu* menu = NULL;
do{ do{
restart_demos = false; restart_demos = false;
interrupted = false; interrupted = false;
@ -513,14 +514,14 @@ int main(int argc, char** argv){
if(fpsgraph_init(nc)){ if(fpsgraph_init(nc)){
goto err; goto err;
} }
if(menu_create(nc) == NULL){ if((menu = menu_create(nc)) == NULL){
goto err; goto err;
} }
if(notcurses_render(nc)){ if(notcurses_render(nc)){
goto err; goto err;
} }
notcurses_reset_stats(nc, NULL); notcurses_reset_stats(nc, NULL);
if(ext_demos(nc, spec, ignore_failures) == NULL){ if(ext_demos(nc, spec, ignore_failures)){
goto err; goto err;
} }
if(hud_destroy()){ // destroy here since notcurses_drop_planes will kill it if(hud_destroy()){ // destroy here since notcurses_drop_planes will kill it
@ -531,6 +532,7 @@ int main(int argc, char** argv){
} }
about_destroy(nc); about_destroy(nc);
}while(restart_demos); }while(restart_demos);
ncmenu_destroy(menu);
if(stop_input()){ if(stop_input()){
goto err; goto err;
} }

1
src/demo/zoo.c
View File

@ -398,6 +398,7 @@ reader_demo(struct notcurses* nc, pthread_t* tid, pthread_mutex_t* lock){
const int READER_COLS = 64; const int READER_COLS = 64;
const int READER_ROWS = 8; const int READER_ROWS = 8;
ncreader_options nopts = { ncreader_options nopts = {
.tchannels = CHANNELS_RGB_INITIALIZER(0xa0, 0xe0, 0xe0, 0, 0, 0),
.echannels = CHANNELS_RGB_INITIALIZER(0x20, 0xe0, 0xe0, 0, 0, 0), .echannels = CHANNELS_RGB_INITIALIZER(0x20, 0xe0, 0xe0, 0, 0, 0),
.egc = " ", .egc = " ",
.physcols = READER_COLS, .physcols = READER_COLS,