From d7d85498309765e9c33d727e485be110003e7cac Mon Sep 17 00:00:00 2001
From: nick black <dankamongmen@gmail.com>
Date: Mon, 1 Nov 2021 16:19:29 -0400
Subject: [PATCH] [cellgeom] set rpixy/rpixx properly in presence of scaling

---
 src/lib/visual.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/lib/visual.c b/src/lib/visual.c
index a1bbad899..3aaa9b0c8 100644
--- a/src/lib/visual.c
+++ b/src/lib/visual.c
@@ -409,6 +409,7 @@ int ncvisual_geom_inner(const tinfo* ti, const ncvisual* n,
     }
     int dispcols, disprows;
     if(vopts->n == NULL || (vopts->flags & NCVISUAL_OPTION_CHILDPLANE)){ // create plane
+//fprintf(stderr, "CPATH1, create beg %dx%d len %dx%d\n", geom->begy, geom->begx, geom->leny, geom->lenx);
       if(scaling == NCSCALE_NONE || scaling == NCSCALE_NONE_HIRES){
         dispcols = geom->lenx;
         disprows = geom->leny;
@@ -426,6 +427,7 @@ int ncvisual_geom_inner(const tinfo* ti, const ncvisual* n,
         } // else stretch
       }
     }else{
+//fprintf(stderr, "CPATH2, reuse beg %dx%d len %dx%d\n", geom->begy, geom->begx, geom->leny, geom->lenx);
       if(scaling == NCSCALE_NONE || scaling == NCSCALE_NONE_HIRES){
         dispcols = geom->lenx;
         disprows = geom->leny;
@@ -450,10 +452,10 @@ int ncvisual_geom_inner(const tinfo* ti, const ncvisual* n,
         *placey = ncplane_valign(vopts->n, *placey, disprows / geom->scaley);
       }
     }
-    geom->rcelly = disprows;
-    geom->rcellx = dispcols;
-    geom->rpixy = geom->leny;
-    geom->rpixx = geom->lenx;
+    geom->rpixy = disprows;
+    geom->rpixx = dispcols;
+    geom->rcellx = dispcols / geom->scalex + !!(dispcols % geom->scalex);
+    geom->rcelly = disprows / geom->scaley + !!(disprows % geom->scaley);
   }
   logdebug("rgeom: %d %d %d %d (%d on %p)\n", geom->rcelly, geom->rcellx, geom->rpixy, geom->rpixx, (*bset)->geom, vopts->n);
   return 0;
@@ -1197,7 +1199,6 @@ ncplane* ncvisual_blit(notcurses* nc, ncvisual* ncv, const struct ncvisual_optio
                                vopts->flags, transcolor,
                                vopts->pxoffy, vopts->pxoffx);
   }
-fprintf(stderr, "N: %p\n", n);
   return n;
 }