date and time created 83/11/11 15:12:49 by ralph

[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 81aab37..97af8b7 100644 (file)
--- a/usr/src/lib/libcurses/delwin.c
+++ b/usr/src/lib/libcurses/delwin.c
@@ -3,7 +3,7 @@
 /*
  *     This routine deletes a window and releases it back to the system.
  *
 /*
  *     This routine deletes a window and releases it back to the system.
  *

- * %G% (Berkeley) @(#)delwin.c 1.4
+ * %G% (Berkeley) @(#)delwin.c 1.5

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


@@ -12,6 +12,10 @@ reg WINDOW   *win; {
        reg WINDOW      *wp, *np;
 
        if (win->_orig == NULL) {
        reg WINDOW      *wp, *np;
 
        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++)
                        cfree(win->_y[i]);
                wp = win->_nextp;
                for (i = 0; i < win->_maxy && win->_y[i]; i++)
                        cfree(win->_y[i]);
                wp = win->_nextp;


@@ -21,6 +25,17 @@ reg WINDOW   *win; {
                        wp = np;
                }
        }
                        wp = np;
                }
        }

+       else {
+               /*
+                * If we are a subwindow, take ourself 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;
+       }

        cfree(win->_y);
        cfree(win->_firstch);
        cfree(win->_lastch);
        cfree(win->_y);
        cfree(win->_firstch);
        cfree(win->_lastch);