X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_delwin.c;h=ce793e537f652e39d6b70dd134f126c8652326c5;hp=fc68f9d68deeef6f3f7d1065e0151947ceb53a9f;hb=214f159cd8c0ea4fba47beb249379d0da2dfb8ca;hpb=e0371a7943009d611a4dc080dcddfcdfba9f589b

diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index fc68f9d6..ce793e53 100644
--- 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.15 2007/12/22 23:34:26 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,25 +75,27 @@ delwin(WINDOW *win)
 {
     int result = ERR;
 
-    T((T_CALLED("delwin(%p)"), win));
+    T((T_CALLED("delwin(%p)"), (void *) win));
 
-    if (_nc_try_global(windowlist) == 0) {
-	_nc_lock_window(win);
+    if (_nc_try_global(curses) == 0) {
 	if (win == 0
 	    || cannot_delete(win)) {
 	    result = ERR;
-	    _nc_unlock_window(win);
+	} else if (IS_PAD(win)) {
+	    win->_parent = NULL;
+	    result = _nc_freewin(win);
 	} else {
-
-	    if (win->_flags & _SUBWIN)
+#if NCURSES_SP_FUNCS
+	    SCREEN *sp = _nc_screen_of(win);
+#endif
+	    if (IS_SUBWIN(win)) {
 		touchwin(win->_parent);
-	    else if (curscr != 0)
-		touchwin(curscr);
-
-	    _nc_unlock_window(win);
+	    } else if (CurScreen(SP_PARM) != 0) {
+		touchwin(CurScreen(SP_PARM));
+	    }
 	    result = _nc_freewin(win);
 	}
-	_nc_unlock_global(windowlist);
+	_nc_unlock_global(curses);
     }
     returnCode(result);
 }