blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 09:09:03 -04:00
Code Issues Projects Releases Wiki Activity

ncdirect: always preserve termios status #1325

Browse Source
This commit is contained in:
nick black 2021-02-02 23:42:54 -05:00
parent 94172303be
commit 5afa3f14a9
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/direct.cpp
View File

@ -613,9 +613,7 @@ ncdirect_stop_minimal(void* vnc){
if(nc->tcache.cnorm && tty_emit("cnorm", nc->tcache.cnorm, nc->ctermfd)){
ret = -1;
}
if(!(nc->flags & NCDIRECT_OPTION_INHIBIT_CBREAK)){
ret |= tcsetattr(nc->ctermfd, TCSANOW, &nc->tpreserved);
}
ret |= tcsetattr(nc->ctermfd, TCSANOW, &nc->tpreserved);
ret |= close(nc->ctermfd);
}
return ret;
@ -649,11 +647,11 @@ ncdirect* ncdirect_core_init(const char* termtype, FILE* outfp, uint64_t flags){
}
// we don't need a controlling tty for everything we do; allow a failure here
if((ret->ctermfd = get_controlling_tty(ret->ttyfp)) >= 0){
if(tcgetattr(ret->ctermfd, &ret->tpreserved)){
fprintf(stderr, "Couldn't preserve terminal state for %d (%s)\n", ret->ctermfd, strerror(errno));
goto err;
}
if(!(flags & NCDIRECT_OPTION_INHIBIT_CBREAK)){
if(tcgetattr(ret->ctermfd, &ret->tpreserved)){
fprintf(stderr, "Couldn't preserve terminal state for %d (%s)\n", ret->ctermfd, strerror(errno));
goto err;
}
if(cbreak_mode(ret->ctermfd, &ret->tpreserved)){
goto err;
}
@ -678,7 +676,7 @@ ncdirect* ncdirect_core_init(const char* termtype, FILE* outfp, uint64_t flags){
ret->channels = 0;
ncdirect_set_styles(ret, 0);
if(!(flags & NCDIRECT_OPTION_NO_READLINE)){
rl_outstream = outfp;
rl_outstream = stderr;
rl_instream = stdin;
rl_prep_terminal(1); // 1 == read 8-bit input
}
@ -686,9 +684,7 @@ ncdirect* ncdirect_core_init(const char* termtype, FILE* outfp, uint64_t flags){
err:
if(ret->ctermfd >= 0){
if(!(flags & NCDIRECT_OPTION_INHIBIT_CBREAK)){
tcsetattr(ret->ctermfd, TCSANOW, &ret->tpreserved);
}
tcsetattr(ret->ctermfd, TCSANOW, &ret->tpreserved);
}
drop_signals(ret);
delete(ret);