ncurses-4.1-971213

60 files changed, 1387 insertions, 811 deletions

diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index b5f86ddaa24..ed96b4a2b4e 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 1997/12/03 05:20:48 millert Exp $
+#	$OpenBSD: Makefile,v 1.19 1997/12/14 23:15:36 millert Exp $
 
 # Uncomment this to enable tracing in libcurses
 #CURSESTRACE=-DTRACE
@@ -28,7 +28,7 @@ SRCS+=	lib_trace.c lib_traceatr.c lib_tracechr.c lib_tracedmp.c \
 .endif
 CFLAGS+= -I. -I${.CURDIR} -DTERMIOS -DEXTERN_TERMINFO ${CURSESTRACE}
 LDADD+=  -ltermlib
-# XXX - add new man pages
+# XXX - add more MLINKS
 MAN=	curs_addch.3 curs_addchstr.3 curs_addstr.3 curs_attr.3 curs_beep.3 \
 	curs_bkgd.3 curs_border.3 curs_clear.3 curs_color.3 curs_delch.3 \
 	curs_deleteln.3 curs_getch.3 curs_getstr.3 curs_getyx.3 curs_inch.3 \
@@ -36,7 +36,8 @@ MAN=	curs_addch.3 curs_addchstr.3 curs_addstr.3 curs_attr.3 curs_beep.3 \
 	curs_instr.3 curs_kernel.3 curs_mouse.3 curs_move.3 curs_outopts.3 \
 	curs_overlay.3 curs_pad.3 curs_print.3 curs_printw.3 curs_refresh.3 \
 	curs_scanw.3 curs_scr_dmp.3 curs_scroll.3 curs_slk.3 curs_termattrs.3 \
-	curs_touch.3 curs_util.3 curs_window.3 curses.3 wresize.3
+	curs_touch.3 curs_util.3 curs_window.3 curses.3 define_key.3 \
+	dft_fgbg.3 keyok.3 wresize.3
 MLINKS+=curses.3 ncurses.3
 CLEANFILES+= lib_gen.c lib_keyname.c keys.tries expanded.c
 
diff --git a/lib/libcurses/curs_addch.3tbl b/lib/libcurses/curs_addch.3tbl
index 88805a28e40..03c3d605f25 100644
--- a/lib/libcurses/curs_addch.3tbl
+++ b/lib/libcurses/curs_addch.3tbl
@@ -1,4 +1,5 @@
-.\" $OpenBSD: curs_addch.3tbl,v 1.3 1997/12/03 05:45:07 millert Exp $
+.\" $OpenBSD: curs_addch.3tbl,v 1.4 1997/12/14 23:15:37 millert Exp $
+.\" Id: curs_addch.3x,v 1.10 1997/12/13 22:37:23 tom Exp $
 '\" t
 .TH curs_addch 3 ""
 .SH NAME
@@ -76,8 +77,8 @@ ACS_TTEE	+	top tee
 ACS_HLINE	-	horizontal line
 ACS_VLINE	|	vertical line
 ACS_PLUS	+	plus
-ACS_S1  	-	scan line 1
-ACS_S9  	\&_	scan line 9
+ACS_S1	-	scan line 1
+ACS_S9	\&_	scan line 9
 ACS_DIAMOND	+	diamond
 ACS_CKBOARD	:	checker board (stipple)
 ACS_DEGREE	'	degree symbol
@@ -90,11 +91,11 @@ ACS_UARROW	^	arrow pointing up
 ACS_BOARD	#	board of squares
 ACS_LANTERN	#	lantern symbol
 ACS_BLOCK	#	solid square block
-ACS_S3   	-	scan line 3
-ACS_S7  	-	scan line 7
+ACS_S3	-	scan line 3
+ACS_S7	-	scan line 7
 ACS_LEQUAL	<	less-than-or-equal-to
 ACS_GEQUAL	>	greater-than-or-equal-to
-ACS_PI  	*	greek pi
+ACS_PI	*	greek pi
 ACS_NEQUAL	!	not-equal
 ACS_STERLING	f	pound-sterling symbol
 .TE
@@ -138,7 +139,7 @@ to light.  The ACS-prefixed names for them were invented for \fBcurses\fR(3).
 .SH SEE ALSO
 \fBcurses\fR(3), \fBcurs_attr\fR(3), \fBcurs_clear\fR(3),
 \fBcurs_inch\fR(3), \fBcurs_outopts\fR(3), \fBcurs_refresh\fR(3),
-\fBputc\fR(3S).
+\fBputc\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libcurses/curs_attr.3tbl b/lib/libcurses/curs_attr.3tbl
index 7127ac63921..168e3aa3fb8 100644
--- a/lib/libcurses/curs_attr.3tbl
+++ b/lib/libcurses/curs_attr.3tbl
@@ -1,5 +1,6 @@
-.\" $OpenBSD: curs_attr.3tbl,v 1.3 1997/12/03 05:45:08 millert Exp $
-.\" Id: curs_attr.3x,v 1.12 1997/01/05 01:14:33 tom Exp $
+'\" t
+.\" $OpenBSD: curs_attr.3tbl,v 1.4 1997/12/14 23:15:37 millert Exp $
+.\" Id: curs_attr.3x,v 1.14 1997/12/13 22:38:46 tom Exp $
 .TH curs_attr 3 ""
 .SH NAME
 \fBattroff\fR, \fBwattroff\fR, \fBattron\fR, \fBwattron\fR,
@@ -85,7 +86,7 @@ than the remaining window width means to change attributes all the way to the
 end of the current line.  The \fBwchgat\fR function generalizes this to any
 window; the \fBmvwchgat\fR function does a cursor move before acting.  In these
 functions, the color argument is a color-pair index (as in the first argument
-of \fIinit_pair\fR, see \fBcurs_color\fR(3x)).  The \fBopts\fR argument is not
+of \fIinit_pair\fR, see \fBcurs_color\fR(3)).  The \fBopts\fR argument is not
 presently used, but is reserved for the future (leave it \fBNULL\fR).
 .SS Attributes
 The following video attributes, defined in \fB<curses.h>\fR, can be passed to
diff --git a/lib/libcurses/curs_color.3 b/lib/libcurses/curs_color.3
index 40b4d787834..fe60f26c31e 100644
--- a/lib/libcurses/curs_color.3
+++ b/lib/libcurses/curs_color.3
@@ -1,5 +1,5 @@
-.\" $OpenBSD: curs_color.3,v 1.4 1997/12/03 05:44:56 millert Exp $
-.\" Id: curs_color.3x,v 1.8 1997/01/19 02:50:30 tom Exp $
+.\" $OpenBSD: curs_color.3,v 1.5 1997/12/14 23:15:37 millert Exp $
+.\" Id: curs_color.3x,v 1.9 1997/12/06 22:06:00 tom Exp $
 .TH curs_color 3 ""
 .SH NAME
 \fBstart_color\fR, \fBinit_pair\fR,
@@ -130,7 +130,7 @@ historical implementations may use a single shared color palette.
 Note that setting an implicit background color via a color pair affects only
 character cells that a character write operation explicitly touches.  To change
 the background color used when parts of a window are blanked by erasing or
-scrolling operations, see \fBcurs_bkgd\fR(3x).
+scrolling operations, see \fBcurs_bkgd\fR(3).
 
 Several caveats apply on 386 and 486 machines with VGA-compatible graphics:
 
diff --git a/lib/libcurses/curs_getch.3tbl b/lib/libcurses/curs_getch.3tbl
index 2e47042434b..9977cd99e01 100644
--- a/lib/libcurses/curs_getch.3tbl
+++ b/lib/libcurses/curs_getch.3tbl
@@ -1,5 +1,6 @@
-.\" $OpenBSD: curs_getch.3tbl,v 1.3 1997/12/03 05:45:08 millert Exp $
-.\" Id: curs_getch.3x,v 1.11 1997/11/02 00:20:41 tom Exp $
+'\" t
+.\" $OpenBSD: curs_getch.3tbl,v 1.4 1997/12/14 23:15:38 millert Exp $
+.\" Id: curs_getch.3x,v 1.12 1997/12/13 22:39:05 tom Exp $
 .TH curs_getch 3 ""
 .SH NAME
 \fBgetch\fR, \fBwgetch\fR, \fBmvgetch\fR,
diff --git a/lib/libcurses/curs_inch.3tbl b/lib/libcurses/curs_inch.3tbl
index 9bab44a17ae..52674bc0b0e 100644
--- a/lib/libcurses/curs_inch.3tbl
+++ b/lib/libcurses/curs_inch.3tbl
@@ -1,5 +1,6 @@
-.\" $OpenBSD: curs_inch.3tbl,v 1.3 1997/12/03 05:45:09 millert Exp $
-.\" Id: curs_inch.3x,v 1.7 1997/01/05 01:29:23 tom Exp $
+'\" t
+.\" $OpenBSD: curs_inch.3tbl,v 1.4 1997/12/14 23:15:38 millert Exp $
+.\" Id: curs_inch.3x,v 1.8 1997/12/13 22:36:42 tom Exp $
 .TH curs_inch 3 ""
 .SH NAME
 \fBinch\fR, \fBwinch\fR, \fBmvinch\fR, \fBmvwinch\fR
@@ -29,7 +30,7 @@ The following bit-masks may be AND-ed with characters returned by \fBwinch\fR.
 l l .
 \fBA_CHARTEXT\fR	Bit-mask to extract character
 \fBA_ATTRIBUTES\fR	Bit-mask to extract attributes
-\fBA_COLOR\fR   	Bit-mask to extract color-pair field information
+\fBA_COLOR\fR	Bit-mask to extract color-pair field information
 .TE
 .SH NOTES
 Note that all of these routines may be macros.
diff --git a/lib/libcurses/curs_inchstr.3 b/lib/libcurses/curs_inchstr.3
index 3eeb17bb3b6..3144ae958cb 100644
--- a/lib/libcurses/curs_inchstr.3
+++ b/lib/libcurses/curs_inchstr.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: curs_inchstr.3,v 1.3 1997/12/03 05:44:58 millert Exp $
+.\" $OpenBSD: curs_inchstr.3,v 1.4 1997/12/14 23:15:39 millert Exp $
 .TH curs_inchstr 3 ""
 .SH NAME
 \fBinchstr\fR, \fBinchnstr\fR, \fBwinchstr\fR,
@@ -32,7 +32,7 @@ the last argument, return a leading substring at most \fIn\fR characters long
 (exclusive of the trailing (chtype)0).
 Constants defined in \fB<curses.h>\fR can be used with the \fB&\fR (logical
 AND) operator to extract the character or the attribute alone from any position
-in the \fIchstr\fR [see curs_inch(3)].
+in the \fIchstr\fR [see \fBcurs_inch\fR(3)].
 .SH RETURN VALUE
 All routines return the integer \fBERR\fR upon failure and an integer value
 other than \fBERR\fR upon successful completion (the number of characters
diff --git a/lib/libcurses/curs_inopts.3 b/lib/libcurses/curs_inopts.3
index 9004e2d66cd..aac0228cbbd 100644
--- a/lib/libcurses/curs_inopts.3
+++ b/lib/libcurses/curs_inopts.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: curs_inopts.3,v 1.3 1997/12/03 05:44:58 millert Exp $
+.\" $OpenBSD: curs_inopts.3,v 1.4 1997/12/14 23:15:39 millert Exp $
+.\" Id: curs_inopts.3x,v 1.7 1997/12/14 01:12:04 tom Exp $
 .TH curs_inopts 3 ""
 .SH NAME
 \fBcbreak\fR, \fBnocbreak\fR, \fBecho\fR,
@@ -54,7 +55,8 @@ mode.
 Initially the terminal may or may not be in \fBcbreak\fR mode, as the mode is
 inherited; therefore, a program should call \fBcbreak\fR or \fBnocbreak\fR
 explicitly.  Most interactive programs using \fBcurses\fR set the \fBcbreak\fR
-mode.  Note that \fBcbreak\fR overrides \fBraw\fR.  [See curs_getch(3) for a
+mode.  Note that \fBcbreak\fR overrides \fBraw\fR.
+[See \fBcurs_getch\fR(3) for a
 discussion of how these routines interact with \fBecho\fR and \fBnoecho\fR.]
 
 The \fBecho\fR and \fBnoecho\fR routines control whether characters typed by
@@ -62,7 +64,8 @@ the user are echoed by \fBgetch\fR as they are typed.  Echoing by the tty
 driver is always disabled, but initially \fBgetch\fR is in echo mode, so
 characters typed are echoed.  Authors of most interactive programs prefer to do
 their own echoing in a controlled area of the screen, or not to echo at all, so
-they disable echoing by calling \fBnoecho\fR.  [See curs_getch(3) for a
+they disable echoing by calling \fBnoecho\fR.
+[See \fBcurs_getch\fR(3) for a
 discussion of how these routines interact with \fBcbreak\fR and
 \fBnocbreak\fR.]
 
diff --git a/lib/libcurses/curs_kernel.3 b/lib/libcurses/curs_kernel.3
index ad389f6347d..a9ca288c23f 100644
--- a/lib/libcurses/curs_kernel.3
+++ b/lib/libcurses/curs_kernel.3
@@ -1,10 +1,10 @@
-.\" $OpenBSD: curs_kernel.3,v 1.4 1997/12/03 05:45:00 millert Exp $
+.\" $OpenBSD: curs_kernel.3,v 1.5 1997/12/14 23:15:40 millert Exp $
 .TH curs_kernel 3 ""
 .SH NAME
 \fBdef_prog_mode\fR, \fBdef_shell_mode\fR,
 \fBreset_prog_mode\fR, \fBreset_shell_mode\fR, \fBresetty\fR,
 \fBsavetty\fR, \fBgetsyx\fR, \fBsetsyx\fR, \fBripoffline\fR,
-\fBcurs_set\fR, \fBnapms\fR - low-level \fBxscurses\fR routines
+\fBcurs_set\fR, \fBnapms\fR - low-level \fBcurses\fR routines
 .SH SYNOPSIS
 \fB#include <curses.h>\fR
 
@@ -71,7 +71,7 @@ at the beginning, do its manipulation of its own windows, do a
 \fBdoupdate\fR.
 
 The \fBripoffline\fR routine provides access to the same facility that
-\fBslk_init\fR [see curs_slk(3)] uses to reduce the size of the
+\fBslk_init\fR [see \fBcurs_slk\fR(3)] uses to reduce the size of the
 screen.  \fBripoffline\fR must be called before \fBinitscr\fR or
 \fBnewterm\fR is called.  If \fIline\fR is positive, a line is removed
 from the top of \fBstdscr\fR; if \fIline\fR is negative, a line is
diff --git a/lib/libcurses/curs_mouse.3tbl b/lib/libcurses/curs_mouse.3tbl
index e0bdf4ac054..c4a7f306e85 100644
--- a/lib/libcurses/curs_mouse.3tbl
+++ b/lib/libcurses/curs_mouse.3tbl
@@ -1,5 +1,6 @@
-.\" $OpenBSD: curs_mouse.3tbl,v 1.3 1997/12/03 05:45:09 millert Exp $
 '\" t
+.\" $OpenBSD: curs_mouse.3tbl,v 1.4 1997/12/14 23:15:40 millert Exp $
+.\" Id: curs_mouse.3x,v 0.7 1997/12/13 22:36:24 tom Exp $
 .TH curs_mouse 3 ""
 .SH NAME
 \fBgetmouse\fR, \fBungetmouse\fR, 
@@ -31,7 +32,7 @@ MEVENT;\fR
 .br
 .SH DESCRIPTION
 These functions provide an interface to mouse events from
-\fBcurses\fR(3x).  Mouse events are represented by \fBKEY_MOUSE\fR
+\fBcurses\fR(3).  Mouse events are represented by \fBKEY_MOUSE\fR
 pseudo-key values in the \fBwgetch\fR input stream.
 
 To make mouse events visible, use the \fBmousemask\fR function.  This will set
@@ -52,24 +53,24 @@ l l
 _ _
 l l.
 \fIName\fR	\fIDescription\fR
-BUTTON1_PRESSED 	mouse button 1 down 
+BUTTON1_PRESSED	mouse button 1 down 
 BUTTON1_RELEASED	mouse button 1 up 
-BUTTON1_CLICKED 	mouse button 1 clicked
+BUTTON1_CLICKED	mouse button 1 clicked
 BUTTON1_DOUBLE_CLICKED	mouse button 1 double clicked
 BUTTON1_TRIPLE_CLICKED	mouse button 1 triple clicked
-BUTTON2_PRESSED 	mouse button 2 down 
+BUTTON2_PRESSED	mouse button 2 down 
 BUTTON2_RELEASED	mouse button 2 up 
-BUTTON2_CLICKED 	mouse button 2 clicked
+BUTTON2_CLICKED	mouse button 2 clicked
 BUTTON2_DOUBLE_CLICKED	mouse button 2 double clicked
 BUTTON2_TRIPLE_CLICKED	mouse button 2 triple clicked
-BUTTON3_PRESSED 	mouse button 3 down 
+BUTTON3_PRESSED	mouse button 3 down 
 BUTTON3_RELEASED	mouse button 3 up 
-BUTTON3_CLICKED 	mouse button 3 clicked
+BUTTON3_CLICKED	mouse button 3 clicked
 BUTTON3_DOUBLE_CLICKED	mouse button 3 double clicked
 BUTTON3_TRIPLE_CLICKED	mouse button 3 triple clicked
-BUTTON4_PRESSED 	mouse button 4 down 
+BUTTON4_PRESSED	mouse button 4 down 
 BUTTON4_RELEASED	mouse button 4 up 
-BUTTON4_CLICKED 	mouse button 4 clicked
+BUTTON4_CLICKED	mouse button 4 clicked
 BUTTON4_DOUBLE_CLICKED	mouse button 4 double clicked
 BUTTON4_TRIPLE_CLICKED	mouse button 4 triple clicked
 BUTTON_SHIFT	shift was down during button state change
@@ -113,7 +114,7 @@ termination.
 All routines return the integer \fBERR\fR upon failure or \fBOK\fR
 upon successful completion.
 .SH PORTABILITY
-These calls were designed for \fBcurses\fR(3x), and are not found in SVr4
+These calls were designed for \fBcurses\fR(3), 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
@@ -125,11 +126,11 @@ incremented.
 The order of the \fBMEVENT\fR structure members is not guaranteed.  
 Additional fields may be added to the structure in the future.
 
-Under \fBcurses\fR(3x), these calls are implemented using either
+Under \fBcurses\fR(3), 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
 running on your machine, mouse events will not be visible to
-\fBcurses\fR(3x) (and the \fBwmousemask\fR function will always
+\fBcurses\fR(3) (and the \fBwmousemask\fR function will always
 return \fB0\fR).
 
 The z member in the event structure is not presently used.  It is intended
diff --git a/lib/libcurses/curs_print.3 b/lib/libcurses/curs_print.3
index e3f86f1e9b1..7b470bcd449 100644
--- a/lib/libcurses/curs_print.3
+++ b/lib/libcurses/curs_print.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: curs_print.3,v 1.3 1997/12/03 05:45:02 millert Exp $
+.\" $OpenBSD: curs_print.3,v 1.4 1997/12/14 23:15:41 millert Exp $
+.\" Id: curs_print.3x,v 1.2 1997/12/06 22:07:19 tom Exp $
 .TH curs_print 3 ""
 .SH NAME
 \fBmcprint\fR - ship binary data to printer
@@ -31,7 +32,7 @@ Couldn't allocate sufficient memory to buffer the printer write.
 When \fBmcprint\fR succeeds, it returns the number of characters actually
 sent to the printer.
 .SH PORTABILITY
-The \fBmcprint\fR call was designed for \fBcurses\fR(3x), and is not found
+The \fBmcprint\fR call was designed for \fBcurses\fR(3), and is not found
 in SVr4 curses, 4.4BSD curses, or any other previous version of curses.
 .SH BUGS
 Padding in the \fBmc5p\fR, \fBmc4\fR and \fBmc5\fR capabilities will not be
diff --git a/lib/libcurses/curs_printw.3 b/lib/libcurses/curs_printw.3
index 0fabd03450f..6fef8bbcab7 100644
--- a/lib/libcurses/curs_printw.3
+++ b/lib/libcurses/curs_printw.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: curs_printw.3,v 1.4 1997/12/03 05:45:03 millert Exp $
+.\" $OpenBSD: curs_printw.3,v 1.5 1997/12/14 23:15:41 millert Exp $
 .TH curs_printw 3 ""
 .SH NAME
 \fBprintw\fR, \fBwprintw\fR, \fBmvprintw\fR,
@@ -22,12 +22,12 @@
 .br
 .SH DESCRIPTION
 The \fBprintw\fR, \fBwprintw\fR, \fBmvprintw\fR and \fBmvwprintw\fR
-routines are analogous to \fBprintf\fR [see \fBprintf\fR(3S)].  In
+routines are analogous to \fBprintf\fR [see \fBprintf\fR(3)].  In
 effect, the string that would be output by \fBprintf\fR is output
 instead as though \fBwaddstr\fR were used on the given window.
 
 The \fBvwprintw\fR routine is analogous to \fBvprintf\fR [see
-\fBprintf\fR(3S)] and performs a \fBwprintw\fR using a variable
+\fBprintf\fR(3)] and performs a \fBwprintw\fR using a variable
 argument list.  The third argument is a \fBva_list\fR, a pointer to a
 list of arguments, as defined in \fB<varargs.h>\fR.
 .SH RETURN VALUE
@@ -39,7 +39,7 @@ The XSI Curses standard, Issue 4 describes these functions.  The function
 \fBvwprintw\fR is marked TO BE WITHDRAWN, and is to be replaced by a function
 \fBvw_printw\fR using the \fB<stdarg.h>\fR interface.
 .SH SEE ALSO
-\fBcurses\fR(3), \fBprintf\fR(3S), \fBvprintf(3S)\fR
+\fBcurses\fR(3), \fBprintf\fR(3), \fBvprintf(3)\fR
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libcurses/curs_resize.3 b/lib/libcurses/curs_resize.3
deleted file mode 100644
index 7e677d137df..00000000000
--- a/lib/libcurses/curs_resize.3
+++ /dev/null
@@ -1,46 +0,0 @@
-.\" $OpenBSD: curs_resize.3,v 1.3 1997/12/03 05:45:03 millert Exp $
-.TH wresize 3 ""
-
-.SH NAME
-\fBwresize\fR - resize a curses window
-
-.SH SYNOPSIS
-\fB#include <curses.h>\fR
-
-\fBint wresize(WINDOW *win, int lines, int columns);\fR
-
-.SH DESCRIPTION 
-The \fBwresize\fR function adjusts the dimensions of an \fBncurses\fR
-window to the specified values, reallocating storage as necessary.
-
-If either dimension is larger than the current values, the window's
-data is filled with blanks that have the current background rendition
-(as set by \fBwbkgndset\fR) merged into them.  If the current cursor
-position is outside the retained area of the window, the cursor is
-moved to within the nearest window edge.  Window data is otherwise
-preserved.
-
-This function will fail if either of the new dimensions less than or
-equal to zero, or if memory cannot be allocated or reallocated for the
-window.
-
-Note that \fBwresize\fR performs non-reentrant \fBmalloc\fR(3x)
-operations, so it isn't advisable to resize from within an interrupt handler.
-Instead, have your handler set an event flag to be interpreted next time
-around your program's command loop.
-
-.SH PORTABILITY
-This call was designed for \fBncurses\fR(3x), and is not found in SVr4
-curses, 4.4BSD curses, or any other previous version of curses.  It
-is recommended that you conditionalize all code depending on it with
-the symbol NCURSES.
-
-.SH RETURN VALUE
-The function returns the integer \fBERR\fR upon failure and \fBOK\fR
-on success.
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/lib/libcurses/curs_scanw.3 b/lib/libcurses/curs_scanw.3
index 0810bf2d433..19b290f084e 100644
--- a/lib/libcurses/curs_scanw.3
+++ b/lib/libcurses/curs_scanw.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: curs_scanw.3,v 1.3 1997/12/03 05:45:04 millert Exp $
+.\" $OpenBSD: curs_scanw.3,v 1.4 1997/12/14 23:15:42 millert Exp $
+.\" Id: curs_scanw.3x,v 1.6 1997/12/14 01:04:36 tom Exp $
 .TH curs_scanw 3 ""
 .SH NAME
 \fBscanw\fR, \fBwscanw\fR, \fBmvscanw\fR,
@@ -19,7 +20,7 @@
 \fBint vwscanw(WINDOW *win, char *fmt, va_list varglist);\fR
 .SH DESCRIPTION
 The \fBscanw\fR, \fBwscanw\fR and \fBmvscanw\fR routines are analogous to
-\fBscanf\fR [see \fBscanf\fR(3S)].  The effect of these routines is as though
+\fBscanf\fR [see \fBscanf\fR(3)].  The effect of these routines is as though
 \fBwgetstr\fR were called on the window, and the resulting line used as input
 for \fBsscanf\fR(3).  Fields which do not map to a variable in the \fIfmt\fR
 field are lost.
@@ -40,7 +41,7 @@ The XSI Curses standard, Issue 4 describes these functions.  The function
 \fBvwscanw\fR is marked TO BE WITHDRAWN, and is to be replaced by a function
 \fBvw_scanw\fR using the \fB<stdarg.h>\fR interface.
 .SH SEE ALSO
-\fBcurses\fR(3), \fBcurs_getstr\fR, \fBcurs_printw\fR, \fBscanf\fR(3S)
+\fBcurses\fR(3), \fBcurs_getstr\fR(3), \fBcurs_printw\fR(3), \fBscanf\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libcurses/curs_scr_dmp.3 b/lib/libcurses/curs_scr_dmp.3
index c3e5e503f4f..29bc7b40e26 100644
--- a/lib/libcurses/curs_scr_dmp.3
+++ b/lib/libcurses/curs_scr_dmp.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: curs_scr_dmp.3,v 1.3 1997/12/03 05:45:04 millert Exp $
+.\" $OpenBSD: curs_scr_dmp.3,v 1.4 1997/12/14 23:15:42 millert Exp $
 .TH curs_scr_dump 3 ""
 .SH NAME
 \fBscr_dump\fR, \fBscr_restore\fR,
@@ -56,7 +56,7 @@ considered invalid "if the time-stamp of the tty is old" but don't define
 "old".
 .SH SEE ALSO
 \fBcurses\fR(3), \fBcurs_initscr\fR(3), \fBcurs_refresh\fR(3),
-\fBcurs_util\fR(3), \fBsystem\fR(3S)
+\fBcurs_util\fR(3), \fBsystem\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libcurses/curses.3tbl b/lib/libcurses/curses.3tbl
index 3ef1d74f69c..bb740e7bb49 100644
--- a/lib/libcurses/curses.3tbl
+++ b/lib/libcurses/curses.3tbl
@@ -1,5 +1,6 @@
-.\" $OpenBSD: curses.3tbl,v 1.3 1997/12/03 05:45:10 millert Exp $
-.\" Id: ncurses.3x,v 1.19 1997/01/05 00:42:39 tom Exp $
+'\" t
+.\" $OpenBSD: curses.3tbl,v 1.4 1997/12/14 23:15:43 millert Exp $
+.\" Id: ncurses.3x,v 1.22 1997/12/14 02:03:01 tom Exp $
 .TH curses 3 ""
 .ds n 5
 .ds d /usr/share/terminfo
@@ -58,7 +59,7 @@ default window called \fBstdscr\fR, which is the size of the terminal
 screen, is supplied.  Others may be created with \fBnewwin\fR.
 
 Note that \fBcurses\fR does not handle overlapping windows, that's done by
-the \fBpanels(3x)\fR library. This means that you can either use
+the \fBpanel(3)\fR library. This means that you can either use
 \fBstdscr\fR or divide the screen into tiled windows and not using
 \fBstdscr\fR at all. Mixing the two will result in unpredictable, and
 undesired, effects.
@@ -79,7 +80,7 @@ about the character may also be stored with each character.
 
 Special windows called \fIpads\fR may also be manipulated.  These are windows
 which are not constrained to the size of the screen and whose contents need not
-be completely displayed.  See curs_pad(3) for more information.
+be completely displayed.  See \fBcurs_pad\fR(3) for more information.
 
 In addition to drawing characters on the screen, video attributes and colors
 may be supported, causing the characters to show up in such modes as
@@ -164,273 +165,273 @@ l l
 l l .
 \fBcurses\fR Routine Name/Manual Page Name
 =
-addch/curs_addch(3)
-addchnstr/curs_addchstr(3)
-addchstr/curs_addchstr(3)
-addnstr/curs_addstr(3)
-addstr/curs_addstr(3)
-attroff/curs_attr(3)
-attron/curs_attr(3)
-attrset/curs_attr(3)
-baudrate/curs_termattrs(3)
-beep/curs_beep(3)
-bkgd/curs_bkgd(3)
-bkgdset/curs_bkgd(3)
-border/curs_border(3)
-box/curs_border(3)
-can_change_color/curs_color(3)
-cbreak/curs_inopts(3)
-clear/curs_clear(3)
-clearok/curs_outopts(3)
-clrtobot/curs_clear(3)
-clrtoeol/curs_clear(3)
-color_content/curs_color(3)
-copywin/curs_overlay(3)
-curs_set/curs_kernel(3)
-def_prog_mode/curs_kernel(3)
-def_shell_mode/curs_kernel(3)
-del_curterm/curs_terminfo(3)
-delay_output/curs_util(3)
-delch/curs_delch(3)
-deleteln/curs_deleteln(3)
-delscreen/curs_initscr(3)
-delwin/curs_window(3)
-derwin/curs_window(3)
-doupdate/curs_refresh(3)
-dupwin/curs_window(3)
-echo/curs_inopts(3)
-echochar/curs_addch(3)
-endwin/curs_initscr(3)
-erase/curs_clear(3)
-erasechar/curs_termattrs(3)
-filter/curs_util(3)
-flash/curs_beep(3)
-flushinp/curs_util(3)
-getbegyx/curs_getyx(3)
-getch/curs_getch(3)
-getmaxyx/curs_getyx(3)
-getmouse/curs_mouse(3)*
-getparyx/curs_getyx(3)
-getstr/curs_getstr(3)
-getsyx/curs_kernel(3)
-getwin/curs_util(3)
-getyx/curs_getyx(3)
-halfdelay/curs_inopts(3)
-has_colors/curs_color(3)
-has_ic/curs_termattrs(3)
-has_il/curs_termattrs(3)
-has_key/curs_getch(3)*
-hline/curs_border(3)
-idcok/curs_outopts(3)
-idlok/curs_outopts(3)
-immedok/curs_outopts(3)
-inch/curs_inch(3)
-inchnstr/curs_inchstr(3)
-inchstr/curs_inchstr(3)
-init_color/curs_color(3)
-init_pair/curs_color(3)
-initscr/curs_initscr(3)
-innstr/curs_instr(3)
-insch/curs_insch(3)
-insdelln/curs_deleteln(3)
-insertln/curs_deleteln(3)
-insnstr/curs_insstr(3)
-insstr/curs_insstr(3)
-instr/curs_instr(3)
-intrflush/curs_inopts(3)
-is_linetouched/curs_touch(3)
-is_wintouched/curs_touch(3)
-isendwin/curs_initscr(3)
-keyname/curs_util(3)
-keypad/curs_inopts(3)
-killchar/curs_termattrs(3)
-leaveok/curs_outopts(3)
-longname/curs_termattrs(3)
-mcprint/curs_print(3)*
-meta/curs_inopts(3)
-mouseinterval/curs_mouse(3)*
-mousemask/curs_mouse(3)*
-move/curs_move(3)
-mvaddch/curs_addch(3)
-mvaddchnstr/curs_addchstr(3)
-mvaddchstr/curs_addchstr(3)
-mvaddnstr/curs_addstr(3)
-mvaddstr/curs_addstr(3)
-mvcur/curs_terminfo(3)
-mvdelch/curs_delch(3)
-mvderwin/curs_window(3)
-mvgetch/curs_getch(3)
-mvgetstr/curs_getstr(3)
-mvinch/curs_inch(3)
-mvinchnstr/curs_inchstr(3)
-mvinchstr/curs_inchstr(3)
-mvinnstr/curs_instr(3)
-mvinsch/curs_insch(3)
-mvinsnstr/curs_insstr(3)
-mvinsstr/curs_insstr(3)
-mvinstr/curs_instr(3)
-mvprintw/curs_printw(3)
-mvscanw/curs_scanw(3)
-mvwaddch/curs_addch(3)
-mvwaddchnstr/curs_addchstr(3)
-mvwaddchstr/curs_addchstr(3)
-mvwaddnstr/curs_addstr(3)
-mvwaddstr/curs_addstr(3)
-mvwdelch/curs_delch(3)
-mvwgetch/curs_getch(3)
-mvwgetstr/curs_getstr(3)
-mvwin/curs_window(3)
-mvwinch/curs_inch(3)
-mvwinchnstr/curs_inchstr(3)
-mvwinchstr/curs_inchstr(3)
-mvwinnstr/curs_instr(3)
-mvwinsch/curs_insch(3)
-mvwinsnstr/curs_insstr(3)
-mvwinsstr/curs_insstr(3)
-mvwinstr/curs_instr(3)
-mvwprintw/curs_printw(3)
-mvwscanw/curs_scanw(3)
-napms/curs_kernel(3)
-newpad/curs_pad(3)
-newterm/curs_initscr(3)
-newwin/curs_window(3)
-nl/curs_outopts(3)
-nocbreak/curs_inopts(3)
-nodelay/curs_inopts(3)
-noecho/curs_inopts(3)
-nonl/curs_outopts(3)
-noqiflush/curs_inopts(3)
-noraw/curs_inopts(3)
-notimeout/curs_inopts(3)
-overlay/curs_overlay(3)
-overwrite/curs_overlay(3)
-pair_content/curs_color(3)
-pechochar/curs_pad(3)
-pnoutrefresh/curs_pad(3)
-prefresh/curs_pad(3)
-printw/curs_printw(3)
-putp/curs_terminfo(3)
-putwin/curs_util(3)
-qiflush/curs_inopts(3)
-raw/curs_inopts(3)
-redrawwin/curs_refresh(3)
-refresh/curs_refresh(3)
-reset_prog_mode/curs_kernel(3)
-reset_shell_mode/curs_kernel(3)
-resetty/curs_kernel(3)
-resizeterm/resizeterm(3x)*
-restartterm/curs_terminfo(3)
-ripoffline/curs_kernel(3)
-savetty/curs_kernel(3)
-scanw/curs_scanw(3)
-scr_dump/curs_scr_dump(3)
-scr_init/curs_scr_dump(3)
-scr_restore/curs_scr_dump(3)
-scr_set/curs_scr_dump(3)
-scrl/curs_scroll(3)
-scroll/curs_scroll(3)
-scrollok/curs_outopts(3)
-set_curterm/curs_terminfo(3)
-set_term/curs_initscr(3)
-setscrreg/curs_outopts(3)
-setsyx/curs_kernel(3)
-setterm/curs_terminfo(3)
-setupterm/curs_terminfo(3)
-slk_attr/curs_slk(3)*
-slk_attroff/curs_slk(3)
-slk_attron/curs_slk(3)
-slk_attrset/curs_slk(3)
-slk_clear/curs_slk(3)
-slk_init/curs_slk(3)
-slk_label/curs_slk(3)
-slk_noutrefresh/curs_slk(3)
-slk_refresh/curs_slk(3)
-slk_restore/curs_slk(3)
-slk_set/curs_slk(3)
-slk_touch/curs_slk(3)
-standend/curs_attr(3)
-standout/curs_attr(3)
-start_color/curs_color(3)
-subpad/curs_pad(3)
-subwin/curs_window(3)
-syncok/curs_window(3)
-termattrs/curs_termattrs(3)
-termname/curs_termattrs(3)
-tgetent/curs_termcap(3)
-tgetflag/curs_termcap(3)
-tgetnum/curs_termcap(3)
-tgetstr/curs_termcap(3)
-tgoto/curs_termcap(3)
-tigetflag/curs_terminfo(3)
-tigetnum/curs_terminfo(3)
-tigetstr/curs_terminfo(3)
-timeout/curs_inopts(3)
-touchline/curs_touch(3)
-touchwin/curs_touch(3)
-tparm/curs_terminfo(3)
-tputs/curs_termcap(3)
-tputs/curs_terminfo(3)
-typeahead/curs_inopts(3)
-unctrl/curs_util(3)
-ungetch/curs_getch(3)
-ungetmouse/curs_mouse(3)*
-untouchwin/curs_touch(3)
-use_env/curs_util(3)
-vidattr/curs_terminfo(3)
-vidputs/curs_terminfo(3)
-vline/curs_border(3)
-vwprintw/curs_printw(3)
-vwscanw/curs_scanw(3)
-waddch/curs_addch(3)
-waddchnstr/curs_addchstr(3)
-waddchstr/curs_addchstr(3)
-waddnstr/curs_addstr(3)
-waddstr/curs_addstr(3)
-wattroff/curs_attr(3)
-wattron/curs_attr(3)
-wattrset/curs_attr(3)
-wbkgd/curs_bkgd(3)
-wbkgdset/curs_bkgd(3)
-wborder/curs_border(3)
-wclear/curs_clear(3)
-wclrtobot/curs_clear(3)
-wclrtoeol/curs_clear(3)
-wcursyncup/curs_window(3)
-wdelch/curs_delch(3)
-wdeleteln/curs_deleteln(3)
-wechochar/curs_addch(3)
-wenclose/curs_mouse(3)*
-werase/curs_clear(3)
-wgetch/curs_getch(3)
-wgetnstr/curs_getstr(3)
-wgetstr/curs_getstr(3)
-whline/curs_border(3)
-winch/curs_inch(3)
-winchnstr/curs_inchstr(3)
-winchstr/curs_inchstr(3)
-winnstr/curs_instr(3)
-winsch/curs_insch(3)
-winsdelln/curs_deleteln(3)
-winsertln/curs_deleteln(3)
-winsnstr/curs_insstr(3)
-winsstr/curs_insstr(3)
-winstr/curs_instr(3)
-wmove/curs_move(3)
-wnoutrefresh/curs_refresh(3)
-wprintw/curs_printw(3)
-wredrawln/curs_refresh(3)
-wrefresh/curs_refresh(3)
-wresize/wresize(3x)*
-wscanw/curs_scanw(3)
-wscrl/curs_scroll(3)
-wsetscrreg/curs_outopts(3)
-wstandend/curs_attr(3)
-wstandout/curs_attr(3)
-wsyncdown/curs_window(3)
-wsyncup/curs_window(3)
-wtimeout/curs_inopts(3)
-wtouchln/curs_touch(3)
-wvline/curs_border(3)
+addch/\fBcurs_addch\fR(3)
+addchnstr/\fBcurs_addchstr\fR(3)
+addchstr/\fBcurs_addchstr\fR(3)
+addnstr/\fBcurs_addstr\fR(3)
+addstr/\fBcurs_addstr\fR(3)
+attroff/\fBcurs_attr\fR(3)
+attron/\fBcurs_attr\fR(3)
+attrset/\fBcurs_attr\fR(3)
+baudrate/\fBcurs_termattrs\fR(3)
+beep/\fBcurs_beep\fR(3)
+bkgd/\fBcurs_bkgd\fR(3)
+bkgdset/\fBcurs_bkgd\fR(3)
+border/\fBcurs_border\fR(3)
+box/\fBcurs_border\fR(3)
+can_change_color/\fBcurs_color\fR(3)
+cbreak/\fBcurs_inopts\fR(3)
+clear/\fBcurs_clear\fR(3)
+clearok/\fBcurs_outopts\fR(3)
+clrtobot/\fBcurs_clear\fR(3)
+clrtoeol/\fBcurs_clear\fR(3)
+color_content/\fBcurs_color\fR(3)
+copywin/\fBcurs_overlay\fR(3)
+curs_set/\fBcurs_kernel\fR(3)
+def_prog_mode/\fBcurs_kernel\fR(3)
+def_shell_mode/\fBcurs_kernel\fR(3)
+del_curterm/\fBcurs_terminfo\fR(3)
+delay_output/\fBcurs_util\fR(3)
+delch/\fBcurs_delch\fR(3)
+deleteln/\fBcurs_deleteln\fR(3)
+delscreen/\fBcurs_initscr\fR(3)
+delwin/\fBcurs_window\fR(3)
+derwin/\fBcurs_window\fR(3)
+doupdate/\fBcurs_refresh\fR(3)
+dupwin/\fBcurs_window\fR(3)
+echo/\fBcurs_inopts\fR(3)
+echochar/\fBcurs_addch\fR(3)
+endwin/\fBcurs_initscr\fR(3)
+erase/\fBcurs_clear\fR(3)
+erasechar/\fBcurs_termattrs\fR(3)
+filter/\fBcurs_util\fR(3)
+flash/\fBcurs_beep\fR(3)
+flushinp/\fBcurs_util\fR(3)
+getbegyx/\fBcurs_getyx\fR(3)
+getch/\fBcurs_getch\fR(3)
+getmaxyx/\fBcurs_getyx\fR(3)
+getmouse/\fBcurs_mouse\fR(3)*
+getparyx/\fBcurs_getyx\fR(3)
+getstr/\fBcurs_getstr\fR(3)
+getsyx/\fBcurs_kernel\fR(3)
+getwin/\fBcurs_util\fR(3)
+getyx/\fBcurs_getyx\fR(3)
+halfdelay/\fBcurs_inopts\fR(3)
+has_colors/\fBcurs_color\fR(3)
+has_ic/\fBcurs_termattrs\fR(3)
+has_il/\fBcurs_termattrs\fR(3)
+has_key/\fBcurs_getch\fR(3)*
+hline/\fBcurs_border\fR(3)
+idcok/\fBcurs_outopts\fR(3)
+idlok/\fBcurs_outopts\fR(3)
+immedok/\fBcurs_outopts\fR(3)
+inch/\fBcurs_inch\fR(3)
+inchnstr/\fBcurs_inchstr\fR(3)
+inchstr/\fBcurs_inchstr\fR(3)
+init_color/\fBcurs_color\fR(3)
+init_pair/\fBcurs_color\fR(3)
+initscr/\fBcurs_initscr\fR(3)
+innstr/\fBcurs_instr\fR(3)
+insch/\fBcurs_insch\fR(3)
+insdelln/\fBcurs_deleteln\fR(3)
+insertln/\fBcurs_deleteln\fR(3)
+insnstr/\fBcurs_insstr\fR(3)
+insstr/\fBcurs_insstr\fR(3)
+instr/\fBcurs_instr\fR(3)
+intrflush/\fBcurs_inopts\fR(3)
+is_linetouched/\fBcurs_touch\fR(3)
+is_wintouched/\fBcurs_touch\fR(3)
+isendwin/\fBcurs_initscr\fR(3)
+keyname/\fBcurs_util\fR(3)
+keypad/\fBcurs_inopts\fR(3)
+killchar/\fBcurs_termattrs\fR(3)
+leaveok/\fBcurs_outopts\fR(3)
+longname/\fBcurs_termattrs\fR(3)
+mcprint/\fBcurs_print\fR(3)*
+meta/\fBcurs_inopts\fR(3)
+mouseinterval/\fBcurs_mouse\fR(3)*
+mousemask/\fBcurs_mouse\fR(3)*
+move/\fBcurs_move\fR(3)
+mvaddch/\fBcurs_addch\fR(3)
+mvaddchnstr/\fBcurs_addchstr\fR(3)
+mvaddchstr/\fBcurs_addchstr\fR(3)
+mvaddnstr/\fBcurs_addstr\fR(3)
+mvaddstr/\fBcurs_addstr\fR(3)
+mvcur/\fBcurs_terminfo\fR(3)
+mvdelch/\fBcurs_delch\fR(3)
+mvderwin/\fBcurs_window\fR(3)
+mvgetch/\fBcurs_getch\fR(3)
+mvgetstr/\fBcurs_getstr\fR(3)
+mvinch/\fBcurs_inch\fR(3)
+mvinchnstr/\fBcurs_inchstr\fR(3)
+mvinchstr/\fBcurs_inchstr\fR(3)
+mvinnstr/\fBcurs_instr\fR(3)
+mvinsch/\fBcurs_insch\fR(3)
+mvinsnstr/\fBcurs_insstr\fR(3)
+mvinsstr/\fBcurs_insstr\fR(3)
+mvinstr/\fBcurs_instr\fR(3)
+mvprintw/\fBcurs_printw\fR(3)
+mvscanw/\fBcurs_scanw\fR(3)
+mvwaddch/\fBcurs_addch\fR(3)
+mvwaddchnstr/\fBcurs_addchstr\fR(3)
+mvwaddchstr/\fBcurs_addchstr\fR(3)
+mvwaddnstr/\fBcurs_addstr\fR(3)
+mvwaddstr/\fBcurs_addstr\fR(3)
+mvwdelch/\fBcurs_delch\fR(3)
+mvwgetch/\fBcurs_getch\fR(3)
+mvwgetstr/\fBcurs_getstr\fR(3)
+mvwin/\fBcurs_window\fR(3)
+mvwinch/\fBcurs_inch\fR(3)
+mvwinchnstr/\fBcurs_inchstr\fR(3)
+mvwinchstr/\fBcurs_inchstr\fR(3)
+mvwinnstr/\fBcurs_instr\fR(3)
+mvwinsch/\fBcurs_insch\fR(3)
+mvwinsnstr/\fBcurs_insstr\fR(3)
+mvwinsstr/\fBcurs_insstr\fR(3)
+mvwinstr/\fBcurs_instr\fR(3)
+mvwprintw/\fBcurs_printw\fR(3)
+mvwscanw/\fBcurs_scanw\fR(3)
+napms/\fBcurs_kernel\fR(3)
+newpad/\fBcurs_pad\fR(3)
+newterm/\fBcurs_initscr\fR(3)
+newwin/\fBcurs_window\fR(3)
+nl/\fBcurs_outopts\fR(3)
+nocbreak/\fBcurs_inopts\fR(3)
+nodelay/\fBcurs_inopts\fR(3)
+noecho/\fBcurs_inopts\fR(3)
+nonl/\fBcurs_outopts\fR(3)
+noqiflush/\fBcurs_inopts\fR(3)
+noraw/\fBcurs_inopts\fR(3)
+notimeout/\fBcurs_inopts\fR(3)
+overlay/\fBcurs_overlay\fR(3)
+overwrite/\fBcurs_overlay\fR(3)
+pair_content/\fBcurs_color\fR(3)
+pechochar/\fBcurs_pad\fR(3)
+pnoutrefresh/\fBcurs_pad\fR(3)
+prefresh/\fBcurs_pad\fR(3)
+printw/\fBcurs_printw\fR(3)
+putp/\fBcurs_terminfo\fR(3)
+putwin/\fBcurs_util\fR(3)
+qiflush/\fBcurs_inopts\fR(3)
+raw/\fBcurs_inopts\fR(3)
+redrawwin/\fBcurs_refresh\fR(3)
+refresh/\fBcurs_refresh\fR(3)
+reset_prog_mode/\fBcurs_kernel\fR(3)
+reset_shell_mode/\fBcurs_kernel\fR(3)
+resetty/\fBcurs_kernel\fR(3)
+resizeterm/\fBresizeterm\fR(3)*
+restartterm/\fBcurs_terminfo\fR(3)
+ripoffline/\fBcurs_kernel\fR(3)
+savetty/\fBcurs_kernel\fR(3)
+scanw/\fBcurs_scanw\fR(3)
+scr_dump/\fBcurs_scr_dump\fR(3)
+scr_init/\fBcurs_scr_dump\fR(3)
+scr_restore/\fBcurs_scr_dump\fR(3)
+scr_set/\fBcurs_scr_dump\fR(3)
+scrl/\fBcurs_scroll\fR(3)
+scroll/\fBcurs_scroll\fR(3)
+scrollok/\fBcurs_outopts\fR(3)
+set_curterm/\fBcurs_terminfo\fR(3)
+set_term/\fBcurs_initscr\fR(3)
+setscrreg/\fBcurs_outopts\fR(3)
+setsyx/\fBcurs_kernel\fR(3)
+setterm/\fBcurs_terminfo\fR(3)
+setupterm/\fBcurs_terminfo\fR(3)
+slk_attr/\fBcurs_slk\fR(3)*
+slk_attroff/\fBcurs_slk\fR(3)
+slk_attron/\fBcurs_slk\fR(3)
+slk_attrset/\fBcurs_slk\fR(3)
+slk_clear/\fBcurs_slk\fR(3)
+slk_init/\fBcurs_slk\fR(3)
+slk_label/\fBcurs_slk\fR(3)
+slk_noutrefresh/\fBcurs_slk\fR(3)
+slk_refresh/\fBcurs_slk\fR(3)
+slk_restore/\fBcurs_slk\fR(3)
+slk_set/\fBcurs_slk\fR(3)
+slk_touch/\fBcurs_slk\fR(3)
+standend/\fBcurs_attr\fR(3)
+standout/\fBcurs_attr\fR(3)
+start_color/\fBcurs_color\fR(3)
+subpad/\fBcurs_pad\fR(3)
+subwin/\fBcurs_window\fR(3)
+syncok/\fBcurs_window\fR(3)
+termattrs/\fBcurs_termattrs\fR(3)
+termname/\fBcurs_termattrs\fR(3)
+tgetent/\fBcurs_termcap\fR(3)
+tgetflag/\fBcurs_termcap\fR(3)
+tgetnum/\fBcurs_termcap\fR(3)
+tgetstr/\fBcurs_termcap\fR(3)
+tgoto/\fBcurs_termcap\fR(3)
+tigetflag/\fBcurs_terminfo\fR(3)
+tigetnum/\fBcurs_terminfo\fR(3)
+tigetstr/\fBcurs_terminfo\fR(3)
+timeout/\fBcurs_inopts\fR(3)
+touchline/\fBcurs_touch\fR(3)
+touchwin/\fBcurs_touch\fR(3)
+tparm/\fBcurs_terminfo\fR(3)
+tputs/\fBcurs_termcap\fR(3)
+tputs/\fBcurs_terminfo\fR(3)
+typeahead/\fBcurs_inopts\fR(3)
+unctrl/\fBcurs_util\fR(3)
+ungetch/\fBcurs_getch\fR(3)
+ungetmouse/\fBcurs_mouse\fR(3)*
+untouchwin/\fBcurs_touch\fR(3)
+use_env/\fBcurs_util\fR(3)
+vidattr/\fBcurs_terminfo\fR(3)
+vidputs/\fBcurs_terminfo\fR(3)
+vline/\fBcurs_border\fR(3)
+vwprintw/\fBcurs_printw\fR(3)
+vwscanw/\fBcurs_scanw\fR(3)
+waddch/\fBcurs_addch\fR(3)
+waddchnstr/\fBcurs_addchstr\fR(3)
+waddchstr/\fBcurs_addchstr\fR(3)
+waddnstr/\fBcurs_addstr\fR(3)
+waddstr/\fBcurs_addstr\fR(3)
+wattroff/\fBcurs_attr\fR(3)
+wattron/\fBcurs_attr\fR(3)
+wattrset/\fBcurs_attr\fR(3)
+wbkgd/\fBcurs_bkgd\fR(3)
+wbkgdset/\fBcurs_bkgd\fR(3)
+wborder/\fBcurs_border\fR(3)
+wclear/\fBcurs_clear\fR(3)
+wclrtobot/\fBcurs_clear\fR(3)
+wclrtoeol/\fBcurs_clear\fR(3)
+wcursyncup/\fBcurs_window\fR(3)
+wdelch/\fBcurs_delch\fR(3)
+wdeleteln/\fBcurs_deleteln\fR(3)
+wechochar/\fBcurs_addch\fR(3)
+wenclose/\fBcurs_mouse\fR(3)*
+werase/\fBcurs_clear\fR(3)
+wgetch/\fBcurs_getch\fR(3)
+wgetnstr/\fBcurs_getstr\fR(3)
+wgetstr/\fBcurs_getstr\fR(3)
+whline/\fBcurs_border\fR(3)
+winch/\fBcurs_inch\fR(3)
+winchnstr/\fBcurs_inchstr\fR(3)
+winchstr/\fBcurs_inchstr\fR(3)
+winnstr/\fBcurs_instr\fR(3)
+winsch/\fBcurs_insch\fR(3)
+winsdelln/\fBcurs_deleteln\fR(3)
+winsertln/\fBcurs_deleteln\fR(3)
+winsnstr/\fBcurs_insstr\fR(3)
+winsstr/\fBcurs_insstr\fR(3)
+winstr/\fBcurs_instr\fR(3)
+wmove/\fBcurs_move\fR(3)
+wnoutrefresh/\fBcurs_refresh\fR(3)
+wprintw/\fBcurs_printw\fR(3)
+wredrawln/\fBcurs_refresh\fR(3)
+wrefresh/\fBcurs_refresh\fR(3)
+wresize/\fBwresize\fR(3)*
+wscanw/\fBcurs_scanw\fR(3)
+wscrl/\fBcurs_scroll\fR(3)
+wsetscrreg/\fBcurs_outopts\fR(3)
+wstandend/\fBcurs_attr\fR(3)
+wstandout/\fBcurs_attr\fR(3)
+wsyncdown/\fBcurs_window\fR(3)
+wsyncup/\fBcurs_window\fR(3)
+wtimeout/\fBcurs_inopts\fR(3)
+wtouchln/\fBcurs_touch\fR(3)
+wvline/\fBcurs_border\fR(3)
 .TE
 .SH RETURN VALUE
 Routines that return an integer return \fBERR\fR upon failure and an
@@ -470,8 +471,8 @@ value of \fBTERMCAP_FILE\fR otherwise.
 
 Versions of \fBcurses\fR compiled on PC clones support display of the PC ROM
 characters (including ROM characters 0-31, which stock SVr4 curses cannot
-display). See the EXTENSIONS sections of \fBcurs_addch\fR(3x) and
-\fBcurs_attr\fR(3x).
+display). See the EXTENSIONS sections of \fBcurs_addch\fR(3) and
+\fBcurs_attr\fR(3).
 
 The \fBcurses\fR library includes facilities for capturing mouse events on
 certain terminals (including xterm). See the \fBcurs_mouse\fR(3)
diff --git a/lib/libcurses/curses.h b/lib/libcurses/curses.h
index c44f4b198d1..8d1a6b08c36 100644
--- a/lib/libcurses/curses.h
+++ b/lib/libcurses/curses.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: curses.h,v 1.5 1997/12/03 05:21:07 millert Exp $	*/
+/*	$OpenBSD: curses.h,v 1.6 1997/12/14 23:15:44 millert Exp $	*/
 
 /***************************************************************************
 *                            COPYRIGHT NOTICE                              *
@@ -37,7 +37,7 @@
 /* These are defined only in curses.h, and are used for conditional compiles */
 #define NCURSES_VERSION_MAJOR 4
 #define NCURSES_VERSION_MINOR 1
-#define NCURSES_VERSION_PATCH 971129
+#define NCURSES_VERSION_PATCH 971213
 
 /* This is defined in more than one ncurses header, for identification */
 #undef  NCURSES_VERSION
diff --git a/lib/libcurses/define_key.3 b/lib/libcurses/define_key.3
new file mode 100644
index 00000000000..32b597eaa90
--- /dev/null
+++ b/lib/libcurses/define_key.3
@@ -0,0 +1,59 @@
+.\" $OpenBSD: define_key.3,v 1.1 1997/12/14 23:15:44 millert Exp $
+.\"*****************************************************************************
+.\" Copyright 1997 by Thomas E. Dickey <dickey@clark.net>                      *
+.\" All Rights Reserved.                                                       *
+.\"                                                                            *
+.\" Permission to use, copy, modify, and distribute this software and its      *
+.\" documentation for any purpose and without fee is hereby granted, provided  *
+.\" that the above copyright notice appear in all copies and that both that    *
+.\" copyright notice and this permission notice appear in supporting           *
+.\" documentation, and that the name of the above listed copyright holder(s)   *
+.\" not be used in advertising or publicity pertaining to distribution of the  *
+.\" software without specific, written prior permission. THE ABOVE LISTED      *
+.\" COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,  *
+.\" INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO     *
+.\" EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY         *
+.\" SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER       *
+.\" RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF       *
+.\" CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN        *
+.\" CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.                   *
+.\"*****************************************************************************
+.\" Id: define_key.3x,v 1.3 1997/12/14 01:41:00 tom Exp $
+.TH define_key 3 ""
+.
+.SH NAME
+\fBdefine_key\fP \- define a keycode
+.
+.SH SYNOPSIS
+\fB#include <curses.h>\fP
+
+\fBint define_key(char *definition, int keycode);\fP
+.
+.SH DESCRIPTION
+This is an extension to the curses library.
+It permits an application to define keycodes with their corresponding control
+strings, so that the curses library will interpret them just as it would
+the predefined codes in the terminfo database.
+.PP
+If the given string is null, any existing definition for the keycode is
+removed.
+.
+.SH RETURN VALUE
+The keycode must be greater than zero, else ERR is returned.
+.
+.SH PORTABILITY
+These routines are specific to ncurses.  They were not supported on
+Version 7, BSD or System V implementations.  It is recommended that
+any code depending on them be conditioned using NCURSES_VERSION.
+.
+.SH SEE ALSO
+\fBkeyok\fR(3).
+.
+.SH AUTHOR
+Thomas Dickey.
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/lib/libcurses/dft_fgbg.3 b/lib/libcurses/dft_fgbg.3
new file mode 100644
index 00000000000..b7bac520ad4
--- /dev/null
+++ b/lib/libcurses/dft_fgbg.3
@@ -0,0 +1,75 @@
+.\" $OpenBSD: dft_fgbg.3,v 1.1 1997/12/14 23:15:45 millert Exp $
+.\"*****************************************************************************
+.\" Copyright 1997 by Thomas E. Dickey <dickey@clark.net>                      *
+.\" All Rights Reserved.                                                       *
+.\"                                                                            *
+.\" Permission to use, copy, modify, and distribute this software and its      *
+.\" documentation for any purpose and without fee is hereby granted, provided  *
+.\" that the above copyright notice appear in all copies and that both that    *
+.\" copyright notice and this permission notice appear in supporting           *
+.\" documentation, and that the name of the above listed copyright holder(s)   *
+.\" not be used in advertising or publicity pertaining to distribution of the  *
+.\" software without specific, written prior permission. THE ABOVE LISTED      *
+.\" COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,  *
+.\" INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO     *
+.\" EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY         *
+.\" SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER       *
+.\" RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF       *
+.\" CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN        *
+.\" CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.                   *
+.\"*****************************************************************************
+.\" Id: dft_fgbg.3x,v 1.4 1997/12/14 01:42:01 tom Exp $
+.TH use_default_colors 3 ""
+.
+.SH NAME
+\fBdft_fgbg\fR \- use terminal's default colors
+.
+.SH SYNOPSIS
+\fB#include <curses.h>\fP
+
+\fBint use_default_colors(void);\fP
+.
+.SH DESCRIPTION
+This is an extension to the curses library.
+It is 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.
+.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.
+.
+.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
+the \fIorig_pair\fP or \fIorig_colors\fP capability.
+If the \fIinitialize_pair\fP capability is found, this causes an
+error as well.
+.
+.SH NOTES
+Associated with this extension, the \fBinit_pair\fR(3) function accepts
+negative arguments to specify default foreground or background
+colors.
+.
+.SH PORTABILITY
+These routines are specific to ncurses.  They were not supported on
+Version 7, BSD or System V implementations.  It is recommended that
+any code depending on them be conditioned using NCURSES_VERSION.
+.
+.SH SEE ALSO
+\fBcurs_color\fR(3),
+\fBded\fP(1).
+.
+.SH AUTHOR
+Thomas Dickey (from an analysis of the requirements for color xterm
+for XFree86 3.1.2C, February 1996).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/lib/libcurses/keyok.3 b/lib/libcurses/keyok.3
new file mode 100644
index 00000000000..355ccd781ab
--- /dev/null
+++ b/lib/libcurses/keyok.3
@@ -0,0 +1,60 @@
+.\" $OpenBSD: keyok.3,v 1.1 1997/12/14 23:15:45 millert Exp $
+.\"*****************************************************************************
+.\" Copyright 1997 by Thomas E. Dickey <dickey@clark.net>                      *
+.\" All Rights Reserved.                                                       *
+.\"                                                                            *
+.\" Permission to use, copy, modify, and distribute this software and its      *
+.\" documentation for any purpose and without fee is hereby granted, provided  *
+.\" that the above copyright notice appear in all copies and that both that    *
+.\" copyright notice and this permission notice appear in supporting           *
+.\" documentation, and that the name of the above listed copyright holder(s)   *
+.\" not be used in advertising or publicity pertaining to distribution of the  *
+.\" software without specific, written prior permission. THE ABOVE LISTED      *
+.\" COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,  *
+.\" INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO     *
+.\" EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY         *
+.\" SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER       *
+.\" RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF       *
+.\" CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN        *
+.\" CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.                   *
+.\"*****************************************************************************
+.\" Id: keyok.3x,v 1.3 1997/12/14 01:17:02 tom Exp $
+.TH keyok 3 ""
+.
+.SH NAME
+\fBkeyok\fP \- enable or disable a keycode
+.
+.SH SYNOPSIS
+\fB#include <curses.h>\fP
+
+\fBint keyok(int keycode, bool enable);\fP
+.
+.SH DESCRIPTION
+This is an extension to the curses library.
+It permits an application to disable specific keycodes, rather than
+use the \fIkeypad\fP function to disable all keycodes.
+Keys that have been disabled can be reenabled.
+.
+.SH RETURN VALUE
+The keycode must be greater than zero, else ERR is returned.
+If it does not correspond to a defined key, then ERR is returned.
+If the \fIenable\fP parameter is true, then the key must have been disabled,
+and vice versa.
+Otherwise, the function returns OK.
+.
+.SH PORTABILITY
+These routines are specific to ncurses.  They were not supported on
+Version 7, BSD or System V implementations.  It is recommended that
+any code depending on them be conditioned using NCURSES_VERSION.
+.
+.SH SEE ALSO
+\fBdefine_key\fR(3).
+.
+.SH AUTHOR
+Thomas Dickey.
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/lib/libcurses/lib_acs.c b/lib/libcurses/lib_acs.c
index eae5d2849d2..62ce21befe0 100644
--- a/lib/libcurses/lib_acs.c
+++ b/lib/libcurses/lib_acs.c
@@ -1,5 +1,4 @@
-/*	$OpenBSD: lib_acs.c,v 1.3 1997/12/03 05:21:10 millert Exp $	*/
-
+/*	$OpenBSD: lib_acs.c,v 1.4 1997/12/14 23:15:46 millert Exp $	*/
 
 /***************************************************************************
 *                            COPYRIGHT NOTICE                              *
@@ -26,7 +25,7 @@
 #include <curses.priv.h>
 #include <term.h>	/* ena_acs, acs_chars */
 
-MODULE_ID("Id: lib_acs.c,v 1.11 1997/08/15 21:44:16 Alexander.V.Lukyanov Exp $")
+MODULE_ID("Id: lib_acs.c,v 1.12 1997/12/02 20:17:46 Alexander.V.Lukyanov Exp $")
 
 chtype acs_map[ACS_LEN];
 
@@ -81,7 +80,7 @@ void init_acs(void)
 #endif /* ena_acs */
 
 #ifdef acs_chars
-#define ALTCHAR(c)	(TextOf(c) | A_ALTCHARSET)
+#define ALTCHAR(c)	((chtype)(((unsigned char)(c)) | A_ALTCHARSET))
 
 	if (acs_chars != NULL) {
 	    size_t i = 0;
diff --git a/lib/libcurses/lib_addch.c b/lib/libcurses/lib_addch.c
index cd22cff9a38..3633c9178bb 100644
--- a/lib/libcurses/lib_addch.c
+++ b/lib/libcurses/lib_addch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lib_addch.c,v 1.3 1997/12/03 05:21:10 millert Exp $	*/
+/*	$OpenBSD: lib_addch.c,v 1.4 1997/12/14 23:15:46 millert Exp $	*/
 
 
 /***************************************************************************
@@ -31,7 +31,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("Id: lib_addch.c,v 1.36 1997/10/08 09:38:17 jtc Exp $")
+MODULE_ID("Id: lib_addch.c,v 1.37 1997/12/02 20:17:46 Alexander.V.Lukyanov Exp $")
 
 int wchgat(WINDOW *win, int n, attr_t attr, short color, const void *opts GCC_UNUSED)
 {
@@ -186,14 +186,11 @@ int waddch_nosync(WINDOW *win, const chtype ch)
 	int	t;
 	const char *s;
 
-	if (ch & A_ALTCHARSET)
+	if ((ch & A_ALTCHARSET)
+	    || ((t = TextOf(ch)) > 127)
+	    || ((s = unctrl(t))[1] == 0))
 		return waddch_literal(win, ch);
 
-	t = TextOf(ch);
-	s = unctrl(t);
-	if (s[1] == 0)	/* not a control char */
-		return waddch_literal(win, ch);
-	
 	x = win->_curx;
 	y = win->_cury;
 
@@ -249,7 +246,10 @@ int waddch_nosync(WINDOW *win, const chtype ch)
 		win->_flags &= ~_WRAPPED;
 		break;
 	default:
-		return(waddstr(win, s));
+		while (*s)
+			if (waddch_literal(win, (*s++)|AttrOf(ch)) == ERR)
+				return ERR;
+		return(OK);
 	}
 
 	win->_curx = x;
diff --git a/lib/libcurses/lib_baudrate.c b/lib/libcurses/lib_baudrate.c
index d951911e0ab..8ae79967ec1 100644
--- a/lib/libcurses/lib_baudrate.c
+++ b/lib/libcurses/lib_baudrate.c
@@ -1,5 +1,4 @@
-/*	$OpenBSD: lib_baudrate.c,v 1.2 1997/12/03 05:21:11 millert Exp $	*/
-
+/*	$OpenBSD: lib_baudrate.c,v 1.3 1997/12/14 23:15:47 millert Exp $	*/
 
 /***************************************************************************
 *                            COPYRIGHT NOTICE                              *
@@ -30,7 +29,7 @@
 #include <curses.priv.h>
 #include <term.h>	/* cur_term, pad_char */
 
-MODULE_ID("Id: lib_baudrate.c,v 1.9 1997/10/25 23:34:13 tom Exp $")
+MODULE_ID("Id: lib_baudrate.c,v 1.10 1997/12/06 23:38:48 tom Exp $")
 
 /*
  *	int
@@ -105,7 +104,7 @@ char *debug_rate;
 	 * that take into account costs that depend on baudrate.
 	 */
 #ifdef TRACE
-	if (!isatty(fileno(SP->_ofp))
+	if (SP && !isatty(fileno(SP->_ofp))
 	 && (debug_rate = getenv("BAUDRATE")) != 0) {
 		if (sscanf(debug_rate, "%d", &ret) != 1)
 			ret = 9600;
diff --git a/lib/libcurses/lib_mvwin.c b/lib/libcurses/lib_mvwin.c
index acc84ead00d..020c8db4aca 100644
--- a/lib/libcurses/lib_mvwin.c
+++ b/lib/libcurses/lib_mvwin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lib_mvwin.c,v 1.3 1997/12/03 05:21:24 millert Exp $	*/
+/*	$OpenBSD: lib_mvwin.c,v 1.4 1997/12/14 23:15:47 millert Exp $	*/
 
 
 /***************************************************************************
@@ -32,7 +32,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("Id: lib_mvwin.c,v 1.5 1997/09/20 15:02:34 juergen Exp $")
+MODULE_ID("Id: lib_mvwin.c,v 1.6 1997/12/03 15:47:41 Alexander.V.Lukyanov Exp $")
 
 int mvwin(WINDOW *win, int by, int bx)
 {
@@ -86,34 +86,7 @@ int mvwin(WINDOW *win, int by, int bx)
 	||  by < 0
 	||  bx < 0)
 	    returnCode(ERR);
-	else { /* We have to clear the area on the virtual screen where the
-		* window is currently. Actually the following code is
-		* equivalent to erase() the window at it's current place and
-		* then to call a wnoutrefresh(). We can't do it this easy way,
-		* because we still need the content of the window at its new
-		* place:-)
-		* N.B.: Its not worth to think about an optimization to
-		* clear only the parts that are not overlapped by the new
-		* location of the window. The overlapped region will already
-		* be replaced by the next wnoutrefresh() for this window.
-		*/
-	  int x,y;
-	  for(y=0;y<=win->_maxy;y++) {
-	    struct ldat* nline = &(newscr->_line[y+win->_begy+win->_yoffset]);
-	    for(x=0;x<=win->_maxx;x++) {
-	      nline->text[x+win->_begx] = newscr->_bkgd;
-	    }
-	    if (nline->firstchar==_NOCHANGE) {
-	      nline->firstchar = win->_begx;
-	      nline->lastchar  = win->_begx + win->_maxx;
-	    } else {
-	      if (nline->firstchar > win->_begx)
-		nline->firstchar = win->_begx;
-	      if (nline->lastchar < (win->_begx + win->_maxx))
-		nline->lastchar = (win->_begx + win->_maxx);
-	    }
-	  }
-	}
+
 	/*
 	 * Whether or not the window is moved, touch the window's contents so
 	 * that a following call to 'wrefresh()' will paint the window at the
diff --git a/lib/libcurses/lib_overlay.c b/lib/libcurses/lib_overlay.c
index e67c39e9587..991e84147d1 100644
--- a/lib/libcurses/lib_overlay.c
+++ b/lib/libcurses/lib_overlay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lib_overlay.c,v 1.3 1997/12/03 05:21:26 millert Exp $	*/
+/*	$OpenBSD: lib_overlay.c,v 1.4 1997/12/14 23:15:47 millert Exp $	*/
 
 
 /***************************************************************************
@@ -31,7 +31,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("Id: lib_overlay.c,v 1.9 1997/09/20 15:02:34 juergen Exp $")
+MODULE_ID("Id: lib_overlay.c,v 1.10 1997/12/03 15:47:41 Alexander.V.Lukyanov Exp $")
 
 static int overlap(const WINDOW *const s, WINDOW *const d, int const flag)
 {
@@ -91,6 +91,8 @@ int copywin(const WINDOW *src, WINDOW *dst,
 {
 int sx, sy, dx, dy;
 bool touched;
+chtype bk = AttrOf(dst->_bkgd);
+chtype mask = ~(chtype)((bk&A_COLOR) ? A_COLOR : 0);
 
 	T((T_CALLED("copywin(%p, %p, %d, %d, %d, %d, %d, %d, %d)"),
 		src, dst, sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol, over));
@@ -122,7 +124,8 @@ bool touched;
 		   if ((TextOf(src->_line[sy].text[sx]) != ' ') &&
                        (dst->_line[dy].text[dx]!=src->_line[sy].text[sx]))
 		   {
-			dst->_line[dy].text[dx] = src->_line[sy].text[sx];
+			dst->_line[dy].text[dx] =
+					(src->_line[sy].text[sx] & mask) | bk;
 			touched = TRUE;
 		   }
 	        }
diff --git a/lib/libcurses/resizeterm.3 b/lib/libcurses/resizeterm.3
new file mode 100644
index 00000000000..d39f4b9caf5
--- /dev/null
+++ b/lib/libcurses/resizeterm.3
@@ -0,0 +1,78 @@
+.\" $OpenBSD: resizeterm.3,v 1.1 1997/12/14 23:15:48 millert Exp $
+.\"*****************************************************************************
+.\" Copyright 1996,1997 by Thomas E. Dickey <dickey@clark.net>                 *
+.\" All Rights Reserved.                                                       *
+.\"                                                                            *
+.\" Permission to use, copy, modify, and distribute this software and its      *
+.\" documentation for any purpose and without fee is hereby granted, provided  *
+.\" that the above copyright notice appear in all copies and that both that    *
+.\" copyright notice and this permission notice appear in supporting           *
+.\" documentation, and that the name of the above listed copyright holder(s)   *
+.\" not be used in advertising or publicity pertaining to distribution of the  *
+.\" software without specific, written prior permission. THE ABOVE LISTED      *
+.\" COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,  *
+.\" INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO     *
+.\" EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY         *
+.\" SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER       *
+.\" RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF       *
+.\" CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN        *
+.\" CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.                   *
+.\"*****************************************************************************
+.\" Id: resizeterm.3x,v 1.5 1997/12/06 22:06:00 tom Exp $
+.TH resizeterm 3 ""
+.
+.SH NAME
+\fBresizeterm\fR - change the curses terminal size
+.
+.SH SYNOPSIS
+\fB#include <curses.h>\fR
+
+\fBint resizeterm(int lines, int columns);\fR
+.
+.SH DESCRIPTION
+This is an extension to the curses library.
+It provides callers with a hook into the \fBcurses\fR data to resize windows,
+primarily for use by programs running in an X Window terminal (e.g., xterm).
+The function \fBresizeterm\fR resizes the standard and current windows
+to the specified dimensions, and adjusts other bookkeeping data used by
+the \fBcurses\fR library that record the window dimensions.
+
+When resizing the windows, the function blank-fills the areas that are
+extended. The calling application should fill in these areas with
+appropriate data.
+
+The function attempts to resize all windows.
+However, due to the calling convention of pads,
+it is not possible to resize these
+without additional interaction with the application.
+.
+.SH RETURN VALUE
+The function returns the integer \fBERR\fR upon failure and \fBOK\fR on success.
+It will fail if either of the dimensions less than or equal to zero,
+or if an error occurs while (re)allocating memory for the windows. 
+.
+.SH NOTES
+While this function is intended to be used to support a signal handler
+(i.e., for SIGWINCH), care should be taken to avoid invoking it in a
+context where \fBmalloc\fR or \fBrealloc\fR may have been interrupted,
+since it uses those functions.
+.
+.PP
+If curses is configured to supply its own SIGWINCH handler,
+the \fBresizeterm\fR function ungetch's a \fBKEY_RESIZE\fR which
+will be read on the next call to \fBgetch\fR.
+This is used to alert an application that the screen size has changed,
+and that it should repaint special features such as pads that cannot
+be done automatically.
+.
+.SH SEE ALSO
+\fBwresize\fR(3).
+.
+.SH AUTHOR
+Thomas Dickey (from an equivalent function written in 1988 for BSD curses).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/lib/libcurses/wresize.3 b/lib/libcurses/wresize.3
index 0b968373abe..758359ff5e5 100644
--- a/lib/libcurses/wresize.3
+++ b/lib/libcurses/wresize.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wresize.3,v 1.3 1997/12/03 05:45:07 millert Exp $
+.\" $OpenBSD: wresize.3,v 1.4 1997/12/14 23:15:48 millert Exp $
 .\"*****************************************************************************
 .\" Copyright 1996 by Thomas E. Dickey <dickey@clark.net>                      *
 .\" All Rights Reserved.                                                       *
@@ -18,7 +18,7 @@
 .\" CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN        *
 .\" CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.                   *
 .\"*****************************************************************************
-.\" Id: wresize.3x,v 1.2 1996/09/07 14:51:04 tom Exp $
+.\" Id: wresize.3x,v 1.3 1997/12/06 22:06:00 tom Exp $
 .TH wresize 3 ""
 .
 .SH NAME
@@ -49,7 +49,7 @@ The caller must ensure that the window's dimensions fit within the
 actual screen dimensions.
 .
 .SH SEE ALSO
-\fBresizeterm\fR(3x).
+\fBresizeterm\fR(3).
 .
 .SH AUTHOR
 Thomas Dickey (from an equivalent function written in 1988 for BSD curses).
diff --git a/lib/libform/Makefile b/lib/libform/Makefile
index 0f3eafacbdb..579cd9418ec 100644
--- a/lib/libform/Makefile
+++ b/lib/libform/Makefile
@@ -8,7 +8,7 @@ SRCS=	fld_arg.c fld_attr.c fld_current.c fld_def.c fld_dup.c fld_ftchoice.c \
 	fty_alpha.c fty_enum.c fty_int.c fty_ipv4.c fty_num.c fty_regex.c
 HDRS=	form.h
 CFLAGS+=-I${.CURDIR}/../libmenu -I${.CURDIR}/../libcurses -DHAVE_CONFIG_H
-MAN=	form.3 form_cursor.3 form_data.3 form_driver.3 form_field.3 \
+MAN=	form.3tbl form_cursor.3 form_data.3 form_driver.3 form_field.3 \
 	form_field_attributes.3 form_field_buffer.3 form_field_info.3 \
 	form_field_just.3 form_field_new.3 form_field_opts.3 \
 	form_field_userptr.3 form_field_validation.3 form_fieldtype.3 \
diff --git a/lib/libform/form.3 b/lib/libform/form.3
deleted file mode 100644
index d0ba0e1112b..00000000000
--- a/lib/libform/form.3
+++ /dev/null
@@ -1,171 +0,0 @@
-'\" t
-.\" $OpenBSD: form.3,v 1.4 1997/12/03 05:46:26 millert Exp $
-.TH forms 3 ""
-.SH NAME
-\fBforms\fR - curses extension for programming forms
-.SH SYNOPSIS
-\fB#include <form.h>\fR
-.br
-.SH DESCRIPTION
-The \fBforms\fR library provides terminal-independent facilities for composing
-form screens on character-cell terminals.  The library includes: field
-routines, which create and modify form fields; and form routines, which group
-fields into forms, display forms on the screen, and handle interaction with the
-user.
-
-The \fBforms\fR library uses the \fBcurses\fR libraries, and a curses
-initialization routine such as \fBinitscr\fR must be called before using any of
-these functions.  To use the \fBforms\fR library, link with the options
-\fB-lform -lcurses\fR.
-
-.SS Current Default Values for Field Attributes
-
-The \fBforms\fR library maintains a default value for field attributes.  You
-can get or set this default by calling the appropriate \fBget_\fR or \fBset_\fR
-routine with a \fBNULL\fR field pointer.  Changing this default with a
-\fBset_\fR function affects future field creations, but does not change the
-rendering of fields already created.
-
-.SS Routine Name Index
-
-The following table lists each \fBform\fR routine and the name of
-the manual page on which it is described.
-
-.TS 
-l l
-l l .
-\fBcurses\fR Routine Name	Manual Page Name
-=
-\fBcurrent_field\fR	form_page(3)
-\fBdata_ahead\fR	form_data(3)
-\fBdata_behind\fR	form_data(3)
-\fBdup_field\fR	form_field_new(3)
-\fBdynamic_fieldinfo\fR	form_field_info(3)
-\fBfield_arg\fR	form_field_validation(3)
-\fBfield_back\fR	form_field_attributes(3)
-\fBfield_buffer\fR	form_field_buffer(3)
-\fBfield_count\fR	form_field(3)
-\fBfield_fore\fR	form_field_attributes(3)
-\fBfield_index\fR	form_page(3)
-\fBfield_info\fR	form_field_info(3)
-\fBfield_init\fR	form_hook(3)
-\fBfield_just\fR	form_field_just(3)
-\fBfield_opts\fR	form_field_opts(3)
-\fBfield_opts_off\fR	form_field_opts(3)
-\fBfield_opts_on\fR	form_field_opts(3)
-\fBfield_pad\fR	form_field_attributes(3)
-\fBfield_status\fR	form_field_buffer(3)
-\fBfield_term\fR	form_hook(3)
-\fBfield_type\fR	form_field_validation(3)
-\fBfield_userptr\fR	form_field_userptr(3)
-\fBform_driver\fR	form_driver(3)
-\fBform_fields\fR	form_field(3)
-\fBform_init\fR	form_hook(3)
-\fBform_opts\fR	form_opts(3)
-\fBform_opts_off\fR	form_opts(3)
-\fBform_opts_on\fR	form_opts(3)
-\fBform_page\fR	form_page(3)
-\fBform_request_by_name\fR	form_requestname(3)
-\fBform_request_name\fR	form_requestname(3)
-\fBform_sub\fR	form_win(3)
-\fBform_term\fR	form_hook(3)
-\fBform_userptr\fR	form_userptr(3)
-\fBform_win\fR	form_win(3)
-\fBfree_field\fR	form_field_new(3)
-\fBfree_form\fR	form_new(3)
-\fBlink_field\fR	form_field_new(3)
-\fBlink_fieldtype\fR	link_fieldtype(3)
-\fBmove_field\fR	form_field(3)
-\fBnew_field\fR	form_field_new(3)
-\fBnew_form\fR	form_new(3)
-\fBnew_page\fR	form_new_page(3)
-\fBpos_form_cursor\fR	form_cursor(3)
-\fBpost_form\fR	form_post(3)
-\fBscale_form\fR	form_win(3)
-\fBset_current_field\fR	form_page(3)
-\fBset_field_back\fR	form_field_attributes(3)
-\fBset_field_buffer\fR	form_field_buffer(3)
-\fBset_field_fore\fR	form_field_attributes(3)
-\fBset_field_init\fR	form_hook(3)
-\fBset_field_just\fR	form_field_just(3)
-\fBset_field_opts\fR	form_field_opts(3)
-\fBset_field_pad\fR	form_field_attributes(3)
-\fBset_field_status\fR	form_field_buffer(3)
-\fBset_field_term\fR	form_hook(3)
-\fBset_field_type\fR	form_field_validation(3)
-\fBset_field_userptr\fR	form_field_userptr(3)
-\fBset_fieldtype_arg\fR	form_fieldtype(3)
-\fBset_fieldtype_choice\fR	form_fieldtype(3)
-\fBset_form_fields\fR	form_field(3)
-\fBset_form_init\fR	form_hook(3)
-\fBset_form_opts\fR	form_field_opts(3)
-\fBset_form_page\fR	form_page(3)
-\fBset_form_sub\fR	form_win(3)
-\fBset_form_term\fR	form_hook(3)
-\fBset_form_userptr\fR	form_userptr(3)
-\fBset_form_win\fR	form_win(3)
-\fBset_max_field\fR	form_field_buffer(3)
-\fBset_new_page\fR	form_new_page(3)
-\fBunpost_form\fR	form_post(3)
-.TE
-.SH RETURN VALUE
-Routines that return pointers return \fBNULL\fR on error.  Routines that return
-an integer return one of the following error codes:
-.TP 5
-\fBE_OK\fR
-The routine succeeded.
-.TP 5
-\fBE_CONNECTED\fR
-The field is already connected to a form.
-.TP 5
-\fBE_SYSTEM_ERROR\fR
-System error occurred (see \fBerrno\fR).
-.TP 5
-\fBE_BAD_ARGUMENT\fR
-Routine detected an incorrect or out-of-range argument.
-.TP 5
-\fBE_POSTED\fR
-The form is already posted.
-.TP 5
-\fBE_BAD_STATE\fR
-Routine was called from an initialization or termination function.
-.TP 5
-\fBE_NO_ROOM\fR
-Form is too large for its window.
-.TP 5
-\fBE_NOT_POSTED\fR
-The form has not been posted.
-.TP 5
-\fBE_UNKNOWN_COMMAND\fR
-The form driver code saw an unknown request code.
-.TP 5
-\fBE_INVALID_FIELD\fR
-Contents of a field are not valid.
-.TP 5
-\fBE_NOT_CONNECTED\fR
-No fields are connected to the form.
-.TP 5
-\fBE_REQUEST_DENIED\fR
-The form driver could not process the request.
-.SH SEE ALSO
-\fBcurses\fR(3) and 3 pages whose names begin "form_" for detailed
-descriptions of the entry points.
-.SH NOTES
-The header file \fB<form.h>\fR automatically includes the header files
-\fB<curses.h>\fR and \fB<eti.h>\fR.
-
-In your library list, libform.a should be before libcurses.a; that is,
-you want to say `-lform -lcurses', not the other way around (which would
-give you a link error using GNU \fBld\fR(1) and many other linkers).
-.SH PORTABILITY
-These routines emulate the System V forms library.  They were not supported on
-Version 7 or BSD versions.
-.SH AUTHORS
-Juergen Pfeifer.  Manual pages and adaptation for ncurses by Eric
-S. Raymond.
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/lib/libform/form.3tbl b/lib/libform/form.3tbl
new file mode 100644
index 00000000000..ac06e9e2f61
--- /dev/null
+++ b/lib/libform/form.3tbl
@@ -0,0 +1,172 @@
+'\" t
+.\" $OpenBSD: form.3tbl,v 1.1 1997/12/14 23:19:27 millert Exp $
+.\" Id: form.3x,v 0.8 1997/12/14 01:44:04 tom Exp $
+.TH form 3 ""
+.SH NAME
+\fBform\fR - curses extension for programming forms
+.SH SYNOPSIS
+\fB#include <form.h>\fR
+.br
+.SH DESCRIPTION
+The \fBform\fR library provides terminal-independent facilities for composing
+form screens on character-cell terminals.  The library includes: field
+routines, which create and modify form fields; and form routines, which group
+fields into forms, display forms on the screen, and handle interaction with the
+user.
+
+The \fBform\fR library uses the \fBcurses\fR libraries, and a curses
+initialization routine such as \fBinitscr\fR must be called before using any of
+these functions.  To use the \fBform\fR library, link with the options
+\fB-lform -lcurses\fR.
+
+.SS Current Default Values for Field Attributes
+
+The \fBform\fR library maintains a default value for field attributes.  You
+can get or set this default by calling the appropriate \fBget_\fR or \fBset_\fR
+routine with a \fBNULL\fR field pointer.  Changing this default with a
+\fBset_\fR function affects future field creations, but does not change the
+rendering of fields already created.
+
+.SS Routine Name Index
+
+The following table lists each \fBform\fR routine and the name of
+the manual page on which it is described.
+
+.TS 
+l l
+l l .
+\fBcurses\fR Routine Name	Manual Page Name
+=
+current_field	\fBform_page\fR(3)
+data_ahead	\fBform_data\fR(3)
+data_behind	\fBform_data\fR(3)
+dup_field	\fBform_field_new\fR(3)
+dynamic_fieldinfo	\fBform_field_info\fR(3)
+field_arg	\fBform_field_validation\fR(3)
+field_back	\fBform_field_attributes\fR(3)
+field_buffer	\fBform_field_buffer\fR(3)
+field_count	\fBform_field\fR(3)
+field_fore	\fBform_field_attributes\fR(3)
+field_index	\fBform_page\fR(3)
+field_info	\fBform_field_info\fR(3)
+field_init	\fBform_hook\fR(3)
+field_just	\fBform_field_just\fR(3)
+field_opts	\fBform_field_opts\fR(3)
+field_opts_off	\fBform_field_opts\fR(3)
+field_opts_on	\fBform_field_opts\fR(3)
+field_pad	\fBform_field_attributes\fR(3)
+field_status	\fBform_field_buffer\fR(3)
+field_term	\fBform_hook\fR(3)
+field_type	\fBform_field_validation\fR(3)
+field_userptr	\fBform_field_userptr\fR(3)
+form_driver	\fBform_driver\fR(3)
+form_fields	\fBform_field\fR(3)
+form_init	\fBform_hook\fR(3)
+form_opts	\fBform_opts\fR(3)
+form_opts_off	\fBform_opts\fR(3)
+form_opts_on	\fBform_opts\fR(3)
+form_page	\fBform_page\fR(3)
+form_request_by_name	\fBform_requestname\fR(3)
+form_request_name	\fBform_requestname\fR(3)
+form_sub	\fBform_win\fR(3)
+form_term	\fBform_hook\fR(3)
+form_userptr	\fBform_userptr\fR(3)
+form_win	\fBform_win\fR(3)
+free_field	\fBform_field_new\fR(3)
+free_form	\fBform_new\fR(3)
+link_field	\fBform_field_new\fR(3)
+link_fieldtype	\fBform_fieldtype\fR(3)
+move_field	\fBform_field\fR(3)
+new_field	\fBform_field_new\fR(3)
+new_form	\fBform_new\fR(3)
+new_page	\fBform_new_page\fR(3)
+pos_form_cursor	\fBform_cursor\fR(3)
+post_form	\fBform_post\fR(3)
+scale_form	\fBform_win\fR(3)
+set_current_field	\fBform_page\fR(3)
+set_field_back	\fBform_field_attributes\fR(3)
+set_field_buffer	\fBform_field_buffer\fR(3)
+set_field_fore	\fBform_field_attributes\fR(3)
+set_field_init	\fBform_hook\fR(3)
+set_field_just	\fBform_field_just\fR(3)
+set_field_opts	\fBform_field_opts\fR(3)
+set_field_pad	\fBform_field_attributes\fR(3)
+set_field_status	\fBform_field_buffer\fR(3)
+set_field_term	\fBform_hook\fR(3)
+set_field_type	\fBform_field_validation\fR(3)
+set_field_userptr	\fBform_field_userptr\fR(3)
+set_fieldtype_arg	\fBform_fieldtype\fR(3)
+set_fieldtype_choice	\fBform_fieldtype\fR(3)
+set_form_fields	\fBform_field\fR(3)
+set_form_init	\fBform_hook\fR(3)
+set_form_opts	\fBform_field_opts\fR(3)
+set_form_page	\fBform_page\fR(3)
+set_form_sub	\fBform_win\fR(3)
+set_form_term	\fBform_hook\fR(3)
+set_form_userptr	\fBform_userptr\fR(3)
+set_form_win	\fBform_win\fR(3)
+set_max_field	\fBform_field_buffer\fR(3)
+set_new_page	\fBform_new_page\fR(3)
+unpost_form	\fBform_post\fR(3)
+.TE
+.SH RETURN VALUE
+Routines that return pointers return \fBNULL\fR on error.  Routines that return
+an integer return one of the following error codes:
+.TP 5
+\fBE_OK\fR
+The routine succeeded.
+.TP 5
+\fBE_CONNECTED\fR
+The field is already connected to a form.
+.TP 5
+\fBE_SYSTEM_ERROR\fR
+System error occurred (see \fBerrno\fR).
+.TP 5
+\fBE_BAD_ARGUMENT\fR
+Routine detected an incorrect or out-of-range argument.
+.TP 5
+\fBE_POSTED\fR
+The form is already posted.
+.TP 5
+\fBE_BAD_STATE\fR
+Routine was called from an initialization or termination function.
+.TP 5
+\fBE_NO_ROOM\fR
+Form is too large for its window.
+.TP 5
+\fBE_NOT_POSTED\fR
+The form has not been posted.
+.TP 5
+\fBE_UNKNOWN_COMMAND\fR
+The form driver code saw an unknown request code.
+.TP 5
+\fBE_INVALID_FIELD\fR
+Contents of a field are not valid.
+.TP 5
+\fBE_NOT_CONNECTED\fR
+No fields are connected to the form.
+.TP 5
+\fBE_REQUEST_DENIED\fR
+The form driver could not process the request.
+.SH SEE ALSO
+\fBcurses\fR(3) and 3 pages whose names begin "form_" for detailed
+descriptions of the entry points.
+.SH NOTES
+The header file \fB<form.h>\fR automatically includes the header files
+\fB<curses.h>\fR and \fB<eti.h>\fR.
+
+In your library list, libform.a should be before libcurses.a; that is,
+you want to say `-lform -lcurses', not the other way around (which would
+give you a link error using GNU \fBld\fR(1) and many other linkers).
+.SH PORTABILITY
+These routines emulate the System V forms library.  They were not supported on
+Version 7 or BSD versions.
+.SH AUTHORS
+Juergen Pfeifer.  Manual pages and adaptation for ncurses by Eric
+S. Raymond.
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/lib/libform/form_driver.3 b/lib/libform/form_driver.3
index 4c1bac32be3..8e65d15797d 100644
--- a/lib/libform/form_driver.3
+++ b/lib/libform/form_driver.3
@@ -1,5 +1,6 @@
 '\" t
-.\" $OpenBSD: form_driver.3,v 1.4 1997/12/03 05:46:27 millert Exp $
+.\" $OpenBSD: form_driver.3,v 1.5 1997/12/14 23:19:27 millert Exp $
+.\" Id: form_driver.3x,v 0.5 1997/12/14 01:26:33 tom Exp $
 .TH form_driver 3 ""
 .SH NAME
 \fBform_driver\fR - command-processing loop of the form system
@@ -227,7 +228,7 @@ Contents of field is invalid.
 \fBE_REQUEST_DENIED\fR
 The form driver could not process the request.
 .SH SEE ALSO
-\fBcurses\fR(3), \fBforms\fR(3x).
+\fBcurses\fR(3), \fBforms\fR(3).
 .SH NOTES
 The header file \fB<form.h>\fR automatically includes the header files
 \fB<curses.h>\fR.
diff --git a/lib/libform/form_field_buffer.3 b/lib/libform/form_field_buffer.3
index 14de9c767eb..7a98d54268f 100644
--- a/lib/libform/form_field_buffer.3
+++ b/lib/libform/form_field_buffer.3
@@ -1,5 +1,5 @@
 '\" t
-.\" $OpenBSD: form_field_buffer.3,v 1.4 1997/12/03 05:46:29 millert Exp $
+.\" $OpenBSD: form_field_buffer.3,v 1.5 1997/12/14 23:19:28 millert Exp $
 .TH form_field_buffer 3 ""
 .SH NAME
 \fBform_field_buffer\fR - field buffer control
@@ -20,7 +20,7 @@ int set_max_field(FIELD *field, int max);
 The function \fBset_field_buffer\fR sets the numbered buffer of the given field
 to contain a given string.  Buffer 0 is the displayed value of the field; other
 numbered buffers may be allocated by applications through the \fBnbuf\fR
-argument of (see \fBfield_new\fR(3)) but are not manipulated by the forms
+argument of (see \fBform_field_new\fR(3)) but are not manipulated by the forms
 library.  The function \fBfield_buffer\fR returns the foreground attribute.
 
 The function \fBset_field_status\fR sets the associated status flag of 
diff --git a/lib/libform/form_field_new.3 b/lib/libform/form_field_new.3
index 907b16ebd19..3675b2e9296 100644
--- a/lib/libform/form_field_new.3
+++ b/lib/libform/form_field_new.3
@@ -1,5 +1,6 @@
 '\" t
-.\" $OpenBSD: form_field_new.3,v 1.4 1997/12/03 05:46:30 millert Exp $
+.\" $OpenBSD: form_field_new.3,v 1.5 1997/12/14 23:19:28 millert Exp $
+.\" Id: form_field_new.3x,v 0.6 1997/12/06 22:07:19 tom Exp $
 .TH form_field_new 3 ""
 .SH NAME
 \fBform_field_new\fR - create and destroy form fields
@@ -55,7 +56,7 @@ These routines emulate the System V forms library.  They were not supported on
 Version 7 or BSD versions.
 
 It may be unwise to count on the set of attributes copied by
-\fBdup_field\fR(3x) being portable; the System V forms library documents are
+\fBdup_field\fR(3) being portable; the System V forms library documents are
 not very explicit on what gets copied and was not.
 .SH AUTHORS
 Juergen Pfeifer.  Manual pages and adaptation for new curses by Eric
diff --git a/lib/libform/form_field_validation.3 b/lib/libform/form_field_validation.3
index 834566906db..dfa7d4d8820 100644
--- a/lib/libform/form_field_validation.3
+++ b/lib/libform/form_field_validation.3
@@ -1,5 +1,6 @@
 '\" t
-.\" $OpenBSD: form_field_validation.3,v 1.4 1997/12/03 05:46:31 millert Exp $
+.\" $OpenBSD: form_field_validation.3,v 1.5 1997/12/14 23:19:29 millert Exp $
+.\" Id: form_field_validation.3x,v 0.9 1997/12/06 22:08:27 tom Exp $
 .TH form_field_validation 3 ""
 .SH NAME
 \fBform_field_validation\fR - data type validation for fields 
@@ -55,7 +56,7 @@ For details of the precision handling see \fBprintf's\fR man-page.
 TYPE_REGEXP
 Regular expression data.  Requires a regular expression \fB(char *)\fR third argument;
 the data is valid if the regular expression matches it.  Regular expressions
-are in the format of \fBregcomp\fR(3x) and \fBregexec\fR(3). Please notice
+are in the format of \fBregcomp\fR(3) and \fBregexec\fR(3). Please notice
 that the regular expression must match the whole field. If you have for
 example an eight character wide field, a regular expression "^[0-9]*$" always
 means that you have to fill all eight positions with digits. If you want to
diff --git a/lib/libmenu/Makefile b/lib/libmenu/Makefile
index e156fd98eb4..ac0af8a1c38 100644
--- a/lib/libmenu/Makefile
+++ b/lib/libmenu/Makefile
@@ -6,10 +6,11 @@ SRCS=	m_attribs.c m_cursor.c m_driver.c m_format.c m_global.c m_hook.c \
 	m_sub.c m_userptr.c m_win.c
 HDRS=	menu.h eti.h
 CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../libcurses -DHAVE_CONFIG_H
-MAN=	menu.3 menu_attribs.3 menu_cursor.3 menu_driver.3 menu_format.3 \
+MAN=	menu.3tbl menu_attribs.3 menu_cursor.3 menu_driver.3 menu_format.3 \
 	menu_hook.3 menu_items.3 menu_mark.3 menu_new.3 menu_opts.3 \
 	menu_pattern.3 menu_post.3 menu_requestname.3 menu_spacing.3 \
-	menu_userptr.3 menu_win.3
+	menu_userptr.3 menu_win.3 mitem_current.3 mitem_name.3 mitem_new.3 \
+	mitem_opts.3 mitem_userptr.3 mitem_value.3 mitem_visible.3
 
 includes:
 	@cd ${.CURDIR}; for i in ${HDRS}; do \
diff --git a/lib/libmenu/menu.3 b/lib/libmenu/menu.3
deleted file mode 100644
index 725c04742cd..00000000000
--- a/lib/libmenu/menu.3
+++ /dev/null
@@ -1,162 +0,0 @@
-'\" t
-.\" Id: menu.3x,v 1.9 1997/01/05 01:23:39 tom Exp $
-.TH menus 3X ""
-.SH NAME
-\fBmenus\fR - curses extension for programming menus
-.SH SYNOPSIS
-\fB#include <menu.h>\fR
-.br
-.SH DESCRIPTION
-The \fBmenus\fR library provides terminal-independent facilities for composing
-menu systems on character-cell terminals.  The library includes: item routines,
-which create and modify menu items; and menu routines, which group items into
-menus, display menus on the screen, and handle interaction with the user.
-
-The \fBmenus\fR library uses the \fBcurses\fR libraries, and a curses
-initialization routine such as \fBinitscr\fR must be called before using any of
-these functions.  To use the \fBmenus\fR library, link with the options 
-\fB-lmenu -lcurses\fR.
-
-.SS Current Default Values for Item Attributes
-
-The \fBmenus\fR library maintains a default value for item attributes.  You can
-get or set this default by calling the appropriate \fBget_\fR or \fBset_\fR
-routine with a \fBNULL\fR item pointer.  Changing this default with a
-\fBset_\fR function affects future item creations, but does not change the
-rendering of items already created.
-
-.SS Routine Name Index
-
-The following table lists each \fBmenu\fR routine and the name of
-the manual page on which it is described.
-
-.TS 
-l l .
-\fBcurses\fR Routine Name	Manual Page Name
-=
-\fBcurrent_item\fR	mitem_current(3X)
-\fBfree_item\fR 	mitem_new(3X)
-\fBfree_menu\fR 	menu_new(3X)
-\fBitem_count\fR	menu_items(3X)
-\fBitem_description\fR	mitem_name(3X)
-\fBitem_index\fR	mitem_current(3X)
-\fBitem_init\fR 	menu_hook(3X)
-\fBitem_name\fR 	mitem_name(3X)
-\fBitem_opts\fR 	mitem_opts(3X)
-\fBitem_opts_off\fR	mitem_opts(3X)
-\fBitem_opts_on\fR	mitem_opts(3X)
-\fBitem_term\fR 	menu_hook(3X)
-\fBitem_userptr\fR	mitem_userptr(3X)
-\fBitem_value\fR	mitem_value(3X)
-\fBitem_visible\fR	mitem_visible(3X)
-\fBmenu_back\fR 	menu_attribs(3X)
-\fBmenu_driver\fR	menu_driver(3X)
-\fBmenu_fore\fR 	menu_attribs(3X)
-\fBmenu_format\fR	menu_format(3X)
-\fBmenu_grey\fR 	menu_attribs(3X)
-\fBmenu_init\fR 	menu_hook(3X)
-\fBmenu_items\fR	menu_items(3X)
-\fBmenu_mark\fR 	menu_mark(3X)
-\fBmenu_opts\fR 	menu_opts(3X)
-\fBmenu_opts_off\fR	menu_opts(3X)
-\fBmenu_opts_on\fR	menu_opts(3X)
-\fBmenu_pad\fR  	menu_attribs(3X)
-\fBmenu_pattern\fR	menu_pattern(3X)
-\fBmenu_request_by_name\fR	menu_requestname(3X)
-\fBmenu_request_name\fR	menu_requestname(3X)
-\fBmenu_spacing\fR	menu_spacing(3X)
-\fBmenu_sub\fR  	menu_win(3X)
-\fBmenu_term\fR 	menu_hook(3X)
-\fBmenu_userptr\fR	menu_userptr(3X)
-\fBmenu_win\fR  	menu_win(3X)
-\fBnew_item\fR  	mitem_new(3X)
-\fBnew_menu\fR  	menu_new(3X)
-\fBpos_menu_cursor\fR	menu_cursor(3X)
-\fBpost_menu\fR 	menu_post(3X)
-\fBscale_menu\fR	menu_win(3X)
-\fBset_current_item\fR	menu_current_item(3X)
-\fBset_item_init\fR	menu_hook(3X)
-\fBset_item_opts\fR	mitem_opts(3X)
-\fBset_item_term\fR	menu_hook(3X)
-\fBset_item_userptr\fR	mitem_userptr(3X)
-\fBset_item_value\fR	mitem_value(3X)
-\fBset_menu_back\fR	menu_attribs(3X)
-\fBset_menu_fore\fR	menu_attribs(3X)
-\fBset_menu_format\fR	menu_format(3X)
-\fBset_menu_grey\fR	menu_attribs(3X)
-\fBset_menu_init\fR	menu_hook(3X)
-\fBset_menu_items\fR	menu_items(3X)
-\fBset_menu_mark\fR	menu_mark(3X)
-\fBset_menu_opts\fR	mitem_opts(3X)
-\fBset_menu_pad\fR	menu_attribs(3X)
-\fBset_menu_pattern\fR	menu_pattern(3X)
-\fBset_menu_spacing\fR	menu_spacing(3X)
-\fBset_menu_sub\fR	menu_win(3X)
-\fBset_menu_term\fR	menu_hook(3X)
-\fBset_menu_userptr\fR	menu_userptr(3X)
-\fBset_menu_win\fR	menu_win(3X)
-\fBset_top_row\fR	mitem_current(3X)
-\fBtop_row\fR   	mitem_current(3X)
-\fBunpost_menu\fR	menu_post(3X)
-.TE
-.SH RETURN VALUE
-Routines that return pointers return \fBNULL\fR on error.  Routines that return
-an integer return one of the following error codes:
-.TP 5
-\fBE_OK\fR
-The routine succeeded.
-.TP 5
-\fBE_SYSTEM_ERROR\fR
-System error occurred (see \fBerrno\fR).
-.TP 5
-\fBE_BAD_ARGUMENT\fR
-Routine detected an incorrect or out-of-range argument.
-.TP 5
-\fBE_POSTED\fR
-The menu is already posted.
-.TP 5
-\fBE_BAD_STATE\fR
-Routine was called from an initialization or termination function.
-.TP 5
-\fBE_NO_ROOM\fR
-Menu is too large for its window.
-.TP 5
-\fBE_NOT_POSTED\fR
-The menu has not been posted.
-.TP 5
-\fBE_UNKNOWN_COMMAND\fR
-The menu driver code saw an unknown request code.
-.TP 5
-\fBE_NO_MATCH\fR
-Character failed to match.
-.TP 5
-\fBE_NOT_SELECTABLE\fR
-The designated item cannot be selected.
-.TP 5
-\fBE_NOT_CONNECTED\fR
-No items are connected to the menu.
-.TP 5
-\fBE_REQUEST_DENIED\fR
-The menu driver could not process the request.
-.SH SEE ALSO
-\fBcurses\fR(3X) and 3X pages whose names begin "menu_" for detailed
-descriptions of the entry points.
-.SH NOTES
-The header file \fB<menu.h>\fR automatically includes the header files
-\fB<curses.h>\fR and \fB<eti.h>\fR.
-
-In your library list, libmenu.a should be before libcurses.a; that is,
-you want to say `-lmenu -lcurses', not the other way around (which would
-give you a link error using GNU \fBld\fR(1) and many other linkers).
-.SH PORTABILITY
-These routines emulate the System V menu library.  They were not supported on
-Version 7 or BSD versions.
-.SH AUTHORS
-Juergen Pfeifer.  Manual pages and adaptation for ncurses by Eric
-S. Raymond.
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/lib/libmenu/menu.3tbl b/lib/libmenu/menu.3tbl
new file mode 100644
index 00000000000..89aa057f1fa
--- /dev/null
+++ b/lib/libmenu/menu.3tbl
@@ -0,0 +1,163 @@
+'\" t
+.\" $OpenBSD: menu.3tbl,v 1.1 1997/12/14 23:19:31 millert Exp $
+.\" Id: menu.3x,v 1.10 1997/12/14 01:45:52 tom Exp $
+.TH menu 3 ""
+.SH NAME
+\fBmenu\fR - curses extension for programming menus
+.SH SYNOPSIS
+\fB#include <menu.h>\fR
+.br
+.SH DESCRIPTION
+The \fBmenu\fR library provides terminal-independent facilities for composing
+menu systems on character-cell terminals.  The library includes: item routines,
+which create and modify menu items; and menu routines, which group items into
+menus, display menus on the screen, and handle interaction with the user.
+
+The \fBmenu\fR library uses the \fBcurses\fR libraries, and a curses
+initialization routine such as \fBinitscr\fR must be called before using any of
+these functions.  To use the \fBmenu\fR library, link with the options 
+\fB-lmenu -lcurses\fR.
+
+.SS Current Default Values for Item Attributes
+
+The \fBmenu\fR library maintains a default value for item attributes.  You can
+get or set this default by calling the appropriate \fBget_\fR or \fBset_\fR
+routine with a \fBNULL\fR item pointer.  Changing this default with a
+\fBset_\fR function affects future item creations, but does not change the
+rendering of items already created.
+
+.SS Routine Name Index
+
+The following table lists each \fBmenu\fR routine and the name of
+the manual page on which it is described.
+
+.TS 
+l l .
+\fBcurses\fR Routine Name	Manual Page Name
+=
+current_item	\fBmitem_current\fR(3)
+free_item 	\fBmitem_new\fR(3)
+free_menu 	\fBmenu_new\fR(3)
+item_count	\fBmenu_items\fR(3)
+item_description	\fBmitem_name\fR(3)
+item_index	\fBmitem_current\fR(3)
+item_init 	\fBmenu_hook\fR(3)
+item_name 	\fBmitem_name\fR(3)
+item_opts 	\fBmitem_opts\fR(3)
+item_opts_off	\fBmitem_opts\fR(3)
+item_opts_on	\fBmitem_opts\fR(3)
+item_term 	\fBmenu_hook\fR(3)
+item_userptr	\fBmitem_userptr\fR(3)
+item_value	\fBmitem_value\fR(3)
+item_visible	\fBmitem_visible\fR(3)
+menu_back 	\fBmenu_attribs\fR(3)
+menu_driver	\fBmenu_driver\fR(3)
+menu_fore 	\fBmenu_attribs\fR(3)
+menu_format	\fBmenu_format\fR(3)
+menu_grey 	\fBmenu_attribs\fR(3)
+menu_init 	\fBmenu_hook\fR(3)
+menu_items	\fBmenu_items\fR(3)
+menu_mark 	\fBmenu_mark\fR(3)
+menu_opts 	\fBmenu_opts\fR(3)
+menu_opts_off	\fBmenu_opts\fR(3)
+menu_opts_on	\fBmenu_opts\fR(3)
+menu_pad  	\fBmenu_attribs\fR(3)
+menu_pattern	\fBmenu_pattern\fR(3)
+menu_request_by_name	\fBmenu_requestname\fR(3)
+menu_request_name	\fBmenu_requestname\fR(3)
+menu_spacing	\fBmenu_spacing\fR(3)
+menu_sub  	\fBmenu_win\fR(3)
+menu_term 	\fBmenu_hook\fR(3)
+menu_userptr	\fBmenu_userptr\fR(3)
+menu_win  	\fBmenu_win\fR(3)
+new_item  	\fBmitem_new\fR(3)
+new_menu  	\fBmenu_new\fR(3)
+pos_menu_cursor	\fBmenu_cursor\fR(3)
+post_menu 	\fBmenu_post\fR(3)
+scale_menu	\fBmenu_win\fR(3)
+set_current_item	\fBmitem_current\fR(3)
+set_item_init	\fBmenu_hook\fR(3)
+set_item_opts	\fBmitem_opts\fR(3)
+set_item_term	\fBmenu_hook\fR(3)
+set_item_userptr	\fBmitem_userptr\fR(3)
+set_item_value	\fBmitem_value\fR(3)
+set_menu_back	\fBmenu_attribs\fR(3)
+set_menu_fore	\fBmenu_attribs\fR(3)
+set_menu_format	\fBmenu_format\fR(3)
+set_menu_grey	\fBmenu_attribs\fR(3)
+set_menu_init	\fBmenu_hook\fR(3)
+set_menu_items	\fBmenu_items\fR(3)
+set_menu_mark	\fBmenu_mark\fR(3)
+set_menu_opts	\fBmitem_opts\fR(3)
+set_menu_pad	\fBmenu_attribs\fR(3)
+set_menu_pattern	\fBmenu_pattern\fR(3)
+set_menu_spacing	\fBmenu_spacing\fR(3)
+set_menu_sub	\fBmenu_win\fR(3)
+set_menu_term	\fBmenu_hook\fR(3)
+set_menu_userptr	\fBmenu_userptr\fR(3)
+set_menu_win	\fBmenu_win\fR(3)
+set_top_row	\fBmitem_current\fR(3)
+top_row   	\fBmitem_current\fR(3)
+unpost_menu	\fBmenu_post\fR(3)
+.TE
+.SH RETURN VALUE
+Routines that return pointers return \fBNULL\fR on error.  Routines that return
+an integer return one of the following error codes:
+.TP 5
+\fBE_OK\fR
+The routine succeeded.
+.TP 5
+\fBE_SYSTEM_ERROR\fR
+System error occurred (see \fBerrno\fR).
+.TP 5
+\fBE_BAD_ARGUMENT\fR
+Routine detected an incorrect or out-of-range argument.
+.TP 5
+\fBE_POSTED\fR
+The menu is already posted.
+.TP 5
+\fBE_BAD_STATE\fR
+Routine was called from an initialization or termination function.
+.TP 5
+\fBE_NO_ROOM\fR
+Menu is too large for its window.
+.TP 5
+\fBE_NOT_POSTED\fR
+The menu has not been posted.
+.TP 5
+\fBE_UNKNOWN_COMMAND\fR
+The menu driver code saw an unknown request code.
+.TP 5
+\fBE_NO_MATCH\fR
+Character failed to match.
+.TP 5
+\fBE_NOT_SELECTABLE\fR
+The designated item cannot be selected.
+.TP 5
+\fBE_NOT_CONNECTED\fR
+No items are connected to the menu.
+.TP 5
+\fBE_REQUEST_DENIED\fR
+The menu driver could not process the request.
+.SH SEE ALSO
+\fBcurses\fR(3) and 3 pages whose names begin "menu_" for detailed
+descriptions of the entry points.
+.SH NOTES
+The header file \fB<menu.h>\fR automatically includes the header files
+\fB<curses.h>\fR and \fB<eti.h>\fR.
+
+In your library list, libmenu.a should be before libcurses.a; that is,
+you want to say `-lmenu -lcurses', not the other way around (which would
+give you a link error using GNU \fBld\fR(1) and many other linkers).
+.SH PORTABILITY
+These routines emulate the System V menu library.  They were not supported on
+Version 7 or BSD versions.
+.SH AUTHORS
+Juergen Pfeifer.  Manual pages and adaptation for ncurses by Eric
+S. Raymond.
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/lib/libmenu/menu_attribs.3 b/lib/libmenu/menu_attribs.3
index 39850c1e2a6..a6da6517757 100644
--- a/lib/libmenu/menu_attribs.3
+++ b/lib/libmenu/menu_attribs.3
@@ -1,5 +1,6 @@
 '\" t
-.TH menu_attributes 3X ""
+.\" $OpenBSD: menu_attribs.3,v 1.3 1997/12/14 23:19:32 millert Exp $
+.TH menu_attributes 3 ""
 .SH NAME
 \fBmenu_attributes\fR - color and attribute control for menus
 .SH SYNOPSIS
@@ -52,7 +53,7 @@ System error occurred (see \fBerrno\fR).
 \fBE_BAD_ARGUMENT\fR
 Routine detected an incorrect or out-of-range argument.
 .SH SEE ALSO
-\fBcurses\fR(3X) and 3X pages whose names begin "menu_" for detailed
+\fBcurses\fR(3) and 3 pages whose names begin "menu_" for detailed
 descriptions of the entry points.
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
diff --git a/lib/libmenu/menu_cursor.3 b/lib/libmenu/menu_cursor.3
index d2e5e2a3e8b..39b0a634dd1 100644
--- a/lib/libmenu/menu_cursor.3
+++ b/lib/libmenu/menu_cursor.3
@@ -1,5 +1,6 @@
 '\" t
-.TH menu_cursor 3X ""
+.\" $OpenBSD: menu_cursor.3,v 1.3 1997/12/14 23:19:32 millert Exp $
+.TH menu_cursor 3 ""
 .SH NAME
 \fBmenu_cursor\fR - position a menu's cursor
 .SH SYNOPSIS
@@ -26,7 +27,7 @@ Routine detected an incorrect or out-of-range argument.
 \fBE_NOT_POSTED\fR
 The menu has not been posted.
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenu\fR(3X).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/menu_driver.3 b/lib/libmenu/menu_driver.3
index d64853563a2..aedff6c2740 100644
--- a/lib/libmenu/menu_driver.3
+++ b/lib/libmenu/menu_driver.3
@@ -1,5 +1,6 @@
-'\" t
-.TH menu_driver 3X ""
+.\" $OpenBSD: menu_driver.3,v 1.3 1997/12/14 23:19:33 millert Exp $
+.\" Id: menu_driver.3x,v 1.5 1997/12/14 01:28:42 tom Exp $
+.TH menu_driver 3 ""
 .SH NAME
 \fBmenu_driver\fR - command-processing loop of the menu system
 .SH SYNOPSIS
@@ -104,7 +105,7 @@ Character failed to match.
 \fBE_REQUEST_DENIED\fR
 The menu driver could not process the request.
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenus\fR(3x).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header files
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/menu_format.3 b/lib/libmenu/menu_format.3
index a901a065192..e25ad5f896f 100644
--- a/lib/libmenu/menu_format.3
+++ b/lib/libmenu/menu_format.3
@@ -1,5 +1,6 @@
 '\" t
-.TH menu_format 3X ""
+.\" $OpenBSD: menu_format.3,v 1.3 1997/12/14 23:19:33 millert Exp $
+.TH menu_format 3 ""
 .SH NAME
 \fBmenu_format\fR - set and get menu sizes
 .SH SYNOPSIS
@@ -36,7 +37,7 @@ Routine detected an incorrect or out-of-range argument.
 \fBE_POSTED\fR
 The menu is already posted.
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenu\fR(3X).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/menu_hook.3 b/lib/libmenu/menu_hook.3
index 36adef9f7aa..ee5687acb28 100644
--- a/lib/libmenu/menu_hook.3
+++ b/lib/libmenu/menu_hook.3
@@ -1,5 +1,6 @@
 '\" t
-.TH menu_hook 3X ""
+.\" $OpenBSD: menu_hook.3,v 1.3 1997/12/14 23:19:33 millert Exp $
+.TH menu_hook 3 ""
 .SH NAME
 \fBmenu_hook\fR - set hooks for automatic invocation by applications
 .SH SYNOPSIS
@@ -54,7 +55,7 @@ The routine succeeded.
 \fBE_SYSTEM_ERROR\fR
 System error occurred (see \fBerrno\fR).
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenu\fR(3X).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/menu_items.3 b/lib/libmenu/menu_items.3
index 888ae819311..ead8bd96af1 100644
--- a/lib/libmenu/menu_items.3
+++ b/lib/libmenu/menu_items.3
@@ -1,5 +1,6 @@
 '\" t
-.TH menu_items 3X ""
+.\" $OpenBSD: menu_items.3,v 1.3 1997/12/14 23:19:34 millert Exp $
+.TH menu_items 3 ""
 .SH NAME
 \fBmenu_items\fR - make and break connections between items and menus
 .SH SYNOPSIS
@@ -41,7 +42,7 @@ The menu is already posted.
 \fBE_NOT_CONNECTED\fR
 No items are connected to the menu.
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenu\fR(3X).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/menu_mark.3 b/lib/libmenu/menu_mark.3
index 62f6d39c45c..98f01e4e27c 100644
--- a/lib/libmenu/menu_mark.3
+++ b/lib/libmenu/menu_mark.3
@@ -1,5 +1,6 @@
 '\" t
-.TH menu_mark 3X ""
+.\" $OpenBSD: menu_mark.3,v 1.3 1997/12/14 23:19:34 millert Exp $
+.TH menu_mark 3 ""
 .SH NAME
 \fBmenu_mark\fR - get and set the menu mark string
 .SH SYNOPSIS
@@ -37,7 +38,7 @@ System error occurred (see \fBerrno\fR).
 \fBE_BAD_ARGUMENT\fR
 Routine detected an incorrect or out-of-range argument.
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenu\fR(3X).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/menu_new.3 b/lib/libmenu/menu_new.3
index 9053fdd5579..103aad08ed3 100644
--- a/lib/libmenu/menu_new.3
+++ b/lib/libmenu/menu_new.3
@@ -1,5 +1,6 @@
 '\" t
-.TH menu_new 3X ""
+.\" $OpenBSD: menu_new.3,v 1.3 1997/12/14 23:19:35 millert Exp $
+.TH menu_new 3 ""
 .SH NAME
 \fBmenu_new\fR - create and destroy menus
 .SH SYNOPSIS
@@ -32,7 +33,7 @@ Routine detected an incorrect or out-of-range argument.
 \fBE_POSTED\fR
 The menu has already been posted.
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenu\fR(3X).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/menu_opts.3 b/lib/libmenu/menu_opts.3
index f5b67b19d90..a97682ee81a 100644
--- a/lib/libmenu/menu_opts.3
+++ b/lib/libmenu/menu_opts.3
@@ -1,5 +1,6 @@
 '\" t
-.TH menu_opts 3X ""
+.\" $OpenBSD: menu_opts.3,v 1.3 1997/12/14 23:19:35 millert Exp $
+.TH menu_opts 3 ""
 .SH NAME
 \fBmenu_opts\fR - set and get menu options
 .SH SYNOPSIS
@@ -57,7 +58,7 @@ System error occurred (see \fBerrno\fR).
 \fBE_POSTED\fR
 The menu is already posted.
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenu\fR(3X).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/menu_pattern.3 b/lib/libmenu/menu_pattern.3
index 30bc52793d1..e02bf66a60c 100644
--- a/lib/libmenu/menu_pattern.3
+++ b/lib/libmenu/menu_pattern.3
@@ -1,5 +1,6 @@
-'\" t
-.TH menu_pattern 3X ""
+.\" $OpenBSD: menu_pattern.3,v 1.3 1997/12/14 23:19:36 millert Exp $
+.\" Id: menu_pattern.3x,v 1.4 1997/12/06 22:10:02 tom Exp $
+.TH menu_pattern 3 ""
 .SH NAME
 \fBmenu_pattern\fR - get and set a menu's pattern buffer
 .SH SYNOPSIS
@@ -12,7 +13,7 @@ char *menu_pattern(const MENU *menu);
 .SH DESCRIPTION
 Every menu has an associated pattern match buffer.  As input events that are
 printable ASCII characters come in, they are appended to this match buffer
-and tested for a match, as described in \fBmenu_driver\fR(3x).
+and tested for a match, as described in \fBmenu_driver\fR(3).
 
 The function \fBset_menu_pattern\fR sets the pattern buffer for the given menu
 and tries to find the first matching item.  If it succeeds, that item becomes
@@ -36,7 +37,7 @@ Routine detected an incorrect or out-of-range argument.
 \fBE_NO_MATCH\fR
 Character failed to match.
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenu\fR(3X).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/menu_post.3 b/lib/libmenu/menu_post.3
index 0cf8dfd30a8..539874a84f7 100644
--- a/lib/libmenu/menu_post.3
+++ b/lib/libmenu/menu_post.3
@@ -1,5 +1,6 @@
 '\" t
-.TH menu_post 3X ""
+.\" $OpenBSD: menu_post.3,v 1.3 1997/12/14 23:19:36 millert Exp $
+.TH menu_post 3 ""
 .SH NAME
 \fBmenu_post\fR - write or erase menus from associated subwindows
 .SH SYNOPSIS
@@ -43,7 +44,7 @@ The menu has not been posted.
 \fBE_NOT_CONNECTED\fR
 No items are connected to the menu.
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenu\fR(3X).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/menu_requestname.3 b/lib/libmenu/menu_requestname.3
index 9ae823e32c6..28770253591 100644
--- a/lib/libmenu/menu_requestname.3
+++ b/lib/libmenu/menu_requestname.3
@@ -1,5 +1,6 @@
 '\" t
-.TH menu_requestname 3X ""
+.\" $OpenBSD: menu_requestname.3,v 1.2 1997/12/14 23:19:36 millert Exp $
+.TH menu_requestname 3 ""
 .SH NAME
 \fBmenu_requestname\fR - handle printable menu request names
 .SH SYNOPSIS
@@ -21,7 +22,7 @@ to \fBE_BAD_ARGUMENT\fR.
 .br
 \fBmenu_request_by_name\fR returns \fBE_NO_MATCH\fR on error.
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenu\fR(3X).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/menu_spacing.3 b/lib/libmenu/menu_spacing.3
index ece226321c1..5748c0a50bf 100644
--- a/lib/libmenu/menu_spacing.3
+++ b/lib/libmenu/menu_spacing.3
@@ -1,5 +1,6 @@
 '\" t
-.TH menu_spacing 3X ""
+.\" $OpenBSD: menu_spacing.3,v 1.2 1997/12/14 23:19:37 millert Exp $
+.TH menu_spacing 3 ""
 .SH NAME
 \fBmenu_spacing\fR - Control spacing between menu items.
 .SH SYNOPSIS
@@ -36,7 +37,7 @@ Both routines return \fBE_OK\fR on success. \fBset_menu_spacing\fR may return
 \fBE_POSTED\fR if the menu is posted, or \fBE_BAD_ARGUMENT\fR if one of the
 spacing values is out of range.
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenu\fR(3X).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/menu_userptr.3 b/lib/libmenu/menu_userptr.3
index 30afd616864..8fc1ebee079 100644
--- a/lib/libmenu/menu_userptr.3
+++ b/lib/libmenu/menu_userptr.3
@@ -1,5 +1,6 @@
 '\" t
-.TH menu_userptr 3X ""
+.\" $OpenBSD: menu_userptr.3,v 1.3 1997/12/14 23:19:37 millert Exp $
+.TH menu_userptr 3 ""
 .SH NAME
 \fBmenu_userptr\fR - associate application data with a menu item
 .SH SYNOPSIS
@@ -23,7 +24,7 @@ The routine succeeded.
 \fBE_SYSTEM_ERROR\fR
 System error occurred (see \fBerrno\fR).
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenu\fR(3X).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/menu_win.3 b/lib/libmenu/menu_win.3
index 9ed9b4eb2ea..d1fa4fa80c6 100644
--- a/lib/libmenu/menu_win.3
+++ b/lib/libmenu/menu_win.3
@@ -1,5 +1,6 @@
 '\" t
-.TH menu_win 3X ""
+.\" $OpenBSD: menu_win.3,v 1.3 1997/12/14 23:19:38 millert Exp $
+.TH menu_win 3 ""
 .SH NAME
 \fBmenu_win\fR - make and break menu window and subwindow associations
 .SH SYNOPSIS
@@ -48,7 +49,7 @@ The menu has already been posted.
 \fBE_NOT_CONNECTED\fR
 No items are connected to the menu.
 .SH SEE ALSO
-\fBcurses\fR(3X), \fBmenu\fR(3X).
+\fBcurses\fR(3), \fBmenu\fR(3).
 .SH NOTES
 The header file \fB<menu.h>\fR automatically includes the header file
 \fB<curses.h>\fR.
diff --git a/lib/libmenu/mitem_current.3 b/lib/libmenu/mitem_current.3
new file mode 100644
index 00000000000..6078b49d52b
--- /dev/null
+++ b/lib/libmenu/mitem_current.3
@@ -0,0 +1,73 @@
+.\" $OpenBSD: mitem_current.3,v 1.1 1997/12/14 23:19:38 millert Exp $
+'\" t
+.TH mitem_current 3 ""
+.SH NAME
+\fBmitem_current\fR - set and get current_menu_item
+.SH SYNOPSIS
+\fB#include <menu.h>\fR
+.br
+int set_current_item(MENU *menu, const ITEM *item);
+.br
+ITEM *current_item(const MENU *menu);
+.br
+int set_top_row(MENU *menu, int row);
+.br
+int top_row(const MENU *menu);
+.br
+int item_index(const ITEM *item);
+.br
+.SH DESCRIPTION
+The function \fBset_current_item\fR sets the current item (the item on which
+the menu cursor is positioned).  \fBcurrent_item\fR returns a pointer to the
+current item in the given menu.
+
+The function \fBset_top_row\fR sets the top row of the menu to show the given
+row (the top row is initially 0, and is reset to this value whenever the
+\fBO_ROWMAJOR\fR option is toggled).  The item leftmost on the given row
+becomes current.  The function \fBtop_row\fR returns the number of the top menu
+row being displayed.
+
+The function \fBitem_index\fR returns the (zero-origin) index of \fIitem\fR in
+the menu's item pointer list.
+.SH RETURN VALUE
+\fBcurrent_item\fR returns \fBNULL\fR on error.
+
+\fBtop_row\fR and \fBitem_index\fR return \fBERR\fR (the general \fBcurses\fB 
+error value) on error.
+
+\fBset_current_item\fR and \fBset_top_row\fR return one of the following:
+.TP 5
+\fBE_OK\fR
+The routine succeeded.
+.TP 5
+\fBE_SYSTEM_ERROR\fR
+System error occurred (see \fBerrno\fR).
+.TP 5
+\fBE_BAD_ARGUMENT\fR
+Routine detected an incorrect or out-of-range argument.
+.TP 5
+\fBE_BAD_STATE\fR
+Routine was called from an initialization or termination function.
+.TP 5
+\fBE_NOT_CONNECTED\fR
+No items are connected to the menu.
+.SH SEE ALSO
+\fBcurses\fR(3), \fBmenu\fR(3).
+.SH NOTES
+The header file \fB<menu.h>\fR automatically includes the header file
+\fB<curses.h>\fR.
+.SH PORTABILITY
+These routines emulate the System V menu library.  They were not supported on
+Version 7 or BSD versions.
+
+The SVr4 menu library documentation specifies the \fBtop_row\fR and
+\fBindex_item\fR error value as -1 (which is the value of \fBERR\fR).
+.SH AUTHORS
+Juergen Pfeifer.  Manual pages and adaptation for new curses by Eric
+S. Raymond.
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/lib/libmenu/mitem_name.3 b/lib/libmenu/mitem_name.3
new file mode 100644
index 00000000000..bb90f04641a
--- /dev/null
+++ b/lib/libmenu/mitem_name.3
@@ -0,0 +1,36 @@
+.\" $OpenBSD: mitem_name.3,v 1.1 1997/12/14 23:19:39 millert Exp $
+'\" t
+.TH mitem_name 3 ""
+.SH NAME
+\fBmitem_name\fR - get menu item name and description fields
+.SH SYNOPSIS
+\fB#include <menu.h>\fR
+.br
+const char *item_name(const ITEM *item);
+.br
+const char *item_description(const ITEM *item);
+.br
+.SH DESCRIPTION
+The function \fBitem_name\fR returns the name part of the given item.
+.br
+The function \fBitem_description\fR returns the description part of the given
+item.
+.SH RETURN VALUE
+These routines returns \fBNULL\fR on error.
+.SH SEE ALSO
+\fBcurses\fR(3), \fBmenu\fR(3).
+.SH NOTES
+The header file \fB<menu.h>\fR automatically includes the header file
+\fB<curses.h>\fR.
+.SH PORTABILITY
+These routines emulate the System V menu library.  They were not supported on
+Version 7 or BSD versions.
+.SH AUTHORS
+Juergen Pfeifer.  Manual pages and adaptation for new curses by Eric
+S. Raymond.
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/lib/libmenu/mitem_new.3 b/lib/libmenu/mitem_new.3
new file mode 100644
index 00000000000..560e3bdb027
--- /dev/null
+++ b/lib/libmenu/mitem_new.3
@@ -0,0 +1,55 @@
+.\" $OpenBSD: mitem_new.3,v 1.1 1997/12/14 23:19:39 millert Exp $
+'\" t
+.TH mitem_new 3 ""
+.SH NAME
+\fBmitem_new\fR - create and destroy menu items
+.SH SYNOPSIS
+\fB#include <menu.h>\fR
+.br
+ITEM *new_item(const char *name, const char *description);
+.br
+int free_item(ITEM *item);
+.br
+.SH DESCRIPTION
+The function \fBnew_item\fR allocates a new item and initializes it from the
+\fBname\fR and \fBdescription\fR pointers. Please notice that the item stores
+only the pointers to the name and description. Those pointers must be valid
+during the lifetime of the item. So you should be very carefull with names
+or descriptions allocated on the stack of some routines.
+.br
+The function \fBfree_item\fR de-allocates an item. Please notice that it
+is the responsibility of the application to release the memory for the
+name or the description of the item.
+.SH RETURN VALUE
+The function \fBnew_item\fR returns \fBNULL\fR on error.
+
+The function \fBfree_item\fR returns one of the following:
+.TP 5
+\fBE_OK\fR
+The routine succeeded.
+.TP 5
+\fBE_SYSTEM_ERROR\fR
+System error occurred (see \fBerrno\fR).
+.TP 5
+\fBE_BAD_ARGUMENT\fR
+Routine detected an incorrect or out-of-range argument.
+.TP 5
+\fBE_CONNECTED\fR
+Item is connected to a menu.
+.SH SEE ALSO
+\fBcurses\fR(3), \fBmenu\fR(3).
+.SH NOTES
+The header file \fB<menu.h>\fR automatically includes the header file
+\fB<curses.h>\fR.
+.SH PORTABILITY
+These routines emulate the System V menu library.  They were not supported on
+Version 7 or BSD versions.
+.SH AUTHORS
+Juergen Pfeifer.  Manual pages and adaptation for new curses by Eric
+S. Raymond.
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/lib/libmenu/mitem_opts.3 b/lib/libmenu/mitem_opts.3
new file mode 100644
index 00000000000..9e6fc94e3ed
--- /dev/null
+++ b/lib/libmenu/mitem_opts.3
@@ -0,0 +1,56 @@
+.\" $OpenBSD: mitem_opts.3,v 1.1 1997/12/14 23:19:40 millert Exp $
+'\" t
+.TH mitem_opts 3 ""
+.SH NAME
+\fBmitem_opts\fR - set and get menu item options
+.SH SYNOPSIS
+\fB#include <menu.h>\fR
+.br
+int set_item_opts(ITEM *item, OPTIONS opts);
+.br
+int item_opts_on(ITEM *item, OPTIONS opts);
+.br
+int item_opts_off(ITEM *item, OPTIONS opts);
+.br
+OPTIONS item_opts(const ITEM *item);
+.br
+.SH DESCRIPTION
+The function \fBset_item_opts\fR sets all the given item's option bits (menu
+option bits may be logically-OR'ed together).
+
+The function \fBitem_opts_on\fR turns on the given option bits, and leaves
+others alone.
+
+The function \fBitem_opts_off\fR turns off the given option bits, and leaves
+others alone.
+
+The function \fBitem_opts\fR returns the item's current option bits.  
+
+There is only one defined option bit mask, \fBO_SELECTABLE\fR.  When this is
+on, the item may be selected during menu processing.  This option defaults
+to on.
+.SH RETURN VALUE
+Except for \fBitem_opts\fR, each routine returns one of the following:
+.TP 5
+\fBE_OK\fR
+The routine succeeded.
+.TP 5
+\fBE_SYSTEM_ERROR\fR
+System error occurred (see \fBerrno\fR).
+.SH SEE ALSO
+\fBcurses\fR(3), \fBmenu\fR(3).
+.SH NOTES
+The header file \fB<menu.h>\fR automatically includes the header file
+\fB<curses.h>\fR.
+.SH PORTABILITY
+These routines emulate the System V menu library.  They were not supported on
+Version 7 or BSD versions.
+.SH AUTHORS
+Juergen Pfeifer.  Manual pages and adaptation for new curses by Eric
+S. Raymond.
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/lib/libmenu/mitem_userptr.3 b/lib/libmenu/mitem_userptr.3
new file mode 100644
index 00000000000..b84561297dc
--- /dev/null
+++ b/lib/libmenu/mitem_userptr.3
@@ -0,0 +1,44 @@
+.\" $OpenBSD: mitem_userptr.3,v 1.1 1997/12/14 23:19:40 millert Exp $
+'\" t
+.TH mitem_userptr 3 ""
+.SH NAME
+\fBmitem_userptr\fR - associate application data with a menu item
+.SH SYNOPSIS
+\fB#include <menu.h>\fR
+.br
+int set_item_userptr(ITEM *item, void *userptr);
+.br
+void *item_userptr(const ITEM *item);
+.br
+.SH DESCRIPTION
+Every menu item has a field that can be used to hold application-specific data
+(that is, the menu-driver code leaves it alone).  These functions get and set
+that field.
+.SH RETURN VALUE
+Except for \fBitem_userptr\fR (which returns \fBNULL\fR on error), each function returns one of the following:
+.TP 5
+\fBE_OK\fR
+The routine succeeded.
+.TP 5
+\fBE_SYSTEM_ERROR\fR
+System error occurred (see \fBerrno\fR).
+.SH SEE ALSO
+\fBcurses\fR(3), \fBmenu\fR(3).
+.SH NOTES
+The header file \fB<menu.h>\fR automatically includes the header file
+\fB<curses.h>\fR.
+.SH PORTABILITY
+These routines emulate the System V menu library.  They were not supported on
+Version 7 or BSD versions.
+
+The user pointer should be a void pointer.  We leave it as a char pointer for
+SVr4 compatibility.
+.SH AUTHORS
+Juergen Pfeifer.  Manual pages and adaptation for new curses by Eric
+S. Raymond.
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/lib/libmenu/mitem_value.3 b/lib/libmenu/mitem_value.3
new file mode 100644
index 00000000000..03ed76c1f05
--- /dev/null
+++ b/lib/libmenu/mitem_value.3
@@ -0,0 +1,49 @@
+.\" $OpenBSD: mitem_value.3,v 1.1 1997/12/14 23:19:40 millert Exp $
+.\" Id: mitem_value.3x,v 1.3 1997/12/06 22:07:49 tom Exp $
+.TH mitem_value 3 ""
+.SH NAME
+\fBmitem_value\fR - set and get menu item values
+.SH SYNOPSIS
+\fB#include <menu.h>\fR
+.br
+int set_item_value(ITEM *item, bool value);
+.br
+bool item_value(const ITEM *item);
+.br
+.SH DESCRIPTION
+If you turn off the menu option \fBO_ONEVALUE\fR (e.g., with
+\fBset_menu_opts\fR or \fBmenu_opts_off\fR; see \fBmenu_opts\fR(3)), the menu
+becomes multi-valued; that is, more than one item may simultaneously be
+selected.
+
+In a multi_valued menu, you can used \fBset_item_value\fR to select the
+given menu item (second argument \fBTRUE\fR) or deselect it (second argument
+\fBFALSE\fR).
+.SH RETURN VALUE
+The function \fBset_item_value\fR returns one of the following:
+.TP 5
+\fBE_OK\fR
+The routine succeeded.
+.TP 5
+\fBE_SYSTEM_ERROR\fR
+System error occurred (see \fBerrno\fR).
+.TP 5
+\fBE_REQUEST_DENIED\fR
+The menu driver could not process the request.
+.SH SEE ALSO
+\fBcurses\fR(3), \fBmenu\fR(3).
+.SH NOTES
+The header file \fB<menu.h>\fR automatically includes the header file
+\fB<curses.h>\fR.
+.SH PORTABILITY
+These routines emulate the System V menu library.  They were not supported on
+Version 7 or BSD versions.
+.SH AUTHORS
+Juergen Pfeifer.  Manual pages and adaptation for new curses by Eric
+S. Raymond.
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/lib/libmenu/mitem_visible.3 b/lib/libmenu/mitem_visible.3
new file mode 100644
index 00000000000..1a5adddf866
--- /dev/null
+++ b/lib/libmenu/mitem_visible.3
@@ -0,0 +1,31 @@
+.\" $OpenBSD: mitem_visible.3,v 1.1 1997/12/14 23:19:41 millert Exp $
+'\" t
+.TH mitem_visible 3 ""
+.SH NAME
+\fBmitem_visible\fR - check visibility of a menu item
+.SH SYNOPSIS
+\fB#include <menu.h>\fR
+.br
+bool item_visible(const ITEM *item);
+.br
+.SH DESCRIPTION
+A menu item is visible when it is in the portion of a posted menu that
+is mapped onto the screen (if the menu is scrollable, in particular, this
+portion will be smaller than the whole menu).
+.SH SEE ALSO
+\fBcurses\fR(3), \fBmenu\fR(3).
+.SH NOTES
+The header file \fB<menu.h>\fR automatically includes the header file
+\fB<curses.h>\fR.
+.SH PORTABILITY
+These routines emulate the System V menu library.  They were not supported on
+Version 7 or BSD versions.
+.SH AUTHORS
+Juergen Pfeifer.  Manual pages and adaptation for new curses by Eric
+S. Raymond.
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/lib/libpanel/panel.3 b/lib/libpanel/panel.3
index 22d4cfb3573..0bfa6279222 100644
--- a/lib/libpanel/panel.3
+++ b/lib/libpanel/panel.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: panel.3,v 1.4 1997/12/03 05:42:24 millert Exp $
+.\" $OpenBSD: panel.3,v 1.5 1997/12/14 23:19:07 millert Exp $
+.\" Id: panel.3x,v 1.8 1997/12/14 01:49:25 tom Exp $
 .TH panel 3 ""
 .ds n 5
 .ds d /usr/share/terminfo
@@ -40,7 +41,7 @@ panel - panel stack extension for curses
 \fBint del_panel(PANEL *pan)\fR
 .br
 .SH DESCRIPTION
-Panels are curses(3) windows with the added feature of
+Panels are \fBcurses\fR(3) windows with the added feature of
 depth.  Panel functions allow the use of stacked windows and ensure
 the proper portions of each window and the curses \fBstdscr\fR window are
 hidden or displayed when panels are added, moved, modified or removed.
@@ -52,7 +53,7 @@ A window is associated with every panel. The panel routines enable
 you to create, move, hides, and show panels, as well as position a
 panel at any desired location in the stack.
 .P
-Panel routines are a functional layer added to curses(3), make only
+Panel routines are a functional layer added to \fBcurses\fR(3), make only
 high-level curses calls, and work anywhere terminfo curses does.
 .SH FUNCTIONS
 .TP
@@ -98,7 +99,7 @@ to move a panel window.
 \fBreplace_panel(pan,window)\fR
 replaces the current window of panel with \fBwindow\fR (useful, for
 example if you want to resize a panel; if you're using \fBcurses\fR,
-you can call \fBreplace_panel\fR on the output of \fBwresize\fR(3x)).
+you can call \fBreplace_panel\fR on the output of \fBwresize\fR(3)).
 It does not change the position of the panel in the stack.
 .TP
 \fBpanel_above(pan)\fR
@@ -147,10 +148,8 @@ interface for the panels library
 libpanel.a
 the panels library itself
 .SH SEE ALSO
-curses(3)
+\fBcurses\fR(3X)
 .SH AUTHOR
 Originally written by Warren Tucker <wht@n4hgf.mt-park.ga.us>,
 primarily to assist in porting u386mon to systems without a native
 panels library.  Repackaged for ncurses by Zeyd ben-Halim.
-
-