ncurses 5.6 - patch 20080517

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

diff --git a/ncurses/base/lib_newwin.c b/ncurses/base/lib_newwin.c
index 19f3ec85ccdc24d52987b32a4e8793e018a63c7c..7f7aa3e04f1e8ca01f66e88008ebd9fc2f41ef10 100644 (file)
--- a/ncurses/base/lib_newwin.c
+++ b/ncurses/base/lib_newwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2006,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            *
@@ -40,36 +40,39 @@
 */
 
 #include <curses.priv.h>
+#include <stddef.h>
 
-MODULE_ID("$Id: lib_newwin.c,v 1.39 2007/02/03 23:09:20 tom Exp $")
+MODULE_ID("$Id: lib_newwin.c,v 1.50 2008/05/03 16:36:39 tom Exp $")
 
-static WINDOW *
+#define window_is(name) ((sp)->_##name == win)
+
+#if USE_REENTRANT
+#define remove_window(name) \
+               sp->_##name = 0
+#else
+#define remove_window(name) \
+               sp->_##name = 0; \
+               if (win == name) \
+                   name = 0
+#endif
+
+static void
 remove_window_from_screen(WINDOW *win)
 {
-    SCREEN **scan = &_nc_screen_chain;
-
-    while (*scan) {
-       SCREEN *sp = *scan;
-       if (sp->_curscr == win) {
-           sp->_curscr = 0;
-           if (win == curscr)
-               curscr = 0;
-       } else if (sp->_stdscr == win) {
-           sp->_stdscr = 0;
-           if (win == stdscr)
-               stdscr = 0;
-       } else if (sp->_newscr == win) {
-           sp->_newscr = 0;
-           if (win == newscr)
-               newscr = 0;
-       } else {
-           scan = &(*scan)->_next_screen;
-           continue;
+    SCREEN *sp;
+
+    for (each_screen(sp)) {
+       if (window_is(curscr)) {
+           remove_window(curscr);
+           break;
+       } else if (window_is(stdscr)) {
+           remove_window(stdscr);
+           break;
+       } else if (window_is(newscr)) {
+           remove_window(newscr);
+           break;
        }
-       break;
     }
-
-    return 0;
 }
 
 NCURSES_EXPORT(int)
@@ -79,29 +82,36 @@ _nc_freewin(WINDOW *win)
     int i;
     int result = ERR;
 
+    T((T_CALLED("_nc_freewin(%p)"), win));
+
     if (win != 0) {
-       for (p = _nc_windows, q = 0; p != 0; q = p, p = p->next) {
-           if (&(p->win) == win) {
-               remove_window_from_screen(win);
-               if (q == 0)
-                   _nc_windows = p->next;
-               else
-                   q->next = p->next;
-
-               if (!(win->_flags & _SUBWIN)) {
-                   for (i = 0; i <= win->_maxy; i++)
-                       FreeIfNeeded(win->_line[i].text);
+       if (_nc_try_global(windowlist) == 0) {
+           q = 0;
+           for (each_window(p)) {
+               if (&(p->win) == win) {
+                   remove_window_from_screen(win);
+                   if (q == 0)
+                       _nc_windows = p->next;
+                   else
+                       q->next = p->next;
+
+                   if (!(win->_flags & _SUBWIN)) {
+                       for (i = 0; i <= win->_maxy; i++)
+                           FreeIfNeeded(win->_line[i].text);
+                   }
+                   free(win->_line);
+                   free(p);
+
+                   result = OK;
+                   T(("...deleted win=%p", win));
+                   break;
                }
-               free(win->_line);
-               free(p);
-
-               result = OK;
-               T(("...deleted win=%p", win));
-               break;
+               q = p;
            }
+           _nc_unlock_global(windowlist);
        }
     }
-    return result;
+    returnCode(result);
 }
 
 NCURSES_EXPORT(WINDOW *)
@@ -219,6 +229,8 @@ _nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags)
     if ((wp = typeCalloc(WINDOWLIST, 1)) == 0)
        returnWin(0);
 
+    _nc_mutex_init(&(wp->mutex_use_window));
+
     win = &(wp->win);
 
     if ((win->_line = typeCalloc(struct ldat, ((unsigned) num_lines))) == 0) {
@@ -226,6 +238,8 @@ _nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags)
        returnWin(0);
     }
 
+    _nc_lock_global(windowlist);
+
     win->_curx = 0;
     win->_cury = 0;
     win->_maxy = num_lines - 1;
@@ -303,5 +317,6 @@ _nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags)
 
     T((T_CREATE("window %p"), win));
 
+    _nc_unlock_global(windowlist);
     returnWin(win);
 }