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

move setupterm() following query launch #2023

Browse Source
This commit is contained in:
nick black 2021-08-07 23:08:00 -04:00
parent 7966c56e47
commit 913330c187
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib/termdesc.c
View File

@ -644,8 +644,7 @@ build_supported_styles(tinfo* ti){
// or reset this environment variable, they're cursed to live as Terminal.App. // or reset this environment variable, they're cursed to live as Terminal.App.
// i'm likewise unsure what we're supposed to do should you ssh anywhere =[. // i'm likewise unsure what we're supposed to do should you ssh anywhere =[.
static queried_terminals_e static queried_terminals_e
macos_early_matches(const char* termname){ macos_early_matches(void){
(void)termname;
const char* tp = getenv("TERM_PROGRAM"); const char* tp = getenv("TERM_PROGRAM");
if(tp == NULL){ if(tp == NULL){
return TERMINAL_UNKNOWN; return TERMINAL_UNKNOWN;
@ -673,20 +672,11 @@ int interrogate_terminfo(tinfo* ti, const char* termtype, FILE* out, unsigned ut
memset(ti, 0, sizeof(*ti)); memset(ti, 0, sizeof(*ti));
// we don't need a controlling tty for everything we do; allow a failure here // we don't need a controlling tty for everything we do; allow a failure here
ti->ttyfd = get_tty_fd(out); ti->ttyfd = get_tty_fd(out);
#ifndef __MINGW64__
// windows doesn't really have a concept of terminfo. you might ssh into other
// machines, but they'll use the terminfo installed thereon (putty, etc.).
int termerr;
if(setupterm(termtype, ti->ttyfd, &termerr)){
logpanic("Terminfo error %d (see terminfo(3ncurses))\n", termerr);
return -1;
}
const char* tname = termname(); // longname() is also available
#endif
size_t tablelen = 0; size_t tablelen = 0;
size_t tableused = 0; size_t tableused = 0;
const char* tname = NULL;
#ifdef __APPLE__ #ifdef __APPLE__
qterm = macos_early_matches(tname); qterm = macos_early_matches();
(void)nonewfonts; (void)nonewfonts;
#elif defined(__MINGW64__) #elif defined(__MINGW64__)
if(prepare_windows_terminal(ti, &tablelen, &tableused)){ if(prepare_windows_terminal(ti, &tablelen, &tableused)){
@ -694,6 +684,7 @@ int interrogate_terminfo(tinfo* ti, const char* termtype, FILE* out, unsigned ut
} }
qterm = TERMINAL_MSTERMINAL; qterm = TERMINAL_MSTERMINAL;
(void)nonewfonts; (void)nonewfonts;
(void)termtype;
#elif defined(__linux__) #elif defined(__linux__)
ti->linux_fb_fd = -1; ti->linux_fb_fd = -1;
ti->linux_fbuffer = MAP_FAILED; ti->linux_fbuffer = MAP_FAILED;
@ -707,8 +698,8 @@ int interrogate_terminfo(tinfo* ti, const char* termtype, FILE* out, unsigned ut
#else #else
(void)nonewfonts; (void)nonewfonts;
#endif #endif
if(ti->ttyfd >= 0){
#ifndef __MINGW64__ #ifndef __MINGW64__
if(ti->ttyfd >= 0){
if(tcgetattr(ti->ttyfd, &ti->tpreserved)){ if(tcgetattr(ti->ttyfd, &ti->tpreserved)){
fprintf(stderr, "Couldn't preserve terminal state for %d (%s)\n", ti->ttyfd, strerror(errno)); fprintf(stderr, "Couldn't preserve terminal state for %d (%s)\n", ti->ttyfd, strerror(errno));
del_curterm(cur_term); del_curterm(cur_term);
@ -728,8 +719,16 @@ int interrogate_terminfo(tinfo* ti, const char* termtype, FILE* out, unsigned ut
del_curterm(cur_term); del_curterm(cur_term);
return -1; return -1;
} }
#endif
} }
// windows doesn't really have a concept of terminfo. you might ssh into other
// machines, but they'll use the terminfo installed thereon (putty, etc.).
int termerr;
if(setupterm(termtype, ti->ttyfd, &termerr)){
logpanic("Terminfo error %d (see terminfo(3ncurses))\n", termerr);
return -1;
}
tname = termname(); // longname() is also available
#endif
ti->sprixel_scale_height = 1; ti->sprixel_scale_height = 1;
get_default_geometry(ti); get_default_geometry(ti);
ti->caps.utf8 = utf8; ti->caps.utf8 = utf8;