working kitty_wipe_selfref+kitty_rebuild_selfref #1900

dankamongmen · Jul 26, 2021 · c71580d · c71580d
1 parent b7d9899
commit c71580d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/src/lib/kitty.c b/src/lib/kitty.c
@@ -375,6 +375,36 @@ int kitty_wipe_animation(sprixel* s, int ycell, int xcell){
   return 1;
 }
 
+// FIXME merge back with kitty_wipe_animation
+int kitty_wipe_selfref(sprixel* s, int ycell, int xcell){
+  if(init_sprixel_animation(s)){
+    return -1;
+  }
+  logdebug("Wiping sprixel %u at %d/%d\n", s->id, ycell, xcell);
+  FILE* fp = s->mstreamfp;
+  fprintf(fp, "\e_Ga=f,x=%d,y=%d,s=%d,v=%d,i=%d,X=1,r=2,c=1,q=2;",
+          xcell * s->cellpxx,
+          ycell * s->cellpxy,
+          s->cellpxx,
+          s->cellpxy,
+          s->id);
+  // FIXME ought be smaller around the fringes!
+  int totalp = s->cellpxy * s->cellpxx;
+  // FIXME preserve so long as cellpixel geom stays constant?
+  for(int p = 0 ; p + 3 <= totalp ; p += 3){
+    ncfputs("AAAAAAAAAAAAAAAA", fp);
+  }
+  if(totalp % 3 == 1){
+    ncfputs("AAAAAA==", fp);
+  }else if(totalp % 3 == 2){
+    ncfputs("AAAAAAAAAAA=", fp);
+  }
+  // FIXME need chunking for cells of 768+ pixels
+  fprintf(fp, "\e\\\e_Ga=a,i=%d,c=2,q=2;\e\\", s->id);
+  s->invalidated = SPRIXEL_INVALIDATED;
+  return 1;
+}
+
 sprixel* kitty_recycle(ncplane* n){
   assert(n->sprite);
   sprixel* hides = n->sprite;
@@ -790,7 +820,7 @@ int kitty_rebuild_selfref(sprixel* s, int ycell, int xcell, uint8_t* auxvec){
   const int xlen = xstart + s->cellpxx > s->pixx ? s->pixx - xstart : s->cellpxx;
   const int ylen = ystart + s->cellpxy > s->pixy ? s->pixy - ystart : s->cellpxy;
   logdebug("rematerializing %u at %d/%d (%dx%d)\n", s->id, ycell, xcell, ylen, xlen);
-  fprintf(fp, "\e_Ga=c,x=%d,y=%d,X=%d,Y=%d,w=%d,h=%d,i=%d,c=2,r=1,q=2;\x1b\\",
+  fprintf(fp, "\e_Ga=c,x=%d,y=%d,X=%d,Y=%d,w=%d,h=%d,i=%d,r=1,c=2,q=2;\x1b\\",
           xcell * s->cellpxx, ycell * s->cellpxy,
           xcell * s->cellpxx, ycell * s->cellpxy,
           xlen, ylen, s->id);

diff --git a/src/lib/sprite.h b/src/lib/sprite.h
@@ -164,6 +164,7 @@ int kitty_wipe(sprixel* s, int ycell, int xcell);
 // wipes out a cell by animating an all-transparent cell, and integrating
 // it with the original image using the animation protocol of 0.20.0+.
 int kitty_wipe_animation(sprixel* s, int ycell, int xcell);
+int kitty_wipe_selfref(sprixel* s, int ycell, int xcell);
 // wipes out a cell by changing the alpha value throughout the PNG cell to 0.
 int iterm_wipe(sprixel* s, int ycell, int xcell);
 int fbcon_wipe(sprixel* s, int ycell, int xcell);

diff --git a/src/lib/termdesc.c b/src/lib/termdesc.c
@@ -103,13 +103,14 @@ setup_kitty_bitmaps(tinfo* ti, int fd, kitty_graphics_e level){
     ti->sixel_maxy_pristine = INT_MAX;
     set_pixel_blitter(kitty_blit);
   }else{
-    ti->pixel_wipe = kitty_wipe_animation;
     if(level == KITTY_ANIMATION){
+      ti->pixel_wipe = kitty_wipe_animation;
       ti->pixel_rebuild = kitty_rebuild_animation;
       set_pixel_blitter(kitty_blit_animated);
     }else{
+      ti->pixel_wipe = kitty_wipe_selfref;
       ti->pixel_rebuild = kitty_rebuild_selfref;
-      set_pixel_blitter(kitty_blit_selfref);
+      set_pixel_blitter(kitty_blit_animated);
     }
   }
   sprite_init(ti, fd);
@@ -507,7 +508,7 @@ apply_term_heuristics(tinfo* ti, const char* termname, int fd,
     if(add_smulx_escapes(ti, tablelen, tableused)){
       return -1;
     }
-    if(compare_versions(ti->termversion, "0.21.3") >= 0){
+    if(compare_versions(ti->termversion, "0.21.2") >= 0){
       setup_kitty_bitmaps(ti, fd, KITTY_SELFREF);
     }else if(compare_versions(ti->termversion, "0.20.0") >= 0){
       setup_kitty_bitmaps(ti, fd, KITTY_ANIMATION);