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

zoo: fade out the widgets #835

Browse Source
This commit is contained in:
nick black 2020-08-18 06:26:05 -04:00
parent 73abc61f16
commit 0f79ac5702
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/demo/demo.c
View File

@ -102,6 +102,7 @@ static struct {
{ "zoo", zoo_demo, false, },
};
// FIXME stylize this a little
static void
usage(const char* exe, int status){
FILE* out = status == EXIT_SUCCESS ? stdout : stderr;

23
src/demo/zoo.c
View File

@ -368,8 +368,6 @@ reader_thread(void* vmarsh){
pthread_mutex_unlock(lock);
if(collect_input){
ret = riser_collect_input(nc, &demodelay);
}else{
ret = clock_nanosleep(CLOCK_MONOTONIC, 0, &demodelay, NULL);
}
if(ret < 0){
return THREAD_RETURN_NEGATIVE;
@ -417,13 +415,12 @@ reader_demo(struct notcurses* nc, pthread_t* tid, pthread_mutex_t* lock){
}
static int
zap_reader(pthread_t tid, struct ncreader* reader, unsigned cancel){
zap_reader(pthread_t tid, unsigned cancel){
if(cancel){
pthread_cancel(tid);
}
void* res;
int ret = pthread_join(tid, &res);
ncreader_destroy(reader, NULL);
if(res == THREAD_RETURN_NEGATIVE){
return -1;
}else if(res == THREAD_RETURN_POSITIVE){
@ -460,15 +457,29 @@ int zoo_demo(struct notcurses* nc){
if(mselector == NULL || ret){
goto err;
}
ret |= zap_reader(readertid, reader, false); // let the thread do its thang
ret |= zap_reader(readertid, false); // let the thread do its thang
ret |= pthread_mutex_destroy(&lock);
if(notcurses_canfade(nc)){
if(ncplane_fadeout(ncselector_plane(selector), &demodelay, demo_fader, NULL)){
goto err;
}
if(ncplane_fadeout(ncmultiselector_plane(mselector), &demodelay, demo_fader, NULL)){
goto err;
}
}else{
if( (ret = demo_nanosleep(nc, &demodelay)) ){
goto err;
}
}
ncreader_destroy(reader, NULL);
ncselector_destroy(selector, NULL);
ncmultiselector_destroy(mselector);
return ret;
err:
zap_reader(readertid, reader, true);
zap_reader(readertid, true);
pthread_mutex_destroy(&lock);
ncreader_destroy(reader, NULL);
ncselector_destroy(selector, NULL);
ncmultiselector_destroy(mselector);
return ret ? ret : -1;