add NCSCALE_NONE_HIRES, NCSCALE_SCALE_HIRES #1250

doc/man/man1/notcurses-view.1.md

@@ -28,7 +28,7 @@ be any non-negative number.
 
 **-l** ***loglevel***: Log everything (high log level) or nothing (log level 0) to stderr.
 
-**-s** ***scalemode***: Scaling mode, one of **none**, **scale**, or **stretch**.
+**-s** ***scalemode***: Scaling mode, one of **none**, **hires**, **scale**, **scalehi**, or **stretch**.
 
 **-b** ***blitter***: Blitter, one of **ascii**, **halfblocks**, **quadblitter**,
 **sexblitter**, or **braille**.

doc/man/man3/notcurses_visual.3.md

@@ -14,6 +14,8 @@ typedef enum {
   NCSCALE_NONE,
   NCSCALE_SCALE,
   NCSCALE_STRETCH,
+  NCSCALE_NONE_HIRES,
+  NCSCALE_SCALE_HIRES,
 } ncscale_e;
 
 typedef enum {

include/notcurses/notcurses.h

@@ -78,11 +78,15 @@ typedef enum {
 // How to scale an ncvisual during rendering. NCSCALE_NONE will apply no
 // scaling. NCSCALE_SCALE scales a visual to the plane's size, maintaining
 // aspect ratio. NCSCALE_STRETCH stretches and scales the image in an
-// attempt to fill the entirety of the plane.
+// attempt to fill the entirety of the plane. NCSCALE_NONE_HIRES and
+// NCSCALE_SCALE_HIRES behave like their counterparts, but admit blitters
+// which don't preserve aspect ratio.
 typedef enum {
   NCSCALE_NONE,
   NCSCALE_SCALE,
   NCSCALE_STRETCH,
+  NCSCALE_NONE_HIRES,
+  NCSCALE_SCALE_HIRES,
 } ncscale_e;
 
 // Returns the number of columns occupied by a multibyte (UTF-8) string, or
@@ -1193,6 +1197,9 @@ API bool notcurses_canopen_videos(const struct notcurses* nc);
 // Is our encoding UTF-8? Requires LANG being set to a UTF8 locale.
 API bool notcurses_canutf8(const struct notcurses* nc);
 
+// Can we reliably use Unicode 13 sextants?
+API bool notcurses_cansextant(const struct notcurses* nc);
+
 // Can we blit to Sixel?
 API bool notcurses_cansixel(const struct notcurses* nc);
 

src/demo/eagle.c

@@ -42,7 +42,7 @@ zoom_map(struct notcurses* nc, const char* map, int* ret){
   // but *do* explicitly supply NCBLIT_2x2 since we're not scaling.
   struct ncvisual_options vopts = {
     .y = 1,
-    .blitter = ncvisual_media_defblitter(nc, NCSCALE_NONE),
+    .blitter = ncvisual_media_defblitter(nc, NCSCALE_NONE_HIRES),
   };
   if(ncvisual_geom(nc, ncv, &vopts, &vheight, &vwidth, &yscale, &xscale)){
     ncvisual_destroy(ncv);

src/lib/blitset.h

@@ -44,7 +44,7 @@ rgba_blitter_default(bool utf8, ncscale_e scale, bool sextants){
   if(!utf8){
     return NCBLIT_1x1;
   }
-  if(scale != NCSCALE_STRETCH){
+  if(scale == NCSCALE_NONE || scale == NCSCALE_SCALE){
     return NCBLIT_2x1;
   }
   if(!sextants){

src/lib/internal.h

@@ -366,11 +366,6 @@ typedef struct notcurses {
   bool libsixel;  // do we have Sixel support?
 } notcurses;
 
-static inline bool
-notcurses_cansextant(const notcurses* nc){
-  return nc->tcache.sextants;
-}
-
 #include "blitset.h"
 
 void sigwinch_handler(int signo);

src/lib/notcurses.c

@@ -2111,6 +2111,10 @@ bool notcurses_canutf8(const notcurses* nc){
   return nc->utf8;
 }
 
+bool notcurses_cansextant(const notcurses* nc){
+  return nc->tcache.sextants && nc->utf8;
+}
+
 bool notcurses_canfade(const notcurses* nc){
   return nc->tcache.CCCflag || nc->tcache.RGBflag;
 }
@@ -2403,6 +2407,10 @@ lex_long(const char* op, int* i, char** endptr){
 int notcurses_lex_scalemode(const char* op, ncscale_e* scalemode){
   if(strcasecmp(op, "stretch") == 0){
     *scalemode = NCSCALE_STRETCH;
+  }else if(strcasecmp(op, "scalehi") == 0){
+    *scalemode = NCSCALE_SCALE_HIRES;
+  }else if(strcasecmp(op, "hires") == 0){
+    *scalemode = NCSCALE_NONE_HIRES;
   }else if(strcasecmp(op, "scale") == 0){
     *scalemode = NCSCALE_SCALE;
   }else if(strcasecmp(op, "none") == 0){
@@ -2420,6 +2428,10 @@ const char* notcurses_str_scalemode(ncscale_e scalemode){
     return "scale";
   }else if(scalemode == NCSCALE_NONE){
     return "none";
+  }else if(scalemode == NCSCALE_NONE_HIRES){
+    return "hires";
+  }else if(scalemode == NCSCALE_SCALE_HIRES){
+    return "scalehi";
   }
   return NULL;
 }

src/lib/visual.cpp

@@ -33,16 +33,16 @@ auto ncvisual_geom(const notcurses* nc, const ncvisual* n,
     x = &fauxx;
   }
   if(n){
-    if(scale == NCSCALE_NONE){
+    if(scale == NCSCALE_NONE || scale == NCSCALE_NONE_HIRES){
-      *y = n->rows;
+      *y = n->rows * encoding_y_scale(bset);
-      *x = n->cols;
+      *x = n->cols * encoding_x_scale(bset);
     }else{
       int rows = vopts->n ? ncplane_dim_y(vopts->n) : ncplane_dim_y(nc->stdplane);
       int cols = vopts->n ? ncplane_dim_x(vopts->n) : ncplane_dim_x(nc->stdplane);
       *y = rows * encoding_y_scale(bset);
       *x = cols * encoding_x_scale(bset);
     }
-    if(scale == NCSCALE_SCALE){
+    if(scale == NCSCALE_SCALE || scale == NCSCALE_SCALE_HIRES){
       scale_visual(n, y, x);
     }
   }
@@ -413,7 +413,7 @@ auto ncvisual_render(notcurses* nc, ncvisual* ncv,
       notcurses_term_dim_yx(nc, &disprows, &dispcols);
       dispcols *= encoding_x_scale(bset);
       disprows *= encoding_y_scale(bset);
-      if(vopts->scaling == NCSCALE_SCALE){
+      if(vopts->scaling == NCSCALE_SCALE || vopts->scaling == NCSCALE_SCALE_HIRES){
         scale_visual(ncv, &disprows, &dispcols);
       }
     }
@@ -434,16 +434,16 @@ auto ncvisual_render(notcurses* nc, ncvisual* ncv,
     placey = 0;
     placex = 0;
   }else{
-    if(!vopts || vopts->scaling == NCSCALE_NONE){
+    if(!vopts || vopts->scaling == NCSCALE_NONE || vopts->scaling == NCSCALE_NONE_HIRES){
-      dispcols = ncv->cols;
+      dispcols = ncv->cols * encoding_x_scale(bset);
-      disprows = ncv->rows;
+      disprows = ncv->rows * encoding_y_scale(bset);
     }else{
       ncplane_dim_yx(n, &disprows, &dispcols);
       dispcols *= encoding_x_scale(bset);
       disprows *= encoding_y_scale(bset);
       disprows -= placey;
       dispcols -= placex;
-      if(vopts->scaling == NCSCALE_SCALE){
+      if(vopts->scaling == NCSCALE_SCALE || vopts->scaling == NCSCALE_SCALE_HIRES){
         scale_visual(ncv, &disprows, &dispcols);
       }
     }

src/ls/main.cpp

@@ -142,11 +142,11 @@ void ncls_thread(const lsContext* ctx) {
       work.pop();
       pthread_mutex_unlock(&mtx);
       auto s = j.dir / j.p;
-      auto faken = ctx->nc.prep_image(s.c_str(), NCBLIT_DEFAULT, NCSCALE_SCALE);
+      auto faken = ctx->nc.prep_image(s.c_str(), NCBLIT_DEFAULT, NCSCALE_SCALE_HIRES);
       pthread_mutex_lock(&outmtx);
       std::cout << j.p << '\n';
       if(faken){
-        ctx->nc.raster_image(faken, ctx->alignment, NCBLIT_DEFAULT, NCSCALE_SCALE);
+        ctx->nc.raster_image(faken, ctx->alignment, NCBLIT_DEFAULT, NCSCALE_SCALE_HIRES);
       }
       pthread_mutex_unlock(&outmtx);
     }else if(!keep_working){

src/view/view.cpp

@@ -24,7 +24,7 @@ void usage(std::ostream& o, const char* name, int exitcode){
   o << " -L: loop frames\n";
   o << " -t seconds: delay t seconds after each file\n";
   o << " -l loglevel: integer between 0 and 9, goes to stderr'\n";
-  o << " -s scaletype: one of 'none', 'scale', or 'stretch'\n";
+  o << " -s scaletype: one of 'none', 'hires', 'scale', 'scalehi', or 'stretch'\n";
   o << " -b blitter: 'ascii', 'halfblock', 'quadblitter', 'sexblitter', or 'braille'\n";
   o << " -m margins: margin, or 4 comma-separated margins\n";
   o << " -d mult: non-negative floating point scale for frame time" << std::endl;
@@ -189,7 +189,7 @@ auto handle_opts(int argc, char** argv, notcurses_options& opts, bool* quiet,
         break;
       case 's':
         if(notcurses_lex_scalemode(optarg, scalemode)){
-          std::cerr << "Scaling type should be one of stretch, scale, none (got "
+          std::cerr << "Scaling type should be one of stretch, scale, scalehi, hires, none (got "
                     << optarg << ")" << std::endl;
           usage(std::cerr, argv[0], EXIT_FAILURE);
         }