ncurses 5.7 - patch 20100116

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

diff --git a/ncurses/base/lib_mvwin.c b/ncurses/base/lib_mvwin.c
index 090d8fe730abc6cd6cb89aeda7246866bb4200a5..37963e40be76ca2ab256cd48fb174572081dadee 100644 (file)
--- a/ncurses/base/lib_mvwin.c
+++ b/ncurses/base/lib_mvwin.c
@@ -29,6 +29,8 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
+ *     and: Juergen Pfeifer                                                 *
  ****************************************************************************/
 
 /*
@@ -40,12 +42,16 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_mvwin.c,v 1.15 2009/04/18 18:25:37 tom Exp $")
+MODULE_ID("$Id: lib_mvwin.c,v 1.17 2009/10/24 22:05:03 tom Exp $")
 
 NCURSES_EXPORT(int)
 mvwin(WINDOW *win, int by, int bx)
 {
-    T((T_CALLED("mvwin(%p,%d,%d)"), win, by, bx));
+#if NCURSES_SP_FUNCS
+    SCREEN *sp = _nc_screen_of(win);
+#endif
+
+    T((T_CALLED("mvwin(%p,%d,%d)"), (void *) win, by, bx));
 
     if (!win || (win->_flags & _ISPAD))
        returnCode(ERR);
@@ -96,8 +102,8 @@ mvwin(WINDOW *win, int by, int bx)
     }
 #endif
 
-    if (by + win->_maxy > screen_lines(CURRENT_SCREEN) - 1
-       || bx + win->_maxx > screen_columns(CURRENT_SCREEN) - 1
+    if (by + win->_maxy > screen_lines(SP_PARM) - 1
+       || bx + win->_maxx > screen_columns(SP_PARM) - 1
        || by < 0
        || bx < 0)
        returnCode(ERR);