From 6d74f65f228eda024ac004f7b8f415b7392d5a89 Mon Sep 17 00:00:00 2001
From: nick black <dankamongmen@gmail.com>
Date: Tue, 27 Jul 2021 01:49:48 -0400
Subject: [PATCH] always track logend{y,x} #1984

even if we're not using PRESERVE_CURSOR, we still want
to place the cursor following the end of our output
when we close the context. always track it. this results
in proper placement of the closing banner following e.g.
notcurses-demo -k and rgbbg.
---
 src/lib/internal.h  |  8 +++-----
 src/lib/notcurses.c | 28 +++++++++++-----------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/lib/internal.h b/src/lib/internal.h
index db6fea3df..3eb48deb6 100644
--- a/src/lib/internal.h
+++ b/src/lib/internal.h
@@ -1217,11 +1217,9 @@ goto_location(notcurses* nc, FILE* out, int y, int x){
       return -1;
     }
   }
-  if(nc->rstate.logendy >= 0){
-    if(y > nc->rstate.logendy || (y == nc->rstate.logendy && x > nc->rstate.logendx)){
-      nc->rstate.logendy = y;
-      nc->rstate.logendx = x;
-    }
+  if(y > nc->rstate.logendy || (y == nc->rstate.logendy && x > nc->rstate.logendx)){
+    nc->rstate.logendy = y;
+    nc->rstate.logendx = x;
   }
   nc->rstate.x = x;
   nc->rstate.y = y;
diff --git a/src/lib/notcurses.c b/src/lib/notcurses.c
index e323c9d80..73b4eda0e 100644
--- a/src/lib/notcurses.c
+++ b/src/lib/notcurses.c
@@ -1151,12 +1151,6 @@ notcurses* notcurses_core_init(const notcurses_options* opts, FILE* outfp){
     goto err;
   }
   reset_term_attributes(&ret->tcache, ret->ttyfp);
-  if(!(opts->flags & NCOPTION_NO_CLEAR_BITMAPS)){
-    if(sprite_clear_all(&ret->tcache, ret->ttyfp)){
-      free_plane(ret->stdplane);
-      goto err;
-    }
-  }
   const char* smkx = get_escape(&ret->tcache, ESCAPE_SMKX);
   if(smkx && term_emit(smkx, ret->ttyfp, false)){
     free_plane(ret->stdplane);
@@ -1211,6 +1205,14 @@ notcurses* notcurses_core_init(const notcurses_options* opts, FILE* outfp){
       // standard plane, not the physical cursor that was just disrupted.
     }
   }
+  // the sprite clear ought take place within the alternate screen, if it's
+  // being used.
+  if(!(opts->flags & NCOPTION_NO_CLEAR_BITMAPS)){
+    if(sprite_clear_all(&ret->tcache, ret->ttyfp)){
+      free_plane(ret->stdplane);
+      goto err;
+    }
+  }
   return ret;
 
 err:
@@ -1270,19 +1272,11 @@ int notcurses_stop(notcurses* nc){
     // if we were not using the alternate screen, our cursor's wherever we last
     // wrote. move it to the bottom left of the screen, *unless*
     // PRESERVE_CURSOR was used, which is a bit more complex.
-    if(!(nc->flags & NCOPTION_PRESERVE_CURSOR)){
-      if(!get_escape(&nc->tcache, ESCAPE_SMCUP)){
-        // if ldimy is 0, we've not yet written anything; leave it untouched
-        if(nc->lfdimy){
-          int targy = nc->lfdimy + nc->margin_t - 1;
-          // cup is required, no need to test for existence
-          tty_emit(tiparm(get_escape(&nc->tcache, ESCAPE_CUP), targy, 0), nc->ttyfd);
-        }
-      }
-    }else{
+    if((nc->flags & NCOPTION_PRESERVE_CURSOR) || !get_escape(&nc->tcache, ESCAPE_SMCUP)){
       int targy = nc->rstate.logendy;
       if(++targy >= nc->lfdimy){
-        --targy; // FIXME do we need to scroll here?
+        printf("\v");
+        --targy;
       }
       goto_location(nc, stdout, targy, 0);
       fflush(stdout);