ncurses 5.6 - patch 20080816

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

diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c
index fe201d6b8e27054570510fe736c7a549a6e77f27..05982b84cee4c9b5cfba85c7b5b2a9f54390ddad 100644 (file)
--- a/ncurses/base/lib_newterm.c
+++ b/ncurses/base/lib_newterm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2006 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -48,7 +48,7 @@
 #include <term.h>              /* clear_screen, cup & friends, cur_term */
 #include <tic.h>
 
 #include <term.h>              /* clear_screen, cup & friends, cur_term */
 #include <tic.h>
 

-MODULE_ID("$Id: lib_newterm.c,v 1.64 2006/01/14 15:36:24 tom Exp $")
+MODULE_ID("$Id: lib_newterm.c,v 1.73 2008/08/16 21:20:48 Werner.Fink Exp $")

 
 #ifndef ONLCR                  /* Allows compilation under the QNX 4.2 OS */
 #define ONLCR 0
 
 #ifndef ONLCR                  /* Allows compilation under the QNX 4.2 OS */
 #define ONLCR 0


@@ -94,14 +94,12 @@ _nc_initscr(void)
  * aside from possibly delaying a filter() call until some terminals have been
  * initialized.
  */
  * aside from possibly delaying a filter() call until some terminals have been
  * initialized.
  */

-static bool filter_mode = FALSE;
-

 NCURSES_EXPORT(void)
 filter(void)
 {
     START_TRACE();
     T((T_CALLED("filter")));
 NCURSES_EXPORT(void)
 filter(void)
 {
     START_TRACE();
     T((T_CALLED("filter")));

-    filter_mode = TRUE;
+    _nc_prescreen.filter_mode = TRUE;

     returnVoid;
 }
 
     returnVoid;
 }
 


@@ -115,7 +113,7 @@ nofilter(void)
 {
     START_TRACE();
     T((T_CALLED("nofilter")));
 {
     START_TRACE();
     T((T_CALLED("nofilter")));

-    filter_mode = FALSE;
+    _nc_prescreen.filter_mode = FALSE;

     returnVoid;
 }
 #endif
     returnVoid;
 }
 #endif


@@ -125,34 +123,55 @@ newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp)
 {
     int value;
     int errret;
 {
     int value;
     int errret;

-    int slk_format = _nc_slk_format;

     SCREEN *current;
     SCREEN *result = 0;
     SCREEN *current;
     SCREEN *result = 0;

+    TERMINAL *its_term;

 
     START_TRACE();
     T((T_CALLED("newterm(\"%s\",%p,%p)"), name, ofp, ifp));
 
 
     START_TRACE();
     T((T_CALLED("newterm(\"%s\",%p,%p)"), name, ofp, ifp));
 

-    _nc_handle_sigwinch(0);
+    _nc_init_pthreads();
+    _nc_lock_global(curses);

 
 

-    /* allow user to set maximum escape delay from the environment */
-    if ((value = _nc_getenv_num("ESCDELAY")) >= 0) {
-       ESCDELAY = value;
-    }
+    current = SP;
+    its_term = (SP ? SP->_term : 0);

 
     /* this loads the capability entry, then sets LINES and COLS */
 
     /* this loads the capability entry, then sets LINES and COLS */

-    if (setupterm(name, fileno(ofp), &errret) == ERR) {
-       result = 0;
-    } else {
+    if (setupterm(name, fileno(ofp), &errret) != ERR) {
+       int slk_format = _nc_globals.slk_format;
+

        /*
         * This actually allocates the screen structure, and saves the original
         * terminal settings.
         */
        /*
         * This actually allocates the screen structure, and saves the original
         * terminal settings.
         */

-       current = SP;

        _nc_set_screen(0);
        _nc_set_screen(0);

-       if (_nc_setupscreen(LINES, COLS, ofp, filter_mode, slk_format) == ERR) {
+
+       /* allow user to set maximum escape delay from the environment */
+       if ((value = _nc_getenv_num("ESCDELAY")) >= 0) {
+           set_escdelay(value);
+       }
+
+       if (_nc_setupscreen(LINES,
+                           COLS,
+                           ofp,
+                           _nc_prescreen.filter_mode,
+                           slk_format) == ERR) {

            _nc_set_screen(current);
            result = 0;
        } else {
            _nc_set_screen(current);
            result = 0;
        } else {

+           assert(SP != 0);
+           /*
+            * In setupterm() we did a set_curterm(), but it was before we set
+            * SP.  So the "current" screen's terminal pointer was overwritten
+            * with a different terminal.  Later, in _nc_setupscreen(), we set
+            * SP and the terminal pointer in the new screen.
+            *
+            * Restore the terminal-pointer for the pre-existing screen, if
+            * any.
+            */
+           if (current)
+               current->_term = its_term;
+

            /* if the terminal type has real soft labels, set those up */
            if (slk_format && num_labels > 0 && SLK_STDFMT(slk_format))
                _nc_slk_initialize(stdscr, COLS);
            /* if the terminal type has real soft labels, set those up */
            if (slk_format && num_labels > 0 && SLK_STDFMT(slk_format))
                _nc_slk_initialize(stdscr, COLS);


@@ -211,6 +230,6 @@ newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp)
            result = SP;
        }
     }
            result = SP;
        }
     }

-    _nc_handle_sigwinch(1);
+    _nc_unlock_global(curses);

     returnSP(result);
 }
     returnSP(result);
 }