update to ncurses-5.0-19991127

14 files changed, 146 insertions, 62 deletions

diff --git a/lib/libcurses/Caps b/lib/libcurses/Caps
index 47ad3c1ebf2..ada2914fc7e 100644
--- a/lib/libcurses/Caps
+++ b/lib/libcurses/Caps
@@ -29,8 +29,8 @@
 # Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995
 #    and: Eric S. Raymond <esr@snark.thyrsus.com>
 #
-# $OpenBSD: Caps,v 1.2 1999/01/18 19:06:44 millert Exp $
-# $From: Caps,v 1.24 1999/01/17 02:01:44 tom Exp $
+# $OpenBSD: Caps,v 1.3 1999/11/28 17:53:40 millert Exp $
+# $From: Caps,v 1.25 1999/11/27 20:13:55 tom Exp $
 #
 # This is the master termcap/terminfo capability table.
 #
@@ -216,7 +216,7 @@ eat_newline_glitch	xenl	bool	xn	YBCGE	newline ignored after 80 cols (concept)
 erase_overstrike	eo	bool	eo	YBCG-	can erase overstrikes with a blank
 generic_type    	gn	bool	gn	YB-G-	generic line type
 hard_copy       	hc	bool	hc	YBCG-	hardcopy terminal
-has_meta_key    	km	bool	km	YB-GE	Has a meta key (shift, sets parity bit)
+has_meta_key    	km	bool	km	YB-GE	Has a meta key (i.e., sets 8th-bit)
 has_status_line 	hs	bool	hs	YB-G-	has extra status line
 insert_null_glitch	in	bool	in	YBCGE	insert mode distinguishes nulls
 memory_above    	da	bool	da	YBCG-	display may be retained above the screen
diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 9ed425bb565..2387c159530 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.41 1999/11/17 05:37:53 millert Exp $
+#	$OpenBSD: Makefile,v 1.42 1999/11/28 17:53:40 millert Exp $
 
 # Uncomment this to enable tracing in libcurses
 #CURSESTRACE=-DTRACE
@@ -33,7 +33,7 @@ SRCS+=	define_key.c keybound.c keyok.c lib_adabind.c lib_addch.c lib_addstr.c \
 	lib_slkrefr.c lib_slkset.c lib_slktouch.c lib_touch.c \
 	lib_ungetch.c lib_vline.c lib_wattroff.c lib_wattron.c \
 	lib_winch.c lib_window.c nc_panel.c resizeterm.c safe_sprintf.c \
-	sigaction.c tries.c wresize.c
+	sigaction.c tries.c version.c wresize.c
 # tinfo
 SRCS+=	access.c add_tries.c alloc_entry.c alloc_ttype.c captoinfo.c \
 	comp_error.c comp_expand.c comp_hash.c comp_parse.c comp_scan.c \
@@ -173,8 +173,9 @@ MLINKS+= terminfo.3 setupterm.3 terminfo.3 setterm.3 terminfo.3 set_curterm.3 \
 MLINKS+= termcap.3 tgetent.3 termcap.3 tgetflag.3 termcap.3 tgetnum.3 \
 	termcap.3 tgetstr.3 termcap.3 tgoto.3 termcap.3 tputs.3
 
-CLEANFILES+= init_keytry.h nomacros.h codes.c comp_captab.c expanded.c \
+GENERATED= init_keytry.h nomacros.h codes.c comp_captab.c expanded.c \
 	fallback.c lib_gen.c lib_keyname.c names.c unctrl.c make_hash make_keys
+CLEANFILES+= ${GENERATED}
 
 .if make(install)
 SUBDIR+= doc
diff --git a/lib/libcurses/curs_initscr.3 b/lib/libcurses/curs_initscr.3
index 37467d40830..0404afa374e 100644
--- a/lib/libcurses/curs_initscr.3
+++ b/lib/libcurses/curs_initscr.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: curs_initscr.3,v 1.5 1998/09/13 19:16:19 millert Exp $
+.\" $OpenBSD: curs_initscr.3,v 1.6 1999/11/28 17:53:40 millert Exp $
 .\"
 .\"***************************************************************************
 .\" Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $From: curs_initscr.3x,v 1.7 1998/03/11 21:12:53 juergen Exp $
+.\" $From: curs_initscr.3x,v 1.8 1999/09/18 23:52:30 tom Exp $
 .TH curs_initscr 3 ""
 .SH NAME
 \fBinitscr\fR, \fBnewterm\fR, \fBendwin\fR,
@@ -107,6 +107,11 @@ Note that \fBinitscr\fR and \fBnewterm\fR may be macros.
 These functions are described in the XSI Curses standard, Issue 4.  It
 specifies that portable applications must not call \fBinitscr\fR more than
 once.
+
+Old versions of curses, e.g., BSD 4.4, may have returned a null pointer
+from \fBinitscr\fR when an error is detected, rather than exiting.
+It is safe but redundant to check the return value of \fBinitscr\fR 
+in XSI Curses.
 .SH SEE ALSO
 \fBcurses\fR(3), \fBcurs_kernel\fR(3), \fBcurs_refresh\fR(3),
 \fBcurs_slk\fR(3), \fBcurs_util\fR(3)
diff --git a/lib/libcurses/curs_mouse.3tbl b/lib/libcurses/curs_mouse.3tbl
index 4da4bcdff3b..b8631842631 100644
--- a/lib/libcurses/curs_mouse.3tbl
+++ b/lib/libcurses/curs_mouse.3tbl
@@ -1,8 +1,8 @@
 '\" t
-.\" $OpenBSD: curs_mouse.3tbl,v 1.7 1999/01/18 19:07:13 millert Exp $
+.\" $OpenBSD: curs_mouse.3tbl,v 1.8 1999/11/28 17:53:40 millert Exp $
 .\"
 .\"***************************************************************************
-.\" Copyright (c) 1998 Free Software Foundation, Inc.                        *
+.\" Copyright (c) 1998,1999 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,7 +29,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.'" $From: curs_mouse.3x,v 1.12 1999/01/09 22:53:22 tom Exp $
+.'" $From: curs_mouse.3x,v 1.13 1999/09/11 17:28:28 tom Exp $
 .TH curs_mouse 3 ""
 .SH NAME
 \fBgetmouse\fR, \fBungetmouse\fR,
@@ -173,9 +173,8 @@ These calls were designed for \fBncurses\fR, and are not found in SVr4
 curses, 4.4BSD curses, or any other previous version of curses.
 
 The feature macro \fBNCURSES_MOUSE_VERSION\fR is provided so the preprocessor
-can be used to test whether these features are present (its value is 1).  NOTE:
-THIS INTERFACE IS EXPERIMENTAL AND IS SUBJECT TO CHANGE WITHOUT NOTICE!  If the
-interface is changed, the value of \fBNCURSES_MOUSE_VERSION\fR will be
+can be used to test whether these features are present (its value is 1).
+If the interface is changed, the value of \fBNCURSES_MOUSE_VERSION\fR will be
 incremented.
 
 The order of the \fBMEVENT\fR structure members is not guaranteed.
@@ -183,7 +182,7 @@ Additional fields may be added to the structure in the future.
 
 Under \fBncurses\fR, these calls are implemented using either
 xterm's built-in mouse-tracking API or Alessandro Rubini's gpm server.
-If you are using something other than xterm there is no gpm daemon
+If you are using something other than xterm and there is no gpm daemon
 running on your machine, mouse events will not be visible to
 \fBcurses\fR(3) (and the \fBwmousemask\fR function will always
 return \fB0\fR).
@@ -197,7 +196,14 @@ if they have been enabled by \fBwmousemask\fR.  Instead, the xterm mouse
 report sequence will appear in the string read.
 
 Mouse events under xterm will not be detected correctly in a window with
-its keypad bit off.
+its keypad bit off, since they are interpreted as a variety of function key.
+Your terminfo description must have \fBkmous\fR set to "\\E[M" (the beginning
+of the response from xterm for mouse clicks).
+
+Because there are no standard terminal responses that would serve to identify
+terminals which support the xterm mouse protocol, \fBncurses\fR assumes that
+if your $DISPLAY environment variable is set, and \fBkmous\fR is defined in
+the terminal description, then the terminal may send mouse events.
 .SH SEE ALSO
 \fBcurses\fR(3).
 .\"#
diff --git a/lib/libcurses/curses.3tbl b/lib/libcurses/curses.3tbl
index 9b3e1e12a5f..9472517b85e 100644
--- a/lib/libcurses/curses.3tbl
+++ b/lib/libcurses/curses.3tbl
@@ -1,8 +1,8 @@
 '\" t
-.\" $OpenBSD: curses.3tbl,v 1.11 1999/08/15 11:41:03 millert Exp $
+.\" $OpenBSD: curses.3tbl,v 1.12 1999/11/28 17:53:40 millert Exp $
 .\"
 .\"***************************************************************************
-.\" Copyright (c) 1998 Free Software Foundation, Inc.                        *
+.\" Copyright (c) 1998,1999 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,7 +29,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $From: ncurses.3x,v 1.34 1999/07/24 21:37:35 tom Exp $
+.\" $From: ncurses.3x,v 1.35 1999/10/23 19:50:07 tom Exp $
 .TH ncurses 3 ""
 .ds n 5
 .ds d /usr/share/terminfo
diff --git a/lib/libcurses/curses.h b/lib/libcurses/curses.h
index c345065b627..44844941c19 100644
--- a/lib/libcurses/curses.h
+++ b/lib/libcurses/curses.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: curses.h,v 1.37 1999/08/22 17:42:44 millert Exp $	*/
+/*	$OpenBSD: curses.h,v 1.38 1999/11/28 17:53:40 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -33,7 +33,7 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-/* $From: curses.h.in,v 1.84 1999/07/24 20:15:42 tom Exp $ */
+/* $From: curses.h.in,v 1.87 1999/11/14 00:21:57 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -50,7 +50,7 @@
 /* These are defined only in curses.h, and are used for conditional compiles */
 #define NCURSES_VERSION_MAJOR 5
 #define NCURSES_VERSION_MINOR 0
-#define NCURSES_VERSION_PATCH 990821
+#define NCURSES_VERSION_PATCH 19991127
 
 /* This is defined in more than one ncurses header, for identification */
 #undef  NCURSES_VERSION
@@ -89,7 +89,7 @@ typedef unsigned long chtype;
 
 #if !defined(__cplusplus)
 #undef bool
-typedef char bool;
+typedef unsigned char bool;
 #endif
 
 #ifdef __cplusplus
@@ -313,7 +313,14 @@ extern int	TABSIZE;
  */
 extern int ESCDELAY;	/* ESC expire time in milliseconds */
 
+extern char ttytype[];		/* needed for backward compatibility */
+
+/*
+ * These functions are extensions - not in XSI Curses.
+ */
 extern char *keybound (int, int);
+extern const char *curses_version (void);
+extern int assume_default_colors (int, int);
 extern int define_key (char *, int);
 extern int keyok (int, bool);
 extern int resizeterm (int, int);
@@ -321,8 +328,6 @@ extern int use_default_colors (void);
 extern int use_extended_names (bool);
 extern int wresize (WINDOW *, int, int);
 
-extern char ttytype[];		/* needed for backward compatibility */
-
 /*
  * GCC (and some other compilers) define '__attribute__'; we're using this
  * macro to alert the compiler to flag inconsistencies in printf/scanf-like
@@ -1342,6 +1347,14 @@ extern const char *_nc_visbuf(const char *);
 #endif
 
 #ifdef __cplusplus
+
+/* these names conflict with STL */
+#undef box
+#undef clear
+#undef erase
+#undef move
+#undef refresh
+
 }
 #endif
 
diff --git a/lib/libcurses/curses.priv.h b/lib/libcurses/curses.priv.h
index a833421b910..a4394c11b3f 100644
--- a/lib/libcurses/curses.priv.h
+++ b/lib/libcurses/curses.priv.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: curses.priv.h,v 1.20 1999/07/04 12:43:22 millert Exp $	*/
+/*	$OpenBSD: curses.priv.h,v 1.21 1999/11/28 17:53:40 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -35,7 +35,7 @@
 
 
 /*
- * $From: curses.priv.h,v 1.142 1999/07/04 01:21:35 tom Exp $
+ * $From: curses.priv.h,v 1.147 1999/11/28 00:10:37 tom Exp $
  *
  *	curses.priv.h
  *
@@ -334,7 +334,11 @@ struct screen {
 	int             _color_count;   /* count of colors in palette        */
 	unsigned short  *_color_pairs;  /* screen's color pair list          */
 	int             _pair_count;    /* count of color pairs              */
+#ifdef NCURSES_EXT_FUNCS
 	int             _default_color; /* use default colors                */
+	int             _default_fg;    /* assumed default foreground        */
+	int             _default_bg;    /* assumed default background        */
+#endif
 	chtype          _xmc_suppress;  /* attributes to suppress if xmc     */
 	chtype          _xmc_triggers;  /* attributes to process if xmc      */
 	chtype          _acs_map[ACS_LEN];
@@ -390,6 +394,8 @@ struct screen {
 
 	/* hashes for old and new lines */
 	unsigned long	*oldhash, *newhash;
+
+	bool            _cleanup;	/* cleanup after int/quit signal */
 };
 
 extern SCREEN *_nc_screen_chain;
@@ -488,7 +494,7 @@ typedef	struct {
 #define typeCalloc(type,elts) (type *)calloc((elts),sizeof(type))
 #define typeRealloc(type,elts,ptr) (type *)_nc_doalloc(ptr, (elts)*sizeof(type))
 #define FreeIfNeeded(p)  if(p != 0) free(p)
-#define FreeAndNull(p)   free(p); p = 0
+#define FreeAndNull(p)   free(p); p = 0;
 
 #include <nc_alloc.h>
 
@@ -540,15 +546,15 @@ extern const char *_nc_visbuf2(int, const char *);
 #define XMC_CHANGES(c) ((c) & SP->_xmc_suppress)
 
 
-#define toggle_attr_on(S,at) \
+#define toggle_attr_on(S,at) {\
    if (PAIR_NUMBER(at) > 0)\
       (S) = ((S) & ALL_BUT_COLOR) | (at);\
    else\
       (S) |= (at);\
-   T(("new attribute is %s", _traceattr((S))))
+   T(("new attribute is %s", _traceattr((S))));}
 
 
-#define toggle_attr_off(S,at) \
+#define toggle_attr_off(S,at) {\
    if (IGNORE_COLOR_OFF == TRUE) {\
       if (PAIR_NUMBER(at) == 0xff) /* turn off color */\
 	 (S) &= ~(at);\
@@ -560,7 +566,7 @@ extern const char *_nc_visbuf2(int, const char *);
       else /* leave color alone */\
 	 (S) &= ~(at);\
    }\
-   T(("new attribute is %s", _traceattr((S))));
+   T(("new attribute is %s", _traceattr((S))));}
 
 #define DelCharCost(count) \
 		((parm_dch != 0) \
@@ -593,7 +599,7 @@ extern const char *_nc_visbuf2(int, const char *);
 			}
 #else
 #define UpdateAttrs(c)	if (SP->_current_attr != AttrOf(c)) \
-				vidattr(AttrOf(c));
+				vidattr(AttrOf(c))
 #endif
 
 /*
@@ -736,6 +742,9 @@ extern int *_nc_oldnums;
 	if ((SP->_buffered != 0) != flag) \
 		_nc_set_buffer(SP->_ofp, flag)
 
+#define NC_OUTPUT ((SP != 0) ? SP->_ofp : stdout)
+#define _nc_flush() (void)fflush(NC_OUTPUT)
+
 /*
  * On systems with a broken linker, define 'SP' as a function to force the
  * linker to pull in the data-only module with 'SP'.
diff --git a/lib/libcurses/dft_fgbg.3 b/lib/libcurses/dft_fgbg.3
index 6332c04cea8..5795ddf26ca 100644
--- a/lib/libcurses/dft_fgbg.3
+++ b/lib/libcurses/dft_fgbg.3
@@ -1,7 +1,7 @@
-.\" $OpenBSD: dft_fgbg.3,v 1.3 1998/09/13 19:16:25 millert Exp $
+.\" $OpenBSD: dft_fgbg.3,v 1.4 1999/11/28 17:53:40 millert Exp $
 .\"
 .\"***************************************************************************
-.\" Copyright (c) 1998 Free Software Foundation, Inc.                        *
+.\" Copyright (c) 1998,1999 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            *
@@ -28,9 +28,9 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" Author: Thomas E. Dickey <dickey@clark.net> 1997
+.\" Author: Thomas E. Dickey <dickey@clark.net> 1997,1999
 .\"
-.\" $From: dft_fgbg.3x,v 1.6 1998/03/14 23:43:15 tom Exp $
+.\" $From: dft_fgbg.3x,v 1.7 1999/11/14 00:51:50 tom Exp $
 .TH use_default_colors 3 ""
 .SH NAME
 \fBdft_fgbg\fR \- use terminal's default colors
@@ -39,24 +39,49 @@
 \fB#include <curses.h>\fP
 
 \fBint use_default_colors(void);\fP
+.br
+\fBint assume_default_colors(int fg, int bg);\fP
 ..
 .SH DESCRIPTION
-This is an extension to the curses library.
-It is used with terminals that support ISO 6429 color, or equivalent.
+The
+.I use_default_colors()
+and
+.I assume_default_colors()
+functions are extensions to the curses library.
+They are used with terminals that support ISO 6429 color, or equivalent.
 These terminals allow the application to reset color to an unspecified
 default value (e.g., with SGR 39 or SGR 49).
-Because they are designed to support this, their design usually includes
-features to change the default foreground or background colors so that
-they do not match the assumption in XSI curses of white on black.
+XSI Curses assumes the default colors are white on black.
 .PP
 Applications that paint a colored background over the whole screen
-are not adversely impacted by this type of terminal design.
-However, there are applications that are designed to work with
-the default background.
+do not take advantage of SGR 39 and SGR 49.
+Some applications are designed to work with the default background.
+.PP
+The first function,
+.I use_default_colors()
+tells the curses library to use the terminal's 
+\fIorig_pair\fP or \fIorig_colors\fP capability when setting color pair 0.
+.PP
+The other,
+.I assume_default_colors()
+is a refinement which tells which colors to assume are set for color pair 0.
+The following are equivalent:
+.RS
+.br
+.I use_default_colors();
+.br
+.I assume_default_colors(-1,-1);
+.RE
+.PP
+Do this:
+.RS
+.I assume_default_colors(COLOR_WHITE,COLOR_BLACK);
+.RE
+to disable default colors.
 ..
 .SH RETURN VALUE
-The function returns the integer \fBERR\fP upon failure and \fBOK\fP on success.
-It will fail if either the terminal does not support
+These functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+They will fail if either the terminal does not support
 the \fIorig_pair\fP or \fIorig_colors\fP capability.
 If the \fIinitialize_pair\fP capability is found, this causes an
 error as well.
diff --git a/lib/libcurses/ncurses_cfg.h b/lib/libcurses/ncurses_cfg.h
index f9ce6be4980..2f93b129092 100644
--- a/lib/libcurses/ncurses_cfg.h
+++ b/lib/libcurses/ncurses_cfg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncurses_cfg.h,v 1.14 1999/06/27 08:15:19 millert Exp $	*/
+/*	$OpenBSD: ncurses_cfg.h,v 1.15 1999/11/28 17:53:40 millert Exp $	*/
 
 /* include/ncurses_cfg.h.  Generated automatically by configure.  */
 /****************************************************************************
@@ -47,7 +47,8 @@
 #define BSD_TPUTS 1
 #define CC_HAS_INLINE_FUNCS 1
 #define CC_HAS_PROTOS 1
-#define ETIP_NEEDS_ 1
+#define CPP_HAS_PARAM_INIT 1
+#define ETIP_NEEDS_MATH_H 1
 #define GCC_NORETURN __attribute__((noreturn))
 #define GCC_PRINTF 1
 #define GCC_SCANF 1
@@ -61,6 +62,7 @@
 #define HAVE_GETCWD 1
 #define HAVE_GETTIMEOFDAY 1
 #define HAVE_GETTTYNAM 1
+#define HAVE_HAS_KEY 1
 #define HAVE_ISASCII 1
 /* #define HAVE_LIBFORM 1 */
 /* #define HAVE_LIBMENU 1 */
@@ -78,6 +80,7 @@
 #define HAVE_POLL_H 1
 #define HAVE_REGEX_H_FUNCS 1
 #define HAVE_REMOVE 1
+#define HAVE_RESIZETERM 1
 #define HAVE_SELECT 1
 #define HAVE_SETBUF 1
 #define HAVE_SETBUFFER 1
@@ -101,16 +104,18 @@
 #define HAVE_TTYENT_H 1
 #define HAVE_TYPEINFO 1
 #define HAVE_UNISTD_H 1
-#define HAVE_USLEEP 1
+#define HAVE_UNLINK 1
+#define HAVE_USE_DEFAULT_COLORS 1
 #define HAVE_VSNPRINTF 1
 #define HAVE_VSSCANF 1
+#define HAVE_WRESIZE 1
 #define NCURSES_EXT_FUNCS 1
 #define NCURSES_NO_PADDING 1
 #define NDEBUG 1
 /* #define PURE_TERMINFO 1 */
 #define RETSIGTYPE void
 #define STDC_HEADERS 1
-#define SYSTEM_NAME "openbsd2.5"
+#define SYSTEM_NAME "openbsd2.6"
 #define TERMINFO_DIRS "/usr/share/terminfo"
 #define TYPEOF_CHTYPE long
 #define USE_DATABASE 1
diff --git a/lib/libcurses/shlib_version b/lib/libcurses/shlib_version
index 900b4048a96..715ca914844 100644
--- a/lib/libcurses/shlib_version
+++ b/lib/libcurses/shlib_version
@@ -1,2 +1,2 @@
 major=5
-minor=1
+minor=2
diff --git a/lib/libcurses/term.h b/lib/libcurses/term.h
index 936cbe23ee8..0099c46fd19 100644
--- a/lib/libcurses/term.h
+++ b/lib/libcurses/term.h
@@ -1,11 +1,11 @@
-/*	$OpenBSD: term.h,v 1.6 1999/03/02 06:23:27 millert Exp $	*/
+/*	$OpenBSD: term.h,v 1.7 1999/11/28 17:53:40 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998 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            *
- * ), to deal in the Software without restriction, including      *
+ * "Software"), to deal in the Software without restriction, including      *
  * without limitation the rights to use, copy, modify, merge, publish,      *
  * distribute, distribute with modifications, sublicense, and/or sell       *
  * copies of the Software, and to permit persons to whom the Software is    *
@@ -14,7 +14,7 @@
  * The above copyright notice and this permission notice shall be included  *
  * in all copies or substantial portions of the Software.                   *
  *                                                                          *
- * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
  * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
@@ -33,7 +33,7 @@
 /*    and: Eric S. Raymond <esr@snark.thyrsus.com>                          */
 /****************************************************************************/
 
-/* $From: MKterm.h.awk.in,v 1.35 1999/02/24 01:04:55 tom Exp $ */
+/* $From: MKterm.h.awk.in,v 1.36 1999/09/01 22:36:52 Peter.Wemm Exp $ */
 
 /*
 **	term.h -- Definition of struct term
@@ -43,7 +43,7 @@
 #define _NCU_TERM_H 1
 
 #ifdef _USE_OLD_CURSES_
-#error Cannot mix new term.h with old curses.h
+#error Cannot mix ncurses term.h with old curses.h
 #endif
 
 #undef  NCURSES_VERSION
diff --git a/lib/libcurses/termcap.3 b/lib/libcurses/termcap.3
index 10e0ff4a0ab..bac4d02c768 100644
--- a/lib/libcurses/termcap.3
+++ b/lib/libcurses/termcap.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: termcap.3,v 1.3 1998/09/13 19:16:30 millert Exp $
+.\" $OpenBSD: termcap.3,v 1.4 1999/11/28 17:53:40 millert Exp $
 .\"
 .\"***************************************************************************
 .\" Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $From: curs_termcap.3x,v 1.11 1998/07/18 02:45:56 tom Exp $
+.\" $From: curs_termcap.3x,v 1.12 1999/09/05 01:02:07 tom Exp $
 .TH termcap 3 ""
 .ds n 5
 .SH NAME
@@ -73,6 +73,9 @@ or -1 if it is not available.
 The \fBtgetstr\fR routine returns the string entry for \fIid\fR,
 or zero if it is not available.
 Use \fBtputs\fR to output the returned string.
+The return value will also be copied to the buffer pointed to by \fIarea\fR,
+and the \fIarea\fR value will be updated to point past the null ending
+this value.
 
 The \fBtgoto\fR routine instantiates the parameters into the given capability.
 The output from this routine is to be passed to \fBtputs\fR.
diff --git a/lib/libcurses/terminfo.3 b/lib/libcurses/terminfo.3
index b67efcb8bdf..456bf701367 100644
--- a/lib/libcurses/terminfo.3
+++ b/lib/libcurses/terminfo.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: terminfo.3,v 1.5 1999/08/15 11:41:04 millert Exp $
+.\" $OpenBSD: terminfo.3,v 1.6 1999/11/28 17:53:40 millert Exp $
 .\"
 .\"***************************************************************************
 .\" Copyright (c) 1999 Free Software Foundation, Inc.                        *
@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $From: curs_terminfo.3x,v 1.11 1999/07/31 21:41:29 tom Exp $
+.\" $From: curs_terminfo.3x,v 1.12 1999/10/17 01:11:59 tom Exp $
 .TH terminfo 3 ""
 .ds n 5
 .SH NAME
@@ -246,6 +246,14 @@ In System V Release 4, the third argument of \fBtputs\fR has the type
 
 The XSI Curses standard prototypes \fBtparm\fR with a fixed number of parameters,
 rather than a variable argument list.
+
+XSI notes that after calling \fBmvcur\fR, the curses state may not match the
+actual terminal state, and that an application should touch and refresh
+the window before resuming normal curses calls.
+Both ncurses and System V Release 4 curses implement \fBmvcur\fR using
+the SCREEN data allocated in either \fBinitscr\fR or \fBnewterm\fR. 
+So though it is documented as a terminfo function,
+\fBmvcur\fR is really a curses function which is not well specified.
 .SH SEE ALSO
 \fBcurses\fR(3), \fBcurs_initscr\fR(3), \fBcurs_kernel\fR(3), \fBtermcap\fR(3),
 \fBputc\fR(3), \fBterminfo\fR(\*n)
diff --git a/lib/libcurses/tic.h b/lib/libcurses/tic.h
index a1f5158e07a..b72b0c33f30 100644
--- a/lib/libcurses/tic.h
+++ b/lib/libcurses/tic.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tic.h,v 1.5 1999/03/12 04:36:02 millert Exp $	*/
+/*	$OpenBSD: tic.h,v 1.6 1999/11/28 17:53:40 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -159,8 +159,17 @@ struct tinfo_fkeys {
 	chtype code;
 	};
 
+#ifdef	BROKEN_LINKER
+
+#define	_nc_tinfo_fkeys	_nc_tinfo_fkeysf()
+extern struct tinfo_fkeys *_nc_tinfo_fkeysf(void);
+
+#else
+
 extern struct tinfo_fkeys _nc_tinfo_fkeys[];
 
+#endif
+
 	/*
 	 * The file comp_captab.c contains an array of these structures, one
 	 * per possible capability.  These are indexed by a hash table array of