diff options
Diffstat (limited to 'ncurses/base/lib_delwin.c')
| -rw-r--r-- | ncurses/base/lib_delwin.c | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c index 2f0621cf856c..c96e417a9a48 100644 --- a/ncurses/base/lib_delwin.c +++ b/ncurses/base/lib_delwin.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2021,2023 Thomas E. Dickey * * Copyright 1998-2008,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,24 +43,29 @@ #include <curses.priv.h> -MODULE_ID("$Id: lib_delwin.c,v 1.21 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_delwin.c,v 1.25 2023/10/21 11:12:44 tom Exp $") static bool cannot_delete(WINDOW *win) { - WINDOWLIST *p; bool result = TRUE; -#ifdef USE_SP_WINDOWLIST - SCREEN *sp = _nc_screen_of(win); + + if (IS_PAD(win)) { + result = FALSE; + } else { + WINDOWLIST *p; +#if NCURSES_SP_FUNCS && defined(USE_SP_WINDOWLIST) + SCREEN *sp = _nc_screen_of(win); #endif - for (each_window(SP_PARM, p)) { - 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; @@ -77,15 +82,18 @@ delwin(WINDOW *win) if (win == 0 || cannot_delete(win)) { result = ERR; + } else if (IS_PAD(win)) { + win->_parent = NULL; + result = _nc_freewin(win); } else { #if NCURSES_SP_FUNCS SCREEN *sp = _nc_screen_of(win); #endif - if (win->_flags & _SUBWIN) + if (IS_SUBWIN(win)) { touchwin(win->_parent); - else if (CurScreen(SP_PARM) != 0) + } else if (CurScreen(SP_PARM) != 0) { touchwin(CurScreen(SP_PARM)); - + } result = _nc_freewin(win); } _nc_unlock_global(curses); |