Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-02 09:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

ncdirect: prefer provided fp, iff it's a tty #752

Browse Source
This commit is contained in:
nick black 2020-07-03 16:41:10 -04:00
parent e5c9168523
commit b698efb953
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/direct.cpp
View File

@ -393,7 +393,13 @@ int ncdirect_printf_aligned(ncdirect* n, int y, ncalign_e align, const char* fmt
return ret;
}
int get_controlling_tty(void){
int get_controlling_tty(FILE* ttyfp){
int fd = fileno(ttyfp);
if(fd > 0 && isatty(fd)){
if((fd = dup(fd)) >= 0){
return fd;
}
}
char cbuf[L_ctermid + 1];
if(ctermid(cbuf) == NULL){
return -1;
@ -412,7 +418,7 @@ ncdirect* ncdirect_init(const char* termtype, FILE* outfp){
ret->ttyfp = outfp;
memset(&ret->palette, 0, sizeof(ret->palette));
// we don't need a controlling tty for everything we do; allow a failure here
ret->ctermfd = get_controlling_tty();
ret->ctermfd = get_controlling_tty(ret->ttyfp);
int termerr;
if(setupterm(termtype, ret->ctermfd, &termerr) != OK){
fprintf(stderr, "Terminfo error %d (see terminfo(3ncurses))\n", termerr);