ncurses 6.3 - patch 20211115

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

diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index e16f7878b6ce93649cbe2bf6f6d087bef00e3218..ce793e537f652e39d6b70dd134f126c8652326c5 100644 (file)
--- a/ncurses/base/lib_delwin.c
+++ b/ncurses/base/lib_delwin.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2007 Free Software Foundation, Inc.              *
+ * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 1998-2008,2009 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            *
@@ -29,6 +30,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                         2008                    *
  ****************************************************************************/
 
 /*
@@ -40,21 +43,28 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_delwin.c,v 1.14 2007/11/03 20:24:15 tom Exp $")
+MODULE_ID("$Id: lib_delwin.c,v 1.23 2021/11/15 23:05:32 tom Exp $")
 
 static bool
 cannot_delete(WINDOW *win)
 {
     WINDOWLIST *p;
     bool result = TRUE;
+    if (IS_PAD(win)) {
+       result = FALSE;
+    } else {
+#ifdef USE_SP_WINDOWLIST
+       SCREEN *sp = _nc_screen_of(win);
+#endif
 
-    for (p = _nc_windows; p != 0; p = p->next) {
-       if (&(p->win) == win) {
-           result = FALSE;
-       } else if ((p->win._flags & _SUBWIN) != 0
-                  && p->win._parent == win) {
-           result = TRUE;
-           break;
+       for (each_window(SP_PARM, p)) {
+           if (&(p->win) == win) {
+               result = FALSE;
+           } else if (IS_SUBWIN(&(p->win))
+                      && p->win._parent == win) {
+               result = TRUE;
+               break;
+           }
        }
     }
     return result;
@@ -65,21 +75,27 @@ delwin(WINDOW *win)
 {
     int result = ERR;
 
-    T((T_CALLED("delwin(%p)"), win));
-
-    _nc_lock_global(windowlist);
-    if (win == 0
-       || cannot_delete(win)) {
-       result = ERR;
-    } else {
+    T((T_CALLED("delwin(%p)"), (void *) win));
 
-       if (win->_flags & _SUBWIN)
-           touchwin(win->_parent);
-       else if (curscr != 0)
-           touchwin(curscr);
-
-       result = _nc_freewin(win);
+    if (_nc_try_global(curses) == 0) {
+       if (win == 0
+           || cannot_delete(win)) {
+           result = ERR;
+       } else if (IS_PAD(win)) {
+           win->_parent = NULL;
+           result = _nc_freewin(win);
+       } else {
+#if NCURSES_SP_FUNCS
+           SCREEN *sp = _nc_screen_of(win);
+#endif
+           if (IS_SUBWIN(win)) {
+               touchwin(win->_parent);
+           } else if (CurScreen(SP_PARM) != 0) {
+               touchwin(CurScreen(SP_PARM));
+           }
+           result = _nc_freewin(win);
+       }
+       _nc_unlock_global(curses);
     }
-    _nc_unlock_global(windowlist);
     returnCode(result);
 }