From f6b422f6689b969e1afcabcf149a457792f30acd Mon Sep 17 00:00:00 2001
From: nick black <dankamongmen@gmail.com>
Date: Wed, 4 Dec 2019 05:35:21 -0500
Subject: [PATCH] widecolor demo: bottom handle with stats

---
 src/demo/demo.c      |  2 +-
 src/demo/widecolor.c | 39 ++++++++++++++++++++++++++++++++++-----
 src/lib/notcurses.c  | 10 +++++++---
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/src/demo/demo.c b/src/demo/demo.c
index bd1f63171..58bb2780a 100644
--- a/src/demo/demo.c
+++ b/src/demo/demo.c
@@ -130,7 +130,7 @@ intro(struct notcurses* nc){
       if(ncplane_cursor_move_yx(ncp, y, x)){
         return -1;
       }
-      if(ncplane_putc(ncp, &c) != (int)strlen(cstr)){
+      if(ncplane_putc(ncp, &c) <= 0){
         return -1;
       }
     }
diff --git a/src/demo/widecolor.c b/src/demo/widecolor.c
index c1b30fe47..343b9a78f 100644
--- a/src/demo/widecolor.c
+++ b/src/demo/widecolor.c
@@ -7,24 +7,45 @@
 #include "demo.h"
 
 static int
-message(struct ncplane* n, int maxy, int maxx, int num, int total){
+message(struct ncplane* n, int maxy, int maxx, int num, int total,
+        int bytes_out, int egs_out, int cols_out){
   uint64_t channels = 0;
   notcurses_fg_prep(&channels, 255, 255, 255);
   ncplane_bg_default(n);
   ncplane_cursor_move_yx(n, 3, 1);
-  ncplane_styles_on(n, CELL_STYLE_BOLD);
   if(ncplane_rounded_box(n, 0, channels, 5, 57, 0)){
     return -1;
   }
+  // bottom handle
+  ncplane_cursor_move_yx(n, 5, 18);
+  ncplane_putegc(n, "┬", 0, 0, NULL);
+  ncplane_cursor_move_yx(n, 6, 18);
+  ncplane_putegc(n, "│", 0, 0, NULL);
+  ncplane_cursor_move_yx(n, 7, 18);
+  ncplane_putegc(n, "╰", 0, 0, NULL);
+  cell hl = CELL_TRIVIAL_INITIALIZER;
+  cell_prime(n, &hl, "━", 0, channels);
+  ncplane_hline(n, &hl, 57 - 18 - 1);
+  ncplane_cursor_move_yx(n, 7, 57);
+  ncplane_putegc(n, "╯", 0, 0, NULL);
+  ncplane_cursor_move_yx(n, 6, 57);
+  ncplane_putegc(n, "│", 0, 0, NULL);
+  ncplane_cursor_move_yx(n, 5, 57);
+  ncplane_putegc(n, "┤", 0, 0, NULL);
+  ncplane_cursor_move_yx(n, 6, 19);
+  ncplane_styles_on(n, CELL_STYLE_ITALIC);
+  ncplane_printf(n, " bytes: %05d EGCs: %05d cols: %05d ", bytes_out, egs_out, cols_out);
+  ncplane_styles_off(n, CELL_STYLE_ITALIC);
+
+  // top handle
   ncplane_cursor_move_yx(n, 3, 4);
   ncplane_putegc(n, "╨", 0, 0, NULL);
   ncplane_cursor_move_yx(n, 2, 4);
   ncplane_putegc(n, "║", 0, 0, NULL);
   ncplane_cursor_move_yx(n, 1, 4);
   ncplane_putegc(n, "╔", 0, 0, NULL);
-  cell hl = CELL_TRIVIAL_INITIALIZER;
   cell_prime(n, &hl, "═", 0, channels);
-  ncplane_hline(n, &hl, 15);
+  ncplane_hline(n, &hl, 20 - 4 - 1);
   cell_release(n, &hl);
   ncplane_cursor_move_yx(n, 1, 20);
   ncplane_putegc(n, "╗", 0, 0, NULL);
@@ -33,6 +54,7 @@ message(struct ncplane* n, int maxy, int maxx, int num, int total){
   ncplane_cursor_move_yx(n, 3, 20);
   ncplane_putegc(n, "╨", 0, 0, NULL);
   ncplane_cursor_move_yx(n, 2, 5);
+  ncplane_styles_on(n, CELL_STYLE_BOLD);
   ncplane_printf(n, " %03dx%03d (%d/%d) ", maxx, maxy, num + 1, total);
   ncplane_cursor_move_yx(n, 4, 2);
   ncplane_styles_off(n, CELL_STYLE_BOLD);
@@ -264,6 +286,9 @@ int widecolor_demo(struct notcurses* nc){
       if(ncplane_cursor_move_yx(n, 0, 0)){
         return -1;
       }
+      int bytes_out = 0;
+      int egcs_out = 0;
+      int cols_out = 0;
       y = 0;
       x = 0;
       do{ // we fill up the entire screen, however large, walking our strtable
@@ -298,6 +323,9 @@ int widecolor_demo(struct notcurses* nc){
             }
             ncplane_cursor_yx(n, &y, &x);
             idx += ulen;
+            bytes_out += ulen;
+            cols_out += r;
+            ++egcs_out;
           }
           if(++rollcount % rollover == 0){
             step *= 256;
@@ -314,7 +342,8 @@ int widecolor_demo(struct notcurses* nc){
           }
         }
       }while(y < maxy && x < maxx);
-      if(message(n, maxy, maxx, i, sizeof(steps) / sizeof(*steps))){
+      if(message(n, maxy, maxx, i, sizeof(steps) / sizeof(*steps),
+                 bytes_out, egcs_out, cols_out)){
         return -1;
       }
       if(notcurses_render(nc)){
diff --git a/src/lib/notcurses.c b/src/lib/notcurses.c
index fa7581670..4d0169f61 100644
--- a/src/lib/notcurses.c
+++ b/src/lib/notcurses.c
@@ -1233,10 +1233,14 @@ int ncplane_putc(ncplane* n, const cell* c){
   }
   ncplane_lock(n);
   cell* targ = &n->fb[fbcellidx(n, n->y, n->x)];
-  int ret = cell_duplicate(n, targ, c);
-  advance_cursor(n, 1 + cell_double_wide_p(targ));
+  if(cell_duplicate(n, targ, c) < 0){
+    ncplane_unlock(n);
+    return -1;
+  }
+  int cols = 1 + cell_double_wide_p(targ);
+  advance_cursor(n, cols);
   ncplane_unlock(n);
-  return ret;
+  return cols;
 }
 
 int ncplane_putsimple(struct ncplane* n, char c, uint32_t attr, uint64_t channels){