Update to ncurses-5.2-20010114

1 files changed, 56 insertions, 58 deletions

diff --git a/lib/libcurses/base/lib_mvwin.c b/lib/libcurses/base/lib_mvwin.c
index b41bea721be..dbd28576f1b 100644
--- a/lib/libcurses/base/lib_mvwin.c
+++ b/lib/libcurses/base/lib_mvwin.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: lib_mvwin.c,v 1.1 1999/01/18 19:09:53 millert Exp $	*/
+/*	$OpenBSD: lib_mvwin.c,v 1.2 2001/01/22 18:01:41 millert Exp $	*/
 
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,2000 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            *
@@ -33,8 +33,6 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
-
 /*
 **	lib_mvwin.c
 **
@@ -44,68 +42,68 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$From: lib_mvwin.c,v 1.7 1998/02/11 12:13:55 tom Exp $")
+MODULE_ID("$From: lib_mvwin.c,v 1.9 2000/12/10 02:43:27 tom Exp $")
 
-int mvwin(WINDOW *win, int by, int bx)
+NCURSES_EXPORT(int)
+mvwin(WINDOW *win, int by, int bx)
 {
-	T((T_CALLED("mvwin(%p,%d,%d)"), win, by, bx));
+    T((T_CALLED("mvwin(%p,%d,%d)"), win, by, bx));
 
-	if (!win || (win->_flags & _ISPAD))
-	    returnCode(ERR);
+    if (!win || (win->_flags & _ISPAD))
+	returnCode(ERR);
 
-	/* Copying subwindows is allowed, but it is expensive... */
-	if (win->_flags & _SUBWIN) {
-	  int err = ERR;
-	  WINDOW *parent = win->_parent;
-	  if (parent)
-	    { /* Now comes the complicated and costly part, you should really
-	       * try to avoid to move subwindows. Because a subwindow shares
-	       * the text buffers with its parent, one can't do a simple
-	       * memmove of the text buffers. One has to create a copy, then
-	       * to relocate the subwindow and then to do a copy.
-	       */
-	      if ((by - parent->_begy == win->_pary) &&
-		  (bx - parent->_begx == win->_parx))
-		err=OK; /* we don't actually move */
-	      else {
-		WINDOW* clone = dupwin(win);  
+    /* Copying subwindows is allowed, but it is expensive... */
+    if (win->_flags & _SUBWIN) {
+	int err = ERR;
+	WINDOW *parent = win->_parent;
+	if (parent) {		/* Now comes the complicated and costly part, you should really
+				 * try to avoid to move subwindows. Because a subwindow shares
+				 * the text buffers with its parent, one can't do a simple
+				 * memmove of the text buffers. One has to create a copy, then
+				 * to relocate the subwindow and then to do a copy.
+				 */
+	    if ((by - parent->_begy == win->_pary) &&
+		(bx - parent->_begx == win->_parx))
+		err = OK;	/* we don't actually move */
+	    else {
+		WINDOW *clone = dupwin(win);
 		if (clone) {
-		  /* now we have the clone, so relocate win */
-		  
-		  werase(win);             /* Erase the original place     */
-		  wbkgd(win,parent->_bkgd);/* fill with parents background */
-		  wsyncup(win);            /* Tell the parent(s)           */
-		  
-		  err = mvderwin(win,                   
-				 by - parent->_begy,
-				 bx - parent->_begx);
-		  if (err!=ERR) {
-		    err = copywin(clone,win,
-				  0, 0, 0, 0, win->_maxy, win->_maxx, 0);
-		    if (ERR!=err)
-		      wsyncup(win);
-		  }
-		  if (ERR==delwin(clone))
-		    err=ERR;
+		    /* now we have the clone, so relocate win */
+
+		    werase(win);	/* Erase the original place     */
+		    wbkgd(win, parent->_bkgd);	/* fill with parents background */
+		    wsyncup(win);	/* Tell the parent(s)           */
+
+		    err = mvderwin(win,
+				   by - parent->_begy,
+				   bx - parent->_begx);
+		    if (err != ERR) {
+			err = copywin(clone, win,
+				      0, 0, 0, 0, win->_maxy, win->_maxx, 0);
+			if (ERR != err)
+			    wsyncup(win);
+		    }
+		    if (ERR == delwin(clone))
+			err = ERR;
 		}
-	      }
 	    }
-	  returnCode(err);
 	}
+	returnCode(err);
+    }
 
-	if (by + win->_maxy > screen_lines - 1
-	||  bx + win->_maxx > screen_columns - 1
-	||  by < 0
-	||  bx < 0)
-	    returnCode(ERR);
+    if (by + win->_maxy > screen_lines - 1
+	|| bx + win->_maxx > screen_columns - 1
+	|| by < 0
+	|| bx < 0)
+	returnCode(ERR);
 
-	/*
-	 * Whether or not the window is moved, touch the window's contents so
-	 * that a following call to 'wrefresh()' will paint the window at the
-	 * new location.  This ensures that if the caller has refreshed another
-	 * window at the same location, that this one will be displayed.
-	 */	
-	win->_begy = by;
-	win->_begx = bx;
-	returnCode(touchwin(win));
+    /*
+     * Whether or not the window is moved, touch the window's contents so
+     * that a following call to 'wrefresh()' will paint the window at the
+     * new location.  This ensures that if the caller has refreshed another
+     * window at the same location, that this one will be displayed.
+     */
+    win->_begy = by;
+    win->_begx = bx;
+    returnCode(touchwin(win));
 }