X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_set_term.c;h=46779e08f1e1668d448e5c9dcd9fd0895e47607d;hp=eee1cfc7b2590b463e4695e5483c77a8851f91ed;hb=ca276baf720e3a44721b9e18955d3f546955c6c8;hpb=ed530db2c5b10aa19d06104dfe82cf248a813860

diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index eee1cfc7..46779e08 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -44,28 +44,30 @@
 #include <term.h>		/* cur_term */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_set_term.c,v 1.108 2008/05/03 22:42:43 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.113 2008/06/21 19:00:09 tom Exp $")
 
 NCURSES_EXPORT(SCREEN *)
 set_term(SCREEN *screenp)
 {
     SCREEN *oldSP;
+    SCREEN *newSP;
 
     T((T_CALLED("set_term(%p)"), screenp));
 
-    _nc_lock_global(set_SP);
+    _nc_lock_global(curses);
 
     oldSP = SP;
     _nc_set_screen(screenp);
+    newSP = SP;
 
-    if (SP != 0) {
-	set_curterm(SP->_term);
+    if (newSP != 0) {
+	set_curterm(newSP->_term);
 #if !USE_REENTRANT
-	curscr = SP->_curscr;
-	newscr = SP->_newscr;
-	stdscr = SP->_stdscr;
-	COLORS = SP->_color_count;
-	COLOR_PAIRS = SP->_pair_count;
+	curscr = newSP->_curscr;
+	newscr = newSP->_newscr;
+	stdscr = newSP->_stdscr;
+	COLORS = newSP->_color_count;
+	COLOR_PAIRS = newSP->_pair_count;
 #endif
     } else {
 	set_curterm(0);
@@ -78,7 +80,7 @@ set_term(SCREEN *screenp)
 #endif
     }
 
-    _nc_unlock_global(set_SP);
+    _nc_unlock_global(curses);
 
     T((T_RETURN("%p"), oldSP));
     return (oldSP);
@@ -125,7 +127,7 @@ delscreen(SCREEN *sp)
 
     T((T_CALLED("delscreen(%p)"), sp));
 
-    _nc_lock_global(set_SP);
+    _nc_lock_global(curses);
     if (delink_screen(sp)) {
 
 	(void) _nc_freewin(sp->_curscr);
@@ -162,8 +164,6 @@ delscreen(SCREEN *sp)
 	FreeIfNeeded(sp->_acs_map);
 	FreeIfNeeded(sp->_screen_acs_map);
 
-	del_curterm(sp->_term);
-
 	/*
 	 * If the associated output stream has been closed, we can discard the
 	 * set-buffer.  Limit the error check to EBADF, since fflush may fail
@@ -176,6 +176,7 @@ delscreen(SCREEN *sp)
 	    free(sp->_setbuf);
 	}
 
+	del_curterm(sp->_term);
 	free(sp);
 
 	/*
@@ -194,7 +195,7 @@ delscreen(SCREEN *sp)
 	    _nc_set_screen(0);
 	}
     }
-    _nc_unlock_global(set_SP);
+    _nc_unlock_global(curses);
 
     returnVoid;
 }
@@ -212,7 +213,7 @@ no_mouse_inline(SCREEN *sp GCC_UNUSED)
 }
 
 static bool
-no_mouse_parse(int code GCC_UNUSED)
+no_mouse_parse(SCREEN *sp GCC_UNUSED, int code GCC_UNUSED)
 {
     return TRUE;
 }