BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libcurses / delwin.c

diff --git a/usr/src/lib/libcurses/delwin.c b/usr/src/lib/libcurses/delwin.c
index aa1313e..6935f87 100644 (file)
--- a/usr/src/lib/libcurses/delwin.c
+++ b/usr/src/lib/libcurses/delwin.c
@@ -1,20 +1,79 @@
+/*
+ * Copyright (c) 1981 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)delwin.c   5.4 (Berkeley) 6/1/90";
+#endif /* not lint */
+

 # include      "curses.ext"
 
 /*
  *     This routine deletes a window and releases it back to the system.
  *
 # include      "curses.ext"
 
 /*
  *     This routine deletes a window and releases it back to the system.
  *

- * %G% (Berkeley) @(#)delwin.c 1.2

  */
 delwin(win)
 reg WINDOW     *win; {
 
  */
 delwin(win)
 reg WINDOW     *win; {
 

-       reg int i;
+       reg int         i;
+       reg WINDOW      *wp, *np;

 
 

-       if (!(win->_flags & _SUBWIN))
+       if (win->_orig == NULL) {
+               /*
+                * If we are the original window, delete the space for
+                * all the subwindows, and the array of space as well.
+                */

                for (i = 0; i < win->_maxy && win->_y[i]; i++)
                for (i = 0; i < win->_maxy && win->_y[i]; i++)

-                       cfree(win->_y[i]);
-       cfree(win->_y);
-       cfree(win->_firstch);
-       cfree(win->_lastch);
-       cfree(win);
+                       free(win->_y[i]);
+               free(win->_firstch);
+               free(win->_lastch);
+               wp = win->_nextp;
+               while (wp != win) {
+                       np = wp->_nextp;
+                       delwin(wp);
+                       wp = np;
+               }
+       }
+       else {
+               /*
+                * If we are a subwindow, take ourselves out of the
+                * list.  NOTE: if we are a subwindow, the minimum list
+                * is orig followed by this subwindow, so there are
+                * always at least two windows in the list.
+                */
+               for (wp = win->_nextp; wp->_nextp != win; wp = wp->_nextp)
+                       continue;
+               wp->_nextp = win->_nextp;
+       }
+       free(win->_y);
+       free(win);

 }
 }