ncurses 5.9 - patch 20131214

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

diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c
index 634159dc0fe4762f61c269e70e985be3e4c08b73..2ea04c58a8f292dec8e676a3e65ba511cbe110d6 100644 (file)
--- a/ncurses/tty/lib_mvcur.c
+++ b/ncurses/tty/lib_mvcur.c
@@ -159,7 +159,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mvcur.c,v 1.131 2013/01/12 22:21:29 tom Exp $")
+MODULE_ID("$Id: lib_mvcur.c,v 1.133 2013/05/25 23:59:41 tom Exp $")
 
 #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]    /* desired state */
 
@@ -769,7 +769,10 @@ relative_move(NCURSES_SP_DCLx
  */
 
 static NCURSES_INLINE int
-onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, int ovw)
+onscreen_mvcur(NCURSES_SP_DCLx
+              int yold, int xold,
+              int ynew, int xnew, int ovw,
+              NCURSES_SP_OUTC myOutCh)
 /* onscreen move from (yold, xold) to (ynew, xnew) */
 {
     string_desc result;
@@ -934,7 +937,7 @@ onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, int ovw)
     if (usecost != INFINITY) {
        TPUTS_TRACE("mvcur");
        NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
-                               buffer, 1, NCURSES_SP_NAME(_nc_outch));
+                               buffer, 1, myOutCh);
        SP_PARM->_cursrow = ynew;
        SP_PARM->_curscol = xnew;
        return (OK);
@@ -949,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;
@@ -999,15 +1003,17 @@ _nc_real_mvcur(NCURSES_SP_DCLx
                if (l > 0) {
                    if (carriage_return) {
                        NCURSES_PUTP2("carriage_return", carriage_return);
-                   } else
-                       NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\r');
+                   } else {
+                       myOutCh(NCURSES_SP_ARGx '\r');
+                   }
                    xold = 0;
 
                    while (l > 0) {
                        if (newline) {
                            NCURSES_PUTP2("newline", newline);
-                       } else
-                           NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\n');
+                       } else {
+                           myOutCh(NCURSES_SP_ARGx '\n');
+                       }
                        l--;
                    }
                }
@@ -1027,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);
+       code = onscreen_mvcur(NCURSES_SP_ARGx yold, xold, ynew, xnew, ovw, myOutCh);
 
        /*
         * Restore attributes if we disabled them before moving.
@@ -1051,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
@@ -1073,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 */
@@ -1088,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