ncurses 5.6 - patch 20080830

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

diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index 7bab0c77b02ba3e2bb09c16409ec811baca34463..b92c403359584a220126716946a110cd927d671f 100644 (file)
--- 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-2007,2008 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,47 @@
 
 #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.17 2008/06/07 14:10:56 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 (each_window(p)) {
+       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 (_nc_try_global(curses) == 0) {
        if (win == 0
-        || have_children(win))
-               returnCode(ERR);
+           || cannot_delete(win)) {
+           result = ERR;
+       } else {
 
-       if (win->_flags & _SUBWIN)
+           if (win->_flags & _SUBWIN)
                touchwin(win->_parent);
-       else if (curscr != 0)
+           else if (curscr != 0)
                touchwin(curscr);
 
-       _nc_freewin(win);
-
-       returnCode(OK);
+           result = _nc_freewin(win);
+       }
+       _nc_unlock_global(curses);
+    }
+    returnCode(result);
 }