diff options
| author |   nicm <nicm@openbsd.org> | 2010-01-12 23:21:58 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-01-12 23:21:58 +0000 |
| commit | 81d8c4e1e65ef590376b5b08744af794c42bd575 (patch) | |
| tree | 7699ed6e10b41563ce3a6734235390cce070489c /lib/libcurses/base/lib_delwin.c | |
| parent | save errno wrapping in a signal handler (diff) | |
| download | wireguard-openbsd-81d8c4e1e65ef590376b5b08744af794c42bd575.tar.xz wireguard-openbsd-81d8c4e1e65ef590376b5b08744af794c42bd575.zip | |
Update to ncurses 5.7, with local changes reapplied.
This is around eight years worth of changes (previously we were around ncurses
5.2), too many to list - many bug fixes and also a few new functions.
A major bump for libcurses, libpanel, libform and libmenu.
ok deraadt
Diffstat (limited to 'lib/libcurses/base/lib_delwin.c')
| -rw-r--r-- | lib/libcurses/base/lib_delwin.c | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/lib/libcurses/base/lib_delwin.c b/lib/libcurses/base/lib_delwin.c index 5358ae94f00..15a52a36953 100644 --- a/lib/libcurses/base/lib_delwin.c +++ b/lib/libcurses/base/lib_delwin.c @@ -1,7 +1,7 @@ -/* $OpenBSD: lib_delwin.c,v 1.2 2001/01/22 18:01:38 millert Exp $ */ +/* $OpenBSD: lib_delwin.c,v 1.3 2010/01/12 23:22:05 nicm Exp $ */ /**************************************************************************** - * Copyright (c) 1998,2000 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 * @@ -42,7 +42,7 @@ #include <curses.priv.h> -MODULE_ID("$From: lib_delwin.c,v 1.12 2000/12/10 02:43:27 tom Exp $") +MODULE_ID("$Id: lib_delwin.c,v 1.3 2010/01/12 23:22:05 nicm Exp $") static bool cannot_delete(WINDOW *win) @@ -50,11 +50,11 @@ cannot_delete(WINDOW *win) WINDOWLIST *p; bool result = TRUE; - for (p = _nc_windows; p != 0; p = p->next) { - if (p->win == win) { + for (each_window(p)) { + if (&(p->win) == win) { result = FALSE; - } else if ((p->win->_flags & _SUBWIN) != 0 - && p->win->_parent == win) { + } else if ((p->win._flags & _SUBWIN) != 0 + && p->win._parent == win) { result = TRUE; break; } @@ -65,16 +65,24 @@ cannot_delete(WINDOW *win) NCURSES_EXPORT(int) delwin(WINDOW *win) { + int result = ERR; + T((T_CALLED("delwin(%p)"), win)); - if (win == 0 - || cannot_delete(win)) - returnCode(ERR); + 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); - returnCode(_nc_freewin(win)); + result = _nc_freewin(win); + } + _nc_unlock_global(curses); + } + returnCode(result); } |