Import the most recent ncurses 5.1 prerelease (20000701).

Mostly this is intended to resolve the trace() badness once and for all.

Obtained from:  ftp://dickey.his.com/ncurses/

1 files changed, 205 insertions, 190 deletions

diff --git a/contrib/ncurses/ncurses/base/lib_newwin.c b/contrib/ncurses/ncurses/base/lib_newwin.c
index d7fc02b3216e..ececa58a314d 100644
--- a/contrib/ncurses/ncurses/base/lib_newwin.c
+++ b/contrib/ncurses/ncurses/base/lib_newwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,1999,2000 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            *
@@ -31,8 +31,6 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
-
 /*
 **	lib_newwin.c
 **
@@ -42,230 +40,247 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_newwin.c,v 1.21 1999/10/03 00:42:03 tom Exp $")
+MODULE_ID("$Id: lib_newwin.c,v 1.24 2000/04/29 18:49:51 tom Exp $")
 
-void _nc_freewin(WINDOW *win)
+void
+_nc_freewin(WINDOW *win)
 {
-WINDOWLIST *p, *q;
-int	i;
-
-	if (win != 0) {
-		for (p = _nc_windows, q = 0; p != 0; q = p, p = p->next) {
-			if (p->win == win) {
-				if (q == 0)
-					_nc_windows = p->next;
-				else
-					q->next = p->next;
-				free(p);
-
-				if (! (win->_flags & _SUBWIN)) {
-					for (i = 0; i <= win->_maxy && win->_line[i].text; i++)
-						FreeIfNeeded(win->_line[i].text);
-				}
-				free(win->_line);
-				free(win);
-
-				if (win == curscr) curscr = 0;
-				if (win == stdscr) stdscr = 0;
-				if (win == newscr) newscr = 0;
-
-				T(("...deleted win=%p", win));
-				break;
-			}
+    WINDOWLIST *p, *q;
+    int i;
+
+    if (win != 0) {
+	for (p = _nc_windows, q = 0; p != 0; q = p, p = p->next) {
+	    if (p->win == win) {
+		if (q == 0)
+		    _nc_windows = p->next;
+		else
+		    q->next = p->next;
+		free(p);
+
+		if (!(win->_flags & _SUBWIN)) {
+		    for (i = 0; i <= win->_maxy; i++)
+			FreeIfNeeded(win->_line[i].text);
 		}
+		free(win->_line);
+		free(win);
+
+		if (win == curscr)
+		    curscr = 0;
+		if (win == stdscr)
+		    stdscr = 0;
+		if (win == newscr)
+		    newscr = 0;
+
+		T(("...deleted win=%p", win));
+		break;
+	    }
 	}
+    }
 }
 
-WINDOW * newwin(int num_lines, int num_columns, int begy, int begx)
+WINDOW *
+newwin(int num_lines, int num_columns, int begy, int begx)
 {
-WINDOW	*win;
-chtype	*ptr;
-int	i;
+    WINDOW *win;
+    chtype *ptr;
+    int i;
 
-	T((T_CALLED("newwin(%d,%d,%d,%d)"), num_lines, num_columns, begy, begx));
+    T((T_CALLED("newwin(%d,%d,%d,%d)"), num_lines, num_columns, begy, begx));
 
-	if (begy < 0 || begx < 0 || num_lines < 0 || num_columns < 0)
-		returnWin(0);
+    if (begy < 0 || begx < 0 || num_lines < 0 || num_columns < 0)
+	returnWin(0);
 
-	if (num_lines == 0)
-	    num_lines = SP->_lines_avail - begy;
-	if (num_columns == 0)
-	    num_columns = screen_columns - begx;
+    if (num_lines == 0)
+	num_lines = SP->_lines_avail - begy;
+    if (num_columns == 0)
+	num_columns = screen_columns - begx;
 
-	if (num_columns + begx > SP->_columns || num_lines + begy > SP->_lines_avail)
-		returnWin(0);
+    if (num_columns + begx > SP->_columns || num_lines + begy > SP->_lines_avail)
+	returnWin(0);
 
-	if ((win = _nc_makenew(num_lines, num_columns, begy, begx, 0)) == 0)
-		returnWin(0);
+    if ((win = _nc_makenew(num_lines, num_columns, begy, begx, 0)) == 0)
+	returnWin(0);
 
-	for (i = 0; i < num_lines; i++) {
-	    if ((win->_line[i].text = typeCalloc(chtype, (unsigned)num_columns)) == 0) {
-		_nc_freewin(win);
-		returnWin(0);
-	    }
-	    for (ptr = win->_line[i].text; ptr < win->_line[i].text + num_columns; )
-		*ptr++ = ' ';
+    for (i = 0; i < num_lines; i++) {
+	win->_line[i].text = typeCalloc(chtype, (unsigned) num_columns);
+	if (win->_line[i].text == 0) {
+	    _nc_freewin(win);
+	    returnWin(0);
 	}
+	for (ptr = win->_line[i].text; ptr < win->_line[i].text +
+	    num_columns;)
+	    *ptr++ = ' ';
+    }
 
-	T(("newwin: returned window is %p", win));
+    T(("newwin: returned window is %p", win));
 
-	returnWin(win);
+    returnWin(win);
 }
 
-WINDOW * derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
+WINDOW *
+derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
 {
-WINDOW	*win;
-int	i;
-int     flags = _SUBWIN;
+    WINDOW *win;
+    int i;
+    int flags = _SUBWIN;
 
-	T((T_CALLED("derwin(%p,%d,%d,%d,%d)"), orig, num_lines, num_columns, begy, begx));
+    T((T_CALLED("derwin(%p,%d,%d,%d,%d)"), orig, num_lines, num_columns,
+	    begy, begx));
 
-	/*
-	** make sure window fits inside the original one
-	*/
-	if ( begy < 0 || begx < 0 || orig == 0 || num_lines < 0 || num_columns < 0)
-	    returnWin(0);
-	if ( begy + num_lines > orig->_maxy + 1
-		|| begx + num_columns > orig->_maxx + 1)
-	    returnWin(0);
+    /*
+       ** make sure window fits inside the original one
+     */
+    if (begy < 0 || begx < 0 || orig == 0 || num_lines < 0 || num_columns < 0)
+	returnWin(0);
+    if (begy + num_lines > orig->_maxy + 1
+	|| begx + num_columns > orig->_maxx + 1)
+	returnWin(0);
 
-	if (num_lines == 0)
-	    num_lines = orig->_maxy + 1 - begy; 
+    if (num_lines == 0)
+	num_lines = orig->_maxy + 1 - begy;
 
-	if (num_columns == 0)
-	    num_columns = orig->_maxx + 1 - begx; 
+    if (num_columns == 0)
+	num_columns = orig->_maxx + 1 - begx;
 
-	if (orig->_flags & _ISPAD)
-	  flags |= _ISPAD;
+    if (orig->_flags & _ISPAD)
+	flags |= _ISPAD;
 
-	if ((win = _nc_makenew(num_lines, num_columns, orig->_begy + begy, orig->_begx + begx, flags)) == 0)
-	    returnWin(0);
+    if ((win = _nc_makenew(num_lines, num_columns, orig->_begy + begy,
+		orig->_begx + begx, flags)) == 0)
+	returnWin(0);
 
-	win->_pary = begy;
-	win->_parx = begx;
-	win->_attrs = orig->_attrs;
-	win->_bkgd = orig->_bkgd;
+    win->_pary = begy;
+    win->_parx = begx;
+    win->_attrs = orig->_attrs;
+    win->_bkgd = orig->_bkgd;
 
-	for (i = 0; i < num_lines; i++)
-	    win->_line[i].text = &orig->_line[begy++].text[begx];
+    for (i = 0; i < num_lines; i++)
+	win->_line[i].text = &orig->_line[begy++].text[begx];
 
-	win->_parent = orig;
+    win->_parent = orig;
 
-	T(("derwin: returned window is %p", win));
+    T(("derwin: returned window is %p", win));
 
-	returnWin(win);
+    returnWin(win);
 }
 
-
-WINDOW *subwin(WINDOW *w, int l, int c, int y, int x)
+WINDOW *
+subwin(WINDOW *w, int l, int c, int y, int x)
 {
-	T((T_CALLED("subwin(%p, %d, %d, %d, %d)"), w, l, c, y, x));
-	T(("parent has begy = %d, begx = %d", w->_begy, w->_begx));
+    T((T_CALLED("subwin(%p, %d, %d, %d, %d)"), w, l, c, y, x));
+    T(("parent has begy = %d, begx = %d", w->_begy, w->_begx));
+
+    returnWin(derwin(w, l, c, y - w->_begy, x - w->_begx));
+}
 
-	returnWin(derwin(w, l, c, y - w->_begy, x - w->_begx));
+static bool
+dimension_limit(int value)
+{
+    NCURSES_SIZE_T test = value;
+    return (test == value && value > 0);
 }
 
 WINDOW *
 _nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags)
 {
-int	i;
-WINDOWLIST *wp;
-WINDOW	*win;
-bool    is_pad = (flags & _ISPAD);
-
-	T(("_nc_makenew(%d,%d,%d,%d)", num_lines, num_columns, begy, begx));
-
-	if (num_lines <= 0 || num_columns <= 0)
-		return 0;
-
-	if ((wp = typeCalloc(WINDOWLIST, 1)) == 0)
-		return 0;
-
-	if ((win = typeCalloc(WINDOW, 1)) == 0)
-		return 0;
-
-	if ((win->_line = typeCalloc(struct ldat, ((unsigned)num_lines))) == 0) {
-		free(win);
-		return 0;
-	}
-
-	win->_curx       = 0;
-	win->_cury       = 0;
-	win->_maxy       = num_lines - 1;
-	win->_maxx       = num_columns - 1;
-	win->_begy       = begy;
-	win->_begx       = begx;
-	win->_yoffset    = SP->_topstolen;
-
-	win->_flags      = flags;
-	win->_attrs      = A_NORMAL;
-	win->_bkgd       = BLANK;
-
-	win->_clear      = is_pad ? FALSE : (num_lines == screen_lines  &&  num_columns == screen_columns);
-	win->_idlok      = FALSE;
-	win->_idcok      = TRUE;
-	win->_scroll     = FALSE;
-	win->_leaveok    = FALSE;
-	win->_use_keypad = FALSE;
-	win->_delay      = -1;
-	win->_immed      = FALSE;
-	win->_sync       = 0;
-	win->_parx       = -1;
-	win->_pary       = -1;
-	win->_parent     = 0;
-
-	win->_regtop     = 0;
-	win->_regbottom  = num_lines - 1;
-
-	win->_pad._pad_y      = -1;
-	win->_pad._pad_x      = -1;
-	win->_pad._pad_top    = -1;
-	win->_pad._pad_bottom = -1;
-	win->_pad._pad_left   = -1;
-	win->_pad._pad_right  = -1;
-
-	for (i = 0; i < num_lines; i++)
-	{
-	    /*
-	     * This used to do
-	     *
-	     * win->_line[i].firstchar = win->_line[i].lastchar = _NOCHANGE;
-	     *
-	     * which marks the whole window unchanged.  That's how
-	     * SVr1 curses did it, but SVr4 curses marks the whole new
-	     * window changed.
-	     *
-	     * With the old SVr1-like code, say you have stdscr full of
-	     * characters, then create a new window with newwin(),
-	     * then do a printw(win, "foo        ");, the trailing spaces are
-	     * completely ignored by the following refreshes.  So, you
-	     * get "foojunkjunk" on the screen instead of "foo        " as
-	     * you actually intended.
-	     *
-	     * SVr4 doesn't do this.  Instead the spaces are actually written.
-	     * So that's how we want ncurses to behave.
-	     */
-	    win->_line[i].firstchar = 0;
-	    win->_line[i].lastchar = num_columns-1;
-
-	    if_USE_SCROLL_HINTS(win->_line[i].oldindex = i);
-	}
-
-	if (!is_pad && (begx + num_columns == screen_columns)) {
-		win->_flags |= _ENDLINE;
-
-		if (begx == 0  &&  num_lines == screen_lines  &&  begy == 0)
-			win->_flags |= _FULLWIN;
-
-		if (begy + num_lines == screen_lines)
-			win->_flags |= _SCROLLWIN;
-	}
-
-	wp->next = _nc_windows;
-	wp->win  = win;
-	_nc_windows = wp;
-
-	T((T_CREATE("window %p"), win));
-
-	return(win);
+    int i;
+    WINDOWLIST *wp;
+    WINDOW *win;
+    bool is_pad = (flags & _ISPAD);
+
+    T(("_nc_makenew(%d,%d,%d,%d)", num_lines, num_columns, begy, begx));
+
+    if (!dimension_limit(num_lines) || !dimension_limit(num_columns))
+	return 0;
+
+    if ((wp = typeCalloc(WINDOWLIST, 1)) == 0)
+	return 0;
+
+    if ((win = typeCalloc(WINDOW, 1)) == 0)
+	  return 0;
+
+    if ((win->_line = typeCalloc(struct ldat, ((unsigned) num_lines))) == 0) {
+	free(win);
+	return 0;
+    }
+
+    win->_curx = 0;
+    win->_cury = 0;
+    win->_maxy = num_lines - 1;
+    win->_maxx = num_columns - 1;
+    win->_begy = begy;
+    win->_begx = begx;
+    win->_yoffset = SP->_topstolen;
+
+    win->_flags = flags;
+    win->_attrs = A_NORMAL;
+    win->_bkgd = BLANK;
+
+    win->_clear = is_pad ? FALSE : (num_lines == screen_lines && num_columns
+	== screen_columns);
+    win->_idlok = FALSE;
+    win->_idcok = TRUE;
+    win->_scroll = FALSE;
+    win->_leaveok = FALSE;
+    win->_use_keypad = FALSE;
+    win->_delay = -1;
+    win->_immed = FALSE;
+    win->_sync = 0;
+    win->_parx = -1;
+    win->_pary = -1;
+    win->_parent = 0;
+
+    win->_regtop = 0;
+    win->_regbottom = num_lines - 1;
+
+    win->_pad._pad_y = -1;
+    win->_pad._pad_x = -1;
+    win->_pad._pad_top = -1;
+    win->_pad._pad_bottom = -1;
+    win->_pad._pad_left = -1;
+    win->_pad._pad_right = -1;
+
+    for (i = 0; i < num_lines; i++) {
+	/*
+	 * This used to do
+	 *
+	 * win->_line[i].firstchar = win->_line[i].lastchar = _NOCHANGE;
+	 *
+	 * which marks the whole window unchanged.  That's how
+	 * SVr1 curses did it, but SVr4 curses marks the whole new
+	 * window changed.
+	 *
+	 * With the old SVr1-like code, say you have stdscr full of
+	 * characters, then create a new window with newwin(),
+	 * then do a printw(win, "foo        ");, the trailing spaces are
+	 * completely ignored by the following refreshes.  So, you
+	 * get "foojunkjunk" on the screen instead of "foo        " as
+	 * you actually intended.
+	 *
+	 * SVr4 doesn't do this.  Instead the spaces are actually written.
+	 * So that's how we want ncurses to behave.
+	 */
+	win->_line[i].firstchar = 0;
+	win->_line[i].lastchar = num_columns - 1;
+
+	if_USE_SCROLL_HINTS(win->_line[i].oldindex = i);
+    }
+
+    if (!is_pad && (begx + num_columns == screen_columns)) {
+	win->_flags |= _ENDLINE;
+
+	if (begx == 0 && num_lines == screen_lines && begy == 0)
+	    win->_flags |= _FULLWIN;
+
+	if (begy + num_lines == screen_lines)
+	    win->_flags |= _SCROLLWIN;
+    }
+
+    wp->next = _nc_windows;
+    wp->win = win;
+    _nc_windows = wp;
+
+    T((T_CREATE("window %p"), win));
+
+    return (win);
 }