multiprogress.c: Probe termcap/info for newline sequence.

Just to show willing.  Provide the obvious default, because it seems to
be necessary!

diff --git a/multiprogress.c b/multiprogress.c
index aa8e8907a6dbbc36b9cfc0411ccc7c1cca26bd5a..17ba4c083fdcdd6a5a3a2ba614a013f9212e8260 100644 (file)
--- a/multiprogress.c
+++ b/multiprogress.c
@@ -69,6 +69,7 @@ int progress_init(struct progress_state *progress)
   if (setupterm(0, fileno(tty->fp), &err) != OK || err < 1) return (-1);
 
   tty->cap.cr = tigetstr("cr");
   if (setupterm(0, fileno(tty->fp), &err) != OK || err < 1) return (-1);
 
   tty->cap.cr = tigetstr("cr");

+  tty->cap.nw = tigetstr("nel");

   tty->cap.up = tigetstr("cuu1");
   tty->cap.ce = tigetstr("el");
   tty->cap.cd = tigetstr("ed");
   tty->cap.up = tigetstr("cuu1");
   tty->cap.ce = tigetstr("el");
   tty->cap.cd = tigetstr("ed");


@@ -98,6 +99,7 @@ int progress_init(struct progress_state *progress)
 
   capcur = tty->capbuf;
   tty->cap.cr = tgetstr("cr", &capcur);
 
   capcur = tty->capbuf;
   tty->cap.cr = tgetstr("cr", &capcur);

+  tty->cap.nw = tgetstr("nw", &capcur);

   tty->cap.up = tgetstr("up", &capcur);
   tty->cap.ce = tgetstr("ce", &capcur);
   tty->cap.cd = tgetstr("cd", &capcur);
   tty->cap.up = tgetstr("up", &capcur);
   tty->cap.ce = tgetstr("ce", &capcur);
   tty->cap.cd = tgetstr("cd", &capcur);


@@ -129,6 +131,7 @@ int progress_init(struct progress_state *progress)
 #undef SETDIM
 
   if (!tty->cap.cr) tty->cap.cr = "\r";
 #undef SETDIM
 
   if (!tty->cap.cr) tty->cap.cr = "\r";

+  if (!tty->cap.nw) tty->cap.nw = "\r\n";

   if (!tty->cap.up || !tty->cap.ce || !tty->cap.cd)
     { fclose(tty->fp); tty->fp = 0; return (-1); }
   if (!tty->cap.af || !tty->cap.ab || !tty->cap.op) tty->cap.op = 0;
   if (!tty->cap.up || !tty->cap.ce || !tty->cap.cd)
     { fclose(tty->fp); tty->fp = 0; return (-1); }
   if (!tty->cap.af || !tty->cap.ab || !tty->cap.op) tty->cap.op = 0;


@@ -555,6 +558,7 @@ int progress_clear(struct progress_state *progress)
 int progress_update(struct progress_state *progress)
 {
   struct progress_render_state render;
 int progress_update(struct progress_state *progress)
 {
   struct progress_render_state render;

+  const struct progress_ttyinfo *tty = &progress->tty;

   struct progress_item *item;
   unsigned f = 0;
 #define f_any 1u
   struct progress_item *item;
   unsigned f = 0;
 #define f_any 1u


@@ -564,7 +568,7 @@ int progress_update(struct progress_state *progress)
   clear_progress(progress, &render, 0);
 
   for (item = progress->items; item; item = item->next) {
   clear_progress(progress, &render, 0);
 
   for (item = progress->items; item; item = item->next) {

-    if (f&f_any) fputs("\r\n", progress->tty.fp);
+    if (f&f_any) put_sequence(tty, tty->cap.nw, 1);

     render.leftsz = render.rightsz = 0;
     render.leftwd = render.rightwd = 0;
     item->render(item, &render); progress->last_lines++; f |= f_any;
     render.leftsz = render.rightsz = 0;
     render.leftwd = render.rightwd = 0;
     item->render(item, &render); progress->last_lines++; f |= f_any;

diff --git a/multiprogress.h b/multiprogress.h
index 1db97a89a8485c1c835b2e67dc0c91e6a137cd89..752eb8c847a8d6367e2577aad809dfddf470b962 100644 (file)
--- a/multiprogress.h
+++ b/multiprogress.h
@@ -10,7 +10,7 @@ struct progress_ttyinfo {
   struct {                             /* terminal capabilities */
     unsigned f;                                /*   various flags */
 #define TCF_BCE 1u                     /*   erases to background colour */
   struct {                             /* terminal capabilities */
     unsigned f;                                /*   various flags */
 #define TCF_BCE 1u                     /*   erases to background colour */

-    const char *cr, *up, *ce, *cd;     /*   cursor motion */
+    const char *cr, *nw, *up, *ce, *cd;        /*   cursor motion */

     const char *mr, *md, *me;          /*   reverse video, bold */
     const char *af, *ab, *op;          /*   colour */
   } cap;
     const char *mr, *md, *me;          /*   reverse video, bold */
     const char *af, *ab, *op;          /*   colour */
   } cap;