ncurses 6.0 - patch 20170617

[ncurses.git] / ncurses / tty / lib_mvcur.c

diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c
index 95b6733cc93714bca2c66816bfd3270034d387e7..d75f694823db490f13ba85dbc0624b207d4b0d6c 100644 (file)
--- a/ncurses/tty/lib_mvcur.c
+++ b/ncurses/tty/lib_mvcur.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -159,7 +159,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mvcur.c,v 1.132 2013/01/27 01:40:01 tom Exp $")
+MODULE_ID("$Id: lib_mvcur.c,v 1.141 2017/04/07 00:34:22 tom Exp $")
 
 #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]    /* desired state */
 
@@ -327,7 +327,7 @@ NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0)
 /* initialize the cost structure */
 {
-    if (SP_PARM->_ofp && isatty(fileno(SP_PARM->_ofp))) {
+    if (SP_PARM->_ofp && NC_ISATTY(fileno(SP_PARM->_ofp))) {
        SP_PARM->_char_padding = ((BAUDBYTE * 1000 * 10)
                                  / (BAUDRATE(SP_PARM) > 0
                                     ? BAUDRATE(SP_PARM)
@@ -952,7 +952,8 @@ static int
 _nc_real_mvcur(NCURSES_SP_DCLx
               int yold, int xold,
               int ynew, int xnew,
-              NCURSES_SP_OUTC myOutCh)
+              NCURSES_SP_OUTC myOutCh,
+              int ovw)
 {
     NCURSES_CH_T oldattr;
     int code;
@@ -991,10 +992,10 @@ _nc_real_mvcur(NCURSES_SP_DCLx
        }
 
        if (xold >= screen_columns(SP_PARM)) {
-           int l;
 
            if (SP_PARM->_nl) {
-               l = (xold + 1) / screen_columns(SP_PARM);
+               int l = (xold + 1) / screen_columns(SP_PARM);
+
                yold += l;
                if (yold >= screen_lines(SP_PARM))
                    l -= (yold - screen_lines(SP_PARM) - 1);
@@ -1002,15 +1003,17 @@ _nc_real_mvcur(NCURSES_SP_DCLx
                if (l > 0) {
                    if (carriage_return) {
                        NCURSES_PUTP2("carriage_return", carriage_return);
-                   } else
+                   } else {
                        myOutCh(NCURSES_SP_ARGx '\r');
+                   }
                    xold = 0;
 
                    while (l > 0) {
                        if (newline) {
                            NCURSES_PUTP2("newline", newline);
-                       } else
+                       } else {
                            myOutCh(NCURSES_SP_ARGx '\n');
+                       }
                        l--;
                    }
                }
@@ -1030,7 +1033,7 @@ _nc_real_mvcur(NCURSES_SP_DCLx
            ynew = screen_lines(SP_PARM) - 1;
 
        /* destination location is on screen now */
-       code = onscreen_mvcur(NCURSES_SP_ARGx yold, xold, ynew, xnew, TRUE, myOutCh);
+       code = onscreen_mvcur(NCURSES_SP_ARGx yold, xold, ynew, xnew, ovw, myOutCh);
 
        /*
         * Restore attributes if we disabled them before moving.
@@ -1054,7 +1057,8 @@ NCURSES_SP_NAME(_nc_mvcur) (NCURSES_SP_DCLx
                            int ynew, int xnew)
 {
     return _nc_real_mvcur(NCURSES_SP_ARGx yold, xold, ynew, xnew,
-                         NCURSES_SP_NAME(_nc_outch));
+                         NCURSES_SP_NAME(_nc_outch),
+                         TRUE);
 }
 
 #if NCURSES_SP_FUNCS
@@ -1076,7 +1080,8 @@ TINFO_MVCUR(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew)
     return _nc_real_mvcur(NCURSES_SP_ARGx
                          yold, xold,
                          ynew, xnew,
-                         NCURSES_SP_NAME(_nc_outch));
+                         NCURSES_SP_NAME(_nc_outch),
+                         TRUE);
 }
 
 #else /* !USE_TERM_DRIVER */
@@ -1091,7 +1096,8 @@ NCURSES_SP_NAME(mvcur) (NCURSES_SP_DCLx int yold, int xold, int ynew,
     return _nc_real_mvcur(NCURSES_SP_ARGx
                          yold, xold,
                          ynew, xnew,
-                         NCURSES_SP_NAME(_nc_putchar));
+                         NCURSES_SP_NAME(_nc_putchar),
+                         FALSE);
 }
 
 #if NCURSES_SP_FUNCS
@@ -1175,13 +1181,12 @@ roll(int n)
 int
 main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 {
-    strcpy(tname, getenv("TERM"));
+    _nc_STRCPY(tname, getenv("TERM"), sizeof(tname));
     load_term();
     _nc_setupscreen(lines, columns, stdout, FALSE, 0);
     baudrate();
 
     _nc_mvcur_init();
-    NC_BUFFERED(FALSE);
 
     (void) puts("The mvcur tester.  Type ? for help");
 
@@ -1240,7 +1245,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
                                                             before.tv_sec)
                           * 1000000));
        } else if (buf[0] == 'r') {
-           (void) strcpy(tname, termname());
+           _nc_STRCPY(tname, termname(), sizeof(tname));
            load_term();
        } else if (sscanf(buf, "l %s", tname) == 1) {
            load_term();
@@ -1273,8 +1278,9 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
                }
            }
        } else if (buf[0] == 'i') {
-           dump_init((char *) NULL, F_TERMINFO, S_TERMINFO, 70, 0, FALSE);
-           dump_entry(&cur_term->type, FALSE, TRUE, 0, 0);
+           dump_init(NULL, F_TERMINFO, S_TERMINFO,
+                     FALSE, 70, 0, 0, FALSE, FALSE, 0);
+           dump_entry(&TerminalType(cur_term), FALSE, TRUE, 0, 0);
            putchar('\n');
        } else if (buf[0] == 'o') {
            if (_nc_optimize_enable & OPTIMIZE_MVCUR) {