From d558c8d6e1e792d9a64a3f8f6fd09b5389939cfc Mon Sep 17 00:00:00 2001
From: nick black <dankamongmen@gmail.com>
Date: Sat, 3 Jul 2021 00:26:24 -0400
Subject: [PATCH] require set_pixel_blitter() for sixel_blit

---
 src/lib/blit.c     |  2 +-
 src/lib/termdesc.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/lib/blit.c b/src/lib/blit.c
index b5e79272f..ce7d4d337 100644
--- a/src/lib/blit.c
+++ b/src/lib/blit.c
@@ -897,7 +897,7 @@ static struct blitset notcurses_blitters[] = {
      .blit = braille_blit,   .name = "braille",       .fill = true,  },
    { .geom = NCBLIT_PIXEL,   .width = 1, .height = 1,
      .egcs = L"", .plotegcs = NULL,
-     .blit = sixel_blit,     .name = "pixel",         .fill = true,  },
+     .blit = NULL,           .name = "pixel",         .fill = true,  },
    { .geom = NCBLIT_4x1,     .width = 1, .height = 4,
      .egcs = NULL, .plotegcs = L" ▂▄▆█",
      .blit = tria_blit,      .name = "fourstep",      .fill = false, },
diff --git a/src/lib/termdesc.c b/src/lib/termdesc.c
index 011ce1e60..f45fdf4df 100644
--- a/src/lib/termdesc.c
+++ b/src/lib/termdesc.c
@@ -59,11 +59,13 @@ setup_sixel_bitmaps(tinfo* ti, int fd, bool invert80){
   ti->pixel_rebuild = sixel_rebuild;
   ti->pixel_trans_auxvec = sixel_trans_auxvec;
   ti->sprixel_scale_height = 6;
+  set_pixel_blitter(sixel_blit);
   sprite_init(ti, fd);
 }
 
+// kitty 0.19.3 didn't have C=1, and thus needs sixel_maxy_pristine
 static inline void
-setup_kitty_bitmaps(tinfo* ti, int fd){
+setup_kitty_bitmaps(tinfo* ti, int fd, int sixel_maxy_pristine){
   ti->pixel_wipe = kitty_wipe;
   ti->pixel_destroy = kitty_destroy;
   ti->pixel_remove = kitty_remove;
@@ -74,6 +76,7 @@ setup_kitty_bitmaps(tinfo* ti, int fd){
   ti->pixel_rebuild = kitty_rebuild;
   ti->pixel_clear_all = kitty_clear_all;
   ti->pixel_trans_auxvec = kitty_trans_auxvec;
+  ti->sixel_maxy_pristine = sixel_maxy_pristine;
   set_pixel_blitter(kitty_blit);
   sprite_init(ti, fd);
 }
@@ -380,14 +383,15 @@ apply_term_heuristics(tinfo* ti, const char* termname, int fd,
     ti->caps.sextants = true; // work since bugfix in 0.19.3
     ti->caps.quadrants = true;
     ti->caps.rgb = true;
-    setup_kitty_bitmaps(ti, fd);
     *advertised_appsync = 0; // FIXME see above
     if(add_smulx_escapes(ti, tablelen, tableused)){
       return -1;
     }
     // kitty only introduced C=1 in 0.20.0
     if(compare_versions(ti->termversion, "0.20.0") < 0){
-      ti->sixel_maxy_pristine = INT_MAX;
+      setup_kitty_bitmaps(ti, fd, INT_MAX);
+    }else{
+      setup_kitty_bitmaps(ti, fd, 0);
     }
   }else if(qterm == TERMINAL_ALACRITTY){
     termname = "Alacritty";