1 files changed, 109 insertions, 102 deletions

diff --git a/contrib/ncurses/ncurses/base/lib_newterm.c b/contrib/ncurses/ncurses/base/lib_newterm.c
index d95c4a9..fe201d6 100644
--- a/contrib/ncurses/ncurses/base/lib_newterm.c
+++ b/contrib/ncurses/ncurses/base/lib_newterm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc.         *
+ * Copyright (c) 1998-2005,2006 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            *
@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
 /*
@@ -47,7 +48,7 @@
 #include <term.h>		/* clear_screen, cup & friends, cur_term */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_newterm.c,v 1.52 2001/08/04 16:47:48 tom Exp $")
+MODULE_ID("$Id: lib_newterm.c,v 1.64 2006/01/14 15:36:24 tom Exp $")
 
 #ifndef ONLCR			/* Allows compilation under the QNX 4.2 OS */
 #define ONLCR 0
@@ -61,21 +62,30 @@ MODULE_ID("$Id: lib_newterm.c,v 1.52 2001/08/04 16:47:48 tom Exp $")
  * The newterm function also initializes terminal settings, and since initscr
  * is supposed to behave as if it calls newterm, we do it here.
  */
-static inline int
+static NCURSES_INLINE int
 _nc_initscr(void)
 {
+    int result = ERR;
+
     /* for extended XPG4 conformance requires cbreak() at this point */
     /* (SVr4 curses does this anyway) */
-    cbreak();
+    if (cbreak() == OK) {
+	TTY buf;
 
+	buf = cur_term->Nttyb;
 #ifdef TERMIOS
-    cur_term->Nttyb.c_lflag &= ~(ECHO | ECHONL);
-    cur_term->Nttyb.c_iflag &= ~(ICRNL | INLCR | IGNCR);
-    cur_term->Nttyb.c_oflag &= ~(ONLCR);
+	buf.c_lflag &= ~(ECHO | ECHONL);
+	buf.c_iflag &= ~(ICRNL | INLCR | IGNCR);
+	buf.c_oflag &= ~(ONLCR);
+#elif HAVE_SGTTY_H
+	buf.sg_flags &= ~(ECHO | CRMOD);
 #else
-    cur_term->Nttyb.sg_flags &= ~(ECHO | CRMOD);
+	memset(&buf, 0, sizeof(buf));
 #endif
-    return _nc_set_tty_mode(&cur_term->Nttyb);
+	if ((result = _nc_set_tty_mode(&buf)) == OK)
+	    cur_term->Nttyb = buf;
+    }
+    return result;
 }
 
 /*
@@ -84,126 +94,123 @@ _nc_initscr(void)
  * aside from possibly delaying a filter() call until some terminals have been
  * initialized.
  */
-static int filter_mode = FALSE;
+static bool filter_mode = FALSE;
 
 NCURSES_EXPORT(void)
 filter(void)
 {
+    START_TRACE();
     T((T_CALLED("filter")));
     filter_mode = TRUE;
     returnVoid;
 }
 
+#if NCURSES_EXT_FUNCS
+/*
+ * An extension, allowing the application to open a new screen without
+ * requiring it to also be filtered.
+ */
+NCURSES_EXPORT(void)
+nofilter(void)
+{
+    START_TRACE();
+    T((T_CALLED("nofilter")));
+    filter_mode = FALSE;
+    returnVoid;
+}
+#endif
+
 NCURSES_EXPORT(SCREEN *)
-newterm
-(NCURSES_CONST char *name, FILE * ofp, FILE * ifp)
+newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp)
 {
+    int value;
     int errret;
     int slk_format = _nc_slk_format;
     SCREEN *current;
-#ifdef TRACE
-    int t = _nc_getenv_num("NCURSES_TRACE");
-
-    if (t >= 0)
-	trace(t);
-#endif
+    SCREEN *result = 0;
 
+    START_TRACE();
     T((T_CALLED("newterm(\"%s\",%p,%p)"), name, ofp, ifp));
 
-    /* this loads the capability entry, then sets LINES and COLS */
-    if (setupterm(name, fileno(ofp), &errret) == ERR)
-	returnSP(0);
-
-    /* implement filter mode */
-    if (filter_mode) {
-	LINES = 1;
-
-	if (VALID_NUMERIC(init_tabs))
-	    TABSIZE = init_tabs;
-	else
-	    TABSIZE = 8;
-
-	T(("TABSIZE = %d", TABSIZE));
-
-	clear_screen = 0;
-	cursor_down = parm_down_cursor = 0;
-	cursor_address = 0;
-	cursor_up = parm_up_cursor = 0;
-	row_address = 0;
-
-	cursor_home = carriage_return;
-    }
+    _nc_handle_sigwinch(0);
 
-    /* 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))
-		returnSP(0);
-	}
-    /* this actually allocates the screen structure, and saves the
-     * original terminal settings.
-     */
-    current = SP;
-    _nc_set_screen(0);
-    if (_nc_setupscreen(LINES, COLS, ofp) == ERR) {
-	_nc_set_screen(current);
-	returnSP(0);
+    /* allow user to set maximum escape delay from the environment */
+    if ((value = _nc_getenv_num("ESCDELAY")) >= 0) {
+	ESCDELAY = value;
     }
 
-    /* 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);
-
-    SP->_ifd = fileno(ifp);
-    SP->_checkfd = fileno(ifp);
-    typeahead(fileno(ifp));
+    /* this loads the capability entry, then sets LINES and COLS */
+    if (setupterm(name, fileno(ofp), &errret) == ERR) {
+	result = 0;
+    } else {
+	/*
+	 * This actually allocates the screen structure, and saves the original
+	 * terminal settings.
+	 */
+	current = SP;
+	_nc_set_screen(0);
+	if (_nc_setupscreen(LINES, COLS, ofp, filter_mode, slk_format) == ERR) {
+	    _nc_set_screen(current);
+	    result = 0;
+	} else {
+	    /* 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);
+
+	    SP->_ifd = fileno(ifp);
+	    typeahead(fileno(ifp));
 #ifdef TERMIOS
-    SP->_use_meta = ((cur_term->Ottyb.c_cflag & CSIZE) == CS8 &&
-		     !(cur_term->Ottyb.c_iflag & ISTRIP));
+	    SP->_use_meta = ((cur_term->Ottyb.c_cflag & CSIZE) == CS8 &&
+			     !(cur_term->Ottyb.c_iflag & ISTRIP));
 #else
-    SP->_use_meta = FALSE;
+	    SP->_use_meta = FALSE;
 #endif
-    SP->_endwin = FALSE;
-
-    /* Check whether we can optimize scrolling under dumb terminals in case
-     * we do not have any of these capabilities, scrolling optimization
-     * will be useless.
-     */
-    SP->_scrolling = ((scroll_forward && scroll_reverse) ||
-		      ((parm_rindex || parm_insert_line || insert_line) &&
-		       (parm_index || parm_delete_line || delete_line)));
-
-    baudrate();			/* sets a field in the SP structure */
-
-    SP->_keytry = 0;
-
-    /*
-     * Check for mismatched graphic-rendition capabilities.  Most SVr4
-     * terminfo trees contain entries that have rmul or rmso equated to
-     * sgr0 (Solaris curses copes with those entries).  We do this only for
-     * curses, since many termcap applications assume that smso/rmso and
-     * smul/rmul are paired, and will not function properly if we remove
-     * rmso or rmul.  Curses applications shouldn't be looking at this
-     * detail.
-     */
+	    SP->_endwin = FALSE;
+
+	    /*
+	     * Check whether we can optimize scrolling under dumb terminals in
+	     * case we do not have any of these capabilities, scrolling
+	     * optimization will be useless.
+	     */
+	    SP->_scrolling = ((scroll_forward && scroll_reverse) ||
+			      ((parm_rindex ||
+				parm_insert_line ||
+				insert_line) &&
+			       (parm_index ||
+				parm_delete_line ||
+				delete_line)));
+
+	    baudrate();		/* sets a field in the SP structure */
+
+	    SP->_keytry = 0;
+
+	    /*
+	     * Check for mismatched graphic-rendition capabilities.  Most SVr4
+	     * terminfo trees contain entries that have rmul or rmso equated to
+	     * sgr0 (Solaris curses copes with those entries).  We do this only
+	     * for curses, since many termcap applications assume that
+	     * smso/rmso and smul/rmul are paired, and will not function
+	     * properly if we remove rmso or rmul.  Curses applications
+	     * shouldn't be looking at this detail.
+	     */
 #define SGR0_TEST(mode) (mode != 0) && (exit_attribute_mode == 0 || strcmp(mode, exit_attribute_mode))
-    SP->_use_rmso = SGR0_TEST(exit_standout_mode);
-    SP->_use_rmul = SGR0_TEST(exit_underline_mode);
+	    SP->_use_rmso = SGR0_TEST(exit_standout_mode);
+	    SP->_use_rmul = SGR0_TEST(exit_underline_mode);
 
-    /* compute movement costs so we can do better move optimization */
-    _nc_mvcur_init();
+	    /* compute movement costs so we can do better move optimization */
+	    _nc_mvcur_init();
 
-    /* initialize terminal to a sane state */
-    _nc_screen_init();
+	    /* initialize terminal to a sane state */
+	    _nc_screen_init();
 
-    /* Initialize the terminal line settings. */
-    _nc_initscr();
+	    /* Initialize the terminal line settings. */
+	    _nc_initscr();
 
-    _nc_signal_handler(TRUE);
+	    _nc_signal_handler(TRUE);
 
-    returnSP(SP);
+	    result = SP;
+	}
+    }
+    _nc_handle_sigwinch(1);
+    returnSP(result);
 }