ncurses 5.9 - patch 20120225

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

diff --git a/ncurses/tty/lib_mvcur.c b/ncurses/tty/lib_mvcur.c
index 2d7240700b33245f2621ff34358976ab1400e74e..8de26c4f6a80800937e550f83f8f34acc78b5b5d 100644 (file)
--- a/ncurses/tty/lib_mvcur.c
+++ b/ncurses/tty/lib_mvcur.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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            *
@@ -153,13 +153,21 @@
  */
 
 #include <curses.priv.h>
-#include <term.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_mvcur.c,v 1.118 2009/05/02 20:38:58 tom Exp $")
+#ifndef CUR
+#define CUR SP_TERMTYPE
+#endif
+
+MODULE_ID("$Id: lib_mvcur.c,v 1.127 2011/10/22 16:09:52 tom Exp $")
+
+#define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x]    /* desired state */
 
-#define WANT_CHAR(sp, y, x) (sp)->_newscr->_line[y].text[x]    /* desired state */
+#if NCURSES_SP_FUNCS
+#define BAUDRATE(sp)   sp->_term->_baudrate    /* bits per second */
+#else
 #define BAUDRATE(sp)   cur_term->_baudrate     /* bits per second */
+#endif
 
 #if defined(MAIN) || defined(NCURSES_TEST)
 #include <sys/time.h>
@@ -223,19 +231,20 @@ NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_DCLx const char *const cap, int affcn
 
                for (cp += 2; *cp != '>'; cp++) {
                    if (isdigit(UChar(*cp)))
-                       number = number * 10 + (*cp - '0');
+                       number = number * 10 + (float) (*cp - '0');
                    else if (*cp == '*')
-                       number *= affcnt;
+                       number *= (float) affcnt;
                    else if (*cp == '.' && (*++cp != '>') && isdigit(UChar(*cp)))
-                       number += (*cp - '0') / 10.0;
+                       number += (float) ((*cp - '0') / 10.0);
                }
 
 #if NCURSES_NO_PADDING
                if (!GetNoPadding(SP_PARM))
 #endif
                    cum_cost += number * 10;
-           } else
-               cum_cost += SP_PARM->_char_padding;
+           } else if (SP_PARM) {
+               cum_cost += (float) SP_PARM->_char_padding;
+           }
        }
 
        return ((int) cum_cost);
@@ -254,7 +263,7 @@ static int
 normalized_cost(NCURSES_SP_DCLx const char *const cap, int affcnt)
 /* compute the effective character-count for an operation (round up) */
 {
-    int cost = _nc_msec_cost(cap, affcnt);
+    int cost = NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_ARGx cap, affcnt);
     if (cost != INFINITY)
        cost = (cost + SP_PARM->_char_padding - 1) / SP_PARM->_char_padding;
     return cost;
@@ -276,6 +285,9 @@ NCURSES_EXPORT(void)
 NCURSES_SP_NAME(_nc_mvcur_resume) (NCURSES_SP_DCL0)
 /* what to do at initialization time and after each shellout */
 {
+    if (SP_PARM && !IsTermInfo(SP_PARM))
+       return;
+
     /* initialize screen for cursor access */
     if (enter_ca_mode) {
        NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx
@@ -440,7 +452,7 @@ NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0)
      * SCREEN's _endwin to TRUE at window initialization time and let this be
      * called by doupdate's return-from-shellout code.
      */
-    _nc_mvcur_resume();
+    NCURSES_SP_NAME(_nc_mvcur_resume) (NCURSES_SP_ARG);
 }
 
 #if NCURSES_SP_FUNCS
@@ -448,7 +460,6 @@ NCURSES_EXPORT(void)
 _nc_mvcur_init(void)
 {
     NCURSES_SP_NAME(_nc_mvcur_init) (CURRENT_SCREEN);
-    _nc_mvcur_resume();
 }
 #endif
 
@@ -457,7 +468,10 @@ NCURSES_SP_NAME(_nc_mvcur_wrap) (NCURSES_SP_DCL0)
 /* wrap up cursor-addressing mode */
 {
     /* leave cursor at screen bottom */
-    mvcur(-1, -1, screen_lines(CURRENT_SCREEN) - 1, 0);
+    TINFO_MVCUR(NCURSES_SP_ARGx -1, -1, screen_lines(SP_PARM) - 1, 0);
+
+    if (!SP_PARM || !IsTermInfo(SP_PARM))
+       return;
 
     /* set cursor to normal mode */
     if (SP_PARM->_cursor != -1) {
@@ -502,7 +516,7 @@ _nc_mvcur_wrap(void)
 static NCURSES_INLINE int
 repeated_append(string_desc * target, int total, int num, int repeat, const char *src)
 {
-    size_t need = repeat * strlen(src);
+    size_t need = (size_t) repeat * strlen(src);
 
     if (need < target->s_size) {
        while (repeat-- > 0) {
@@ -535,7 +549,7 @@ relative_move(NCURSES_SP_DCLx
              int from_x,
              int to_y,
              int to_x,
-             bool ovw)
+             int ovw)
 /* move via local motions (cuu/cuu1/cud/cud1/cub1/cub/cuf1/cuf/vpa/hpa) */
 {
     string_desc save;
@@ -682,7 +696,7 @@ relative_move(NCURSES_SP_DCLx
                        *check.s_tail++ = (char) CharOf(WANT_CHAR(SP_PARM, to_y,
                                                                  from_x + i));
                    *check.s_tail = '\0';
-                   check.s_size -= n;
+                   check.s_size -= (size_t) n;
                    lhcost += n * SP_PARM->_char_padding;
                } else {
                    lhcost = repeated_append(&check, lhcost, SP_PARM->_cuf1_cost,
@@ -756,7 +770,7 @@ relative_move(NCURSES_SP_DCLx
  */
 
 static NCURSES_INLINE int
-onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, bool ovw)
+onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, int ovw)
 /* onscreen move from (yold, xold) to (ynew, xnew) */
 {
     string_desc result;
@@ -920,7 +934,8 @@ onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, bool ovw)
 
     if (usecost != INFINITY) {
        TPUTS_TRACE("mvcur");
-       tputs(buffer, 1, _nc_outch);
+       NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
+                               buffer, 1, NCURSES_SP_NAME(_nc_outch));
        SP_PARM->_cursrow = ynew;
        SP_PARM->_curscol = xnew;
        return (OK);
@@ -928,16 +943,15 @@ onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, bool ovw)
        return (ERR);
 }
 
-/* optimized cursor move from (yold, xold) to (ynew, xnew) */
 NCURSES_EXPORT(int)
-NCURSES_SP_NAME(mvcur) (NCURSES_SP_DCLx
-                       int yold, int xold, int ynew, int xnew)
+TINFO_MVCUR(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew)
+/* optimized cursor move from (yold, xold) to (ynew, xnew) */
 {
     NCURSES_CH_T oldattr;
     int code;
 
-    TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("mvcur(%d,%d,%d,%d)"),
-                                 yold, xold, ynew, xnew));
+    TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("_nc_tinfo_mvcur(%p,%d,%d,%d,%d)"),
+                                 (void *) SP_PARM, yold, xold, ynew, xnew));
 
     if (SP_PARM == 0) {
        code = ERR;
@@ -1028,7 +1042,7 @@ NCURSES_SP_NAME(mvcur) (NCURSES_SP_DCLx
     returnCode(code);
 }
 
-#if NCURSES_SP_FUNCS
+#if NCURSES_SP_FUNCS && !defined(USE_TERM_DRIVER)
 NCURSES_EXPORT(int)
 mvcur(int yold, int xold, int ynew, int xnew)
 {