X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_set_term.c;h=e44850c6a15a2fb81e2eb728a76ca3c2da8e7edd;hp=14a821e778d0472cac107852589ee0b660204509;hb=88d50b5d7057d4f59c586c93ff290d0a39528f70;hpb=3faafb2efcc426a48649c12943d5006cae12cff1;ds=sidebyside

diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 14a821e7..e44850c6 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.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            *
@@ -44,7 +44,7 @@
 #include <term.h>		/* cur_term */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_set_term.c,v 1.97 2007/04/26 19:39:48 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.103 2008/02/03 20:31:08 tom Exp $")
 
 NCURSES_EXPORT(SCREEN *)
 set_term(SCREEN *screenp)
@@ -53,6 +53,8 @@ set_term(SCREEN *screenp)
 
     T((T_CALLED("set_term(%p)"), screenp));
 
+    _nc_lock_global(set_SP);
+
     oldSP = SP;
     _nc_set_screen(screenp);
 
@@ -65,6 +67,8 @@ set_term(SCREEN *screenp)
     COLOR_PAIRS = SP->_pair_count;
 #endif
 
+    _nc_unlock_global(set_SP);
+
     T((T_RETURN("%p"), oldSP));
     return (oldSP);
 }
@@ -90,6 +94,7 @@ delscreen(SCREEN *sp)
 
     T((T_CALLED("delscreen(%p)"), sp));
 
+    _nc_lock_global(set_SP);
     while (*scan) {
 	if (*scan == sp) {
 	    *scan = sp->_next_screen;
@@ -163,11 +168,11 @@ delscreen(SCREEN *sp)
 #endif
 	_nc_set_screen(0);
     }
+    _nc_unlock_global(set_SP);
+
     returnVoid;
 }
 
-#define N_RIPS SIZEOF(SP->_rippedoff)
-
 static bool
 no_mouse_event(SCREEN *sp GCC_UNUSED)
 {
@@ -216,9 +221,6 @@ extract_fgbg(char *src, int *result)
 }
 #endif
 
-#define ripoff_sp	_nc_prescreen.rsp
-#define ripoff_stack	_nc_prescreen.rippedoff
-
 /* OS-independent screen initializations */
 NCURSES_EXPORT(int)
 _nc_setupscreen(int slines GCC_UNUSED,
@@ -227,9 +229,10 @@ _nc_setupscreen(int slines GCC_UNUSED,
 		bool filtered,
 		int slk_format)
 {
+    char *env;
     int bottom_stolen = 0;
-    int i;
     bool support_cookies = USE_XMC_SUPPORT;
+    ripoff_t *rop;
 
     T((T_CALLED("_nc_setupscreen(%d, %d, %p, %d, %d)"),
        slines, scolumns, output, filtered, slk_format));
@@ -271,18 +274,6 @@ _nc_setupscreen(int slines GCC_UNUSED,
 	cursor_home = carriage_return;
 	T(("filter screensize %dx%d", LINES, COLS));
     }
-
-    /* If we must simulate soft labels, grab off the line to be used.
-       We assume that we must simulate, if it is none of the standard
-       formats (4-4  or 3-2-3) for which there may be some hardware
-       support. */
-    if (num_labels <= 0 || !SLK_STDFMT(slk_format)) {
-	if (slk_format) {
-	    if (ERR == _nc_ripoffline(-SLK_LINES(slk_format),
-				      _nc_slk_initialize))
-		returnCode(ERR);
-	}
-    }
 #ifdef __DJGPP__
     T(("setting output mode to binary"));
     fflush(output);
@@ -511,13 +502,12 @@ _nc_setupscreen(int slines GCC_UNUSED,
     _nc_init_wacs();
 
     SP->_screen_acs_fix = (_nc_unicode_locale() && _nc_locale_breaks_acs());
-    {
-	char *env = _nc_get_locale();
-	SP->_legacy_coding = ((env == 0)
-			      || !strcmp(env, "C")
-			      || !strcmp(env, "POSIX"));
-    }
 #endif
+    env = _nc_get_locale();
+    SP->_legacy_coding = ((env == 0)
+			  || !strcmp(env, "C")
+			  || !strcmp(env, "POSIX"));
+    T(("legacy-coding %d", SP->_legacy_coding));
 
     _nc_idcok = TRUE;
     _nc_idlok = FALSE;
@@ -549,38 +539,45 @@ _nc_setupscreen(int slines GCC_UNUSED,
     def_shell_mode();
     def_prog_mode();
 
-    for (i = 0, ripoff_sp = ripoff_stack;
-	 ripoff_sp->line && (i < (int) N_RIPS);
-	 ripoff_sp++, i++) {
-
-	T(("ripping off line %d at %s", i,
-	   ((ripoff_sp->line < 0)
-	    ? "bottom"
-	    : "top")));
-
-	SP->_rippedoff[i] = ripoff_stack[i];
-	if (ripoff_sp->hook) {
-	    int count = (ripoff_sp->line < 0) ? -ripoff_sp->line : ripoff_sp->line;
-
-	    SP->_rippedoff[i].w = newwin(count,
-					 scolumns,
-					 ((ripoff_sp->line < 0)
-					  ? SP->_lines_avail - count
-					  : 0),
-					 0);
-	    if (SP->_rippedoff[i].w != 0)
-		SP->_rippedoff[i].hook(SP->_rippedoff[i].w, scolumns);
-	    else
+    for (rop = ripoff_stack;
+	 rop != ripoff_sp && (rop - ripoff_stack) < N_RIPS;
+	 rop++) {
+
+	/* If we must simulate soft labels, grab off the line to be used.
+	   We assume that we must simulate, if it is none of the standard
+	   formats (4-4 or 3-2-3) for which there may be some hardware
+	   support. */
+	if (rop->hook == _nc_slk_initialize)
+	    if (!(num_labels <= 0 || !SLK_STDFMT(slk_format)))
+		continue;
+	if (rop->hook) {
+	    int count;
+	    WINDOW *w;
+
+	    count = (rop->line < 0) ? -rop->line : rop->line;
+	    T(("ripping off %i lines at %s", count,
+	       ((rop->line < 0)
+		? "bottom"
+		: "top")));
+
+	    w = newwin(count, scolumns,
+		       ((rop->line < 0)
+			? SP->_lines_avail - count
+			: 0),
+		       0);
+	    if (w) {
+		rop->win = w;
+		rop->hook(w, scolumns);
+	    } else {
 		returnCode(ERR);
-	    if (ripoff_sp->line < 0)
+	    }
+	    if (rop->line < 0)
 		bottom_stolen += count;
 	    else
 		SP->_topstolen += count;
 	    SP->_lines_avail -= count;
 	}
-	ripoff_sp->line = 0;
     }
-    SP->_rip_count = i;
     /* reset the stack */
     ripoff_sp = ripoff_stack;
 
@@ -615,7 +612,6 @@ _nc_ripoffline(int line, int (*init) (WINDOW *, int))
 
 	ripoff_sp->line = line;
 	ripoff_sp->hook = init;
-	ripoff_sp->w = 0;
 	ripoff_sp++;
     }
 
@@ -625,6 +621,7 @@ _nc_ripoffline(int line, int (*init) (WINDOW *, int))
 NCURSES_EXPORT(int)
 ripoffline(int line, int (*init) (WINDOW *, int))
 {
+    START_TRACE();
     T((T_CALLED("ripoffline(%d,%p)"), line, init));
 
     if (line == 0)