ncurses 5.7 - patch 20090704

[ncurses.git] / ncurses / base / lib_pad.c

diff --git a/ncurses/base/lib_pad.c b/ncurses/base/lib_pad.c
index 43d9ed7e33691e8fedf48b90cf1b6748cc04e09e..ccd3ad7efd89eaf2a403fd5191e569360db35fd7 100644 (file)
--- a/ncurses/base/lib_pad.c
+++ b/ncurses/base/lib_pad.c
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_pad.c,v 1.43 2009/04/18 18:25:37 tom Exp $")
+MODULE_ID("$Id: lib_pad.c,v 1.44 2009/07/04 19:45:20 tom Exp $")
 
 NCURSES_EXPORT(WINDOW *)
 NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c)
@@ -51,12 +51,13 @@ NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c)
     NCURSES_CH_T *ptr;
     int i;
 
-    T((T_CALLED("newpad(%d, %d)"), l, c));
+    T((T_CALLED("newpad(%p,%d, %d)"), SP_PARM, l, c));
 
     if (l <= 0 || c <= 0)
        returnWin(0);
 
-    if ((win = _nc_makenew(l, c, 0, 0, _ISPAD)) == NULL)
+    win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx l, c, 0, 0, _ISPAD);
+    if (win == NULL)
        returnWin(0);
 
     for (i = 0; i < l; i++) {
@@ -104,10 +105,14 @@ prefresh(WINDOW *win,
         int smaxrow,
         int smaxcol)
 {
+#if NCURSES_SP_FUNCS
+    SCREEN *sp = _nc_screen_of(win);
+#endif
+
     T((T_CALLED("prefresh()")));
     if (pnoutrefresh(win, pminrow, pmincol, sminrow, smincol, smaxrow,
                     smaxcol) != ERR
-       && doupdate() != ERR) {
+       && NCURSES_SP_NAME(doupdate) (NCURSES_SP_ARG) != ERR) {
        returnCode(OK);
     }
     returnCode(ERR);
@@ -126,6 +131,7 @@ pnoutrefresh(WINDOW *win,
     NCURSES_SIZE_T m, n;
     NCURSES_SIZE_T pmaxrow;
     NCURSES_SIZE_T pmaxcol;
+    SCREEN *sp;
 
 #if USE_SCROLL_HINTS
     const int my_len = 2;      /* parameterize the threshold for hardscroll */
@@ -142,6 +148,8 @@ pnoutrefresh(WINDOW *win,
     if (!(win->_flags & _ISPAD))
        returnCode(ERR);
 
+    sp = _nc_screen_of(win);
+
     /* negative values are interpreted as zero */
     if (pminrow < 0)
        pminrow = 0;
@@ -172,8 +180,8 @@ pnoutrefresh(WINDOW *win,
        pmaxcol = pmincol + smaxcol - smincol;
     }
 
-    if (smaxrow >= screen_lines(CURRENT_SCREEN)
-       || smaxcol >= screen_columns(CURRENT_SCREEN)
+    if (smaxrow >= screen_lines(sp)
+       || smaxcol >= screen_columns(sp)
        || sminrow > smaxrow
        || smincol > smaxcol)
        returnCode(ERR);
@@ -204,13 +212,13 @@ pnoutrefresh(WINDOW *win,
      * merely change the costs of various update cases.
      */
 #if USE_SCROLL_HINTS
-    wide = (smincol < my_len && smaxcol > (newscr->_maxx - my_len));
+    wide = (smincol < my_len && smaxcol > (NewScreen(sp)->_maxx - my_len));
 #endif
 
     for (i = pminrow, m = sminrow + win->_yoffset;
-        i <= pmaxrow && m <= newscr->_maxy;
+        i <= pmaxrow && m <= NewScreen(sp)->_maxy;
         i++, m++) {
-       register struct ldat *nline = &newscr->_line[m];
+       register struct ldat *nline = &NewScreen(sp)->_line[m];
        register struct ldat *oline = &win->_line[i];
        for (j = pmincol, n = smincol; j <= pmaxcol; j++, n++) {
            NCURSES_CH_T ch = oline->text[j];
@@ -239,9 +247,9 @@ pnoutrefresh(WINDOW *win,
                || nind > smaxrow) {
                nind = _NEWINDEX;
            } else if (displaced) {
-               register struct ldat *pline = &curscr->_line[nind];
+               register struct ldat *pline = &CurScreen(sp)->_line[nind];
                for (j = 0; j <= my_len; j++) {
-                   int k = newscr->_maxx - j;
+                   int k = NewScreen(sp)->_maxx - j;
                    if (pline->text[j] != nline->text[j]
                        || pline->text[k] != nline->text[k]) {
                        nind = _NEWINDEX;
@@ -276,7 +284,7 @@ pnoutrefresh(WINDOW *win,
 
     if (win->_clear) {
        win->_clear = FALSE;
-       newscr->_clear = TRUE;
+       NewScreen(sp)->_clear = TRUE;
     }
 
     /*
@@ -288,10 +296,10 @@ pnoutrefresh(WINDOW *win,
        && win->_curx >= pmincol
        && win->_cury <= pmaxrow
        && win->_curx <= pmaxcol) {
-       newscr->_cury = win->_cury - pminrow + win->_begy + win->_yoffset;
-       newscr->_curx = win->_curx - pmincol + win->_begx;
+       NewScreen(sp)->_cury = win->_cury - pminrow + win->_begy + win->_yoffset;
+       NewScreen(sp)->_curx = win->_curx - pmincol + win->_begx;
     }
-    newscr->_leaveok = win->_leaveok;
+    NewScreen(sp)->_leaveok = win->_leaveok;
     win->_flags &= ~_HASMOVED;
 
     /*