/****************************************************************************
- * Copyright (c) 1998-2001,2007 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 *
#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.17 2008/06/07 14:10:56 tom Exp $")
static bool
cannot_delete(WINDOW *win)
WINDOWLIST *p;
bool result = TRUE;
- for (p = _nc_windows; p != 0; p = p->next) {
+ for (each_window(p)) {
if (&(p->win) == win) {
result = FALSE;
} else if ((p->win._flags & _SUBWIN) != 0
T((T_CALLED("delwin(%p)"), win));
- _nc_lock_global(windowlist);
- if (win == 0
- || cannot_delete(win)) {
- result = ERR;
- } else {
+ if (_nc_try_global(curses) == 0) {
+ if (win == 0
+ || cannot_delete(win)) {
+ result = ERR;
+ } else {
- if (win->_flags & _SUBWIN)
- touchwin(win->_parent);
- else if (curscr != 0)
- touchwin(curscr);
+ if (win->_flags & _SUBWIN)
+ touchwin(win->_parent);
+ else if (curscr != 0)
+ touchwin(curscr);
- result = _nc_freewin(win);
+ result = _nc_freewin(win);
+ }
+ _nc_unlock_global(curses);
}
- _nc_unlock_global(windowlist);
returnCode(result);
}