[termdesc] don't enable sixel graphics with 0 color registers

dankamongmen · Jan 1, 2022 · 03160d9 · 03160d9
1 parent dba86c7
commit 03160d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/lib/termdesc.c b/src/lib/termdesc.c
@@ -1362,10 +1362,13 @@ int interrogate_terminfo(tinfo* ti, FILE* out, unsigned utf8,
   }
   build_supported_styles(ti);
   if(ti->pixel_draw == NULL && ti->pixel_draw_late == NULL){
+    // color_registers was only assigned if kitty_graphics were unavailable
+    if(ti->color_registers > 0){
+      setup_sixel_bitmaps(ti, ti->ttyfd, invertsixel);
+    }
     if(kitty_graphics){
       setup_kitty_bitmaps(ti, ti->ttyfd, NCPIXEL_KITTY_STATIC);
     }
-    setup_sixel_bitmaps(ti, ti->ttyfd, invertsixel);
   }
   return 0;
 

diff --git a/src/tests/direct.cpp b/src/tests/direct.cpp
@@ -74,7 +74,6 @@ TEST_CASE("Direct") {
     }
   }
 
-  /*
 #ifndef NOTCURSES_USE_MULTIMEDIA
   SUBCASE("VisualDisabled"){
     CHECK(!ncdirect_canopen_images(nc_));
@@ -172,7 +171,6 @@ TEST_CASE("Direct") {
     }
   }
 #endif
-  */
 
   CHECK(0 == ncdirect_stop(nc_));
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,7 +74,6 @@ TEST_CASE("Direct") { @@
         }
       }
-      /*
     #ifndef NOTCURSES_USE_MULTIMEDIA
       SUBCASE("VisualDisabled"){
         CHECK(!ncdirect_canopen_images(nc_));
@@ Expand Down Expand Up / @@ -172,7 +171,6 @@ TEST_CASE("Direct") { @@
         }
       }
     #endif
-      */
       CHECK(0 == ncdirect_stop(nc_));
@@ Expand Down @@