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

reset term attributes prior to, not following, rmcup #824

Browse Source
This commit is contained in:
nick black 2020-07-25 21:55:43 -04:00
parent 17e8f62eb9
commit bf9c3dc8c7
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/notcurses.c
View File

@ -44,6 +44,23 @@ drop_signals(notcurses* nc){
return 0;
}
// reset the current colors, styles, and palette. called on startup (to purge
// any preexisting styling) and shutdown (to not affect further programs).
static int
reset_term_attributes(notcurses* nc){
int ret = 0;
if(nc->tcache.op && term_emit("op", nc->tcache.op, nc->ttyfp, false)){
ret = -1;
}
if(nc->tcache.sgr0 && term_emit("sgr0", nc->tcache.sgr0, nc->ttyfp, false)){
ret = -1;
}
if(nc->tcache.oc && term_emit("oc", nc->tcache.oc, nc->ttyfp, false)){
ret = -1;
}
return ret;
}
// Do the minimum necessary stuff to restore the terminal, then return. This is
// the end of the line for fatal signal handlers. notcurses_stop() will go on
// to tear down and account for internal structures.
@ -51,6 +68,9 @@ static int
notcurses_stop_minimal(notcurses* nc){
int ret = 0;
drop_signals(nc);
// be sure to write the restoration sequences *prior* to running rmcup, as
// they apply to the screen (alternate or otherwise) we're actually using.
ret |= reset_term_attributes(nc);
if(nc->ttyfd >= 0){
if(nc->tcache.rmcup && tty_emit("rmcup", nc->tcache.rmcup, nc->ttyfd)){
ret = -1;
@ -59,16 +79,6 @@ notcurses_stop_minimal(notcurses* nc){
ret = -1;
}
}
if(nc->tcache.op && term_emit("op", nc->tcache.op, nc->ttyfp, true)){
ret = -1;
}
if(nc->tcache.sgr0 && term_emit("sgr0", nc->tcache.sgr0, nc->ttyfp, true)){
ret = -1;
}
if(nc->tcache.oc && term_emit("oc", nc->tcache.oc, nc->ttyfp, true)){
ret = -1;
}
ret |= notcurses_mouse_disable(nc);
if(nc->ttyfd >= 0){
ret |= tcsetattr(nc->ttyfd, TCSANOW, &nc->tpreserved);
}

3
src/lib/reel.c
View File

@ -832,6 +832,7 @@ bool ncreel_offer_input(ncreel* n, const ncinput* nc){
ncreel_next(n);
return true;
}
// FIXME there are a few more
// FIXME page up/page down
// FIXME end/home (when not using infinite scrolling)
return false;
}