X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_delwin.c;h=e16f7878b6ce93649cbe2bf6f6d087bef00e3218;hp=7bab0c77b02ba3e2bb09c16409ec811baca34463;hb=9378ce0407e95f6b1e2c20ec5035f0916d278944;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index 7bab0c77..e16f7878 100644
--- a/ncurses/base/lib_delwin.c
+++ b/ncurses/base/lib_delwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2001,2007 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            *
@@ -40,33 +40,46 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_delwin.c,v 1.9 1998/02/11 12:13:53 tom Exp $")
+MODULE_ID("$Id: lib_delwin.c,v 1.14 2007/11/03 20:24:15 tom Exp $")
 
-static bool have_children(WINDOW *win)
+static bool
+cannot_delete(WINDOW *win)
 {
-	WINDOWLIST *p;
-	for (p = _nc_windows; p != 0; p = p->next) {
-		if (p->win->_flags & _SUBWIN
-		 && p->win->_parent == win)
-			return TRUE;
+    WINDOWLIST *p;
+    bool result = TRUE;
+
+    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;
 	}
-	return FALSE;
+    }
+    return result;
 }
 
-int delwin(WINDOW *win)
+NCURSES_EXPORT(int)
+delwin(WINDOW *win)
 {
-	T((T_CALLED("delwin(%p)"), win));
+    int result = ERR;
+
+    T((T_CALLED("delwin(%p)"), win));
 
-	if (win == 0
-	 || have_children(win))
-		returnCode(ERR);
+    _nc_lock_global(windowlist);
+    if (win == 0
+	|| cannot_delete(win)) {
+	result = ERR;
+    } else {
 
 	if (win->_flags & _SUBWIN)
-		touchwin(win->_parent);
+	    touchwin(win->_parent);
 	else if (curscr != 0)
-		touchwin(curscr);
-
-	_nc_freewin(win);
+	    touchwin(curscr);
 
-	returnCode(OK);
+	result = _nc_freewin(win);
+    }
+    _nc_unlock_global(windowlist);
+    returnCode(result);
 }