Skip to content

fix: emit scroll commands before glyphs in CLI mode (#2577) #2918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deths74r wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: emit scroll commands before glyphs in CLI mode (#2577) #2918

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/lib/render.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,14 +990,15 @@ rasterize_scrolls(const ncpile* p, fbuf* f){
return 0;
}
logdebug("order-%d scroll", scrolls);
/*if(p->nc->rstate.logendy >= 0){
// Adjust logendy after scrolling so the post-render cursor parks at
// the correct position. Without this, logendy drifts after each scroll.
if(p->nc->rstate.logendy >= 0){
p->nc->rstate.logendy -= scrolls;
if(p->nc->rstate.logendy < 0){
p->nc->rstate.logendy = 0;
p->nc->rstate.logendx = 0;
}
}*/
// FIXME probably need this to take place at the end of cycle...
}
if(p->nc->tcache.pixel_scroll){
p->nc->tcache.pixel_scroll(p, &p->nc->tcache, scrolls);
}
Expand Down Expand Up @@ -1286,6 +1287,15 @@ notcurses_rasterize_inner(notcurses* nc, ncpile* p, fbuf* f, unsigned* asu){
if(sprixelbytes < 0){
return -1;
}
// Emit scroll commands before glyph phase 1. Previously, glyphs were
// emitted at their post-scroll positions before the terminal actually
// scrolled, causing the subsequent scroll to shift them up and desync
// lastframe from reality. Fixes #2577 (disappearing strings in CLI mode).
logdebug("scroll phase");
if(rasterize_scrolls(p, f)){
return -1;
}
p->scrolls = 0;
logdebug("glyph phase 1");
if(rasterize_core(nc, p, f, 0)){
return -1;
Expand All @@ -1300,10 +1310,6 @@ notcurses_rasterize_inner(notcurses* nc, ncpile* p, fbuf* f, unsigned* asu){
nc->stats.s.sprixelbytes += sprixelbytes;
pthread_mutex_unlock(&nc->stats.lock);
logdebug("glyph phase 2");
if(rasterize_scrolls(p, f)){
return -1;
}
p->scrolls = 0;
if(rasterize_core(nc, p, f, 1)){
return -1;
}
Expand Down