From 0ac2306dd3aaab1338d8b1458c15a7e476cfc3ff Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 19 Sep 2010 00:45:46 +0000 Subject: [PATCH] ncurses 5.7 - patch 20100918 + regenerated html manpages. + minor fixes for symlinks to curs_legacy.3x and curs_slk.3x manpages. + add manpage for sp-funcs. + add sp-funcs to test/listused.sh, for documentation aids. --- MANIFEST | 5 + NEWS | 8 +- dist.mk | 4 +- doc/html/man/adacurses-config.1.html | 2 +- doc/html/man/captoinfo.1m.html | 66 ++--- doc/html/man/clear.1.html | 2 +- doc/html/man/curs_add_wch.3x.html | 32 ++- doc/html/man/curs_add_wchstr.3x.html | 6 +- doc/html/man/curs_addch.3x.html | 6 +- doc/html/man/curs_addchstr.3x.html | 6 +- doc/html/man/curs_addstr.3x.html | 6 +- doc/html/man/curs_addwstr.3x.html | 6 +- doc/html/man/curs_attr.3x.html | 6 +- doc/html/man/curs_border.3x.html | 6 +- doc/html/man/curs_border_set.3x.html | 6 +- doc/html/man/curs_color.3x.html | 90 +++---- doc/html/man/curs_delch.3x.html | 6 +- doc/html/man/curs_get_wch.3x.html | 18 +- doc/html/man/curs_get_wstr.3x.html | 10 +- doc/html/man/curs_getcchar.3x.html | 44 +-- doc/html/man/curs_getch.3x.html | 6 +- doc/html/man/curs_getstr.3x.html | 6 +- doc/html/man/curs_in_wch.3x.html | 6 +- doc/html/man/curs_in_wchstr.3x.html | 8 +- doc/html/man/curs_inch.3x.html | 9 +- doc/html/man/curs_inchstr.3x.html | 6 +- doc/html/man/curs_ins_wch.3x.html | 8 +- doc/html/man/curs_ins_wstr.3x.html | 8 +- doc/html/man/curs_insch.3x.html | 6 +- doc/html/man/curs_insstr.3x.html | 6 +- doc/html/man/curs_instr.3x.html | 6 +- doc/html/man/curs_inwstr.3x.html | 8 +- doc/html/man/curs_kernel.3x.html | 12 +- doc/html/man/curs_legacy.3x.html | 24 +- doc/html/man/curs_printw.3x.html | 6 +- doc/html/man/curs_scanw.3x.html | 6 +- doc/html/man/curs_slk.3x.html | 68 ++--- doc/html/man/curs_sp_funcs.3x.html | 283 +++++++++++++++++++ doc/html/man/curs_termcap.3x.html | 109 ++++---- doc/html/man/curs_threads.3x.html | 111 ++++---- doc/html/man/curs_util.3x.html | 193 ++++++------- doc/html/man/curs_variables.3x.html | 164 +++++++++++ doc/html/man/form.3x.html | 2 +- doc/html/man/form_driver.3x.html | 67 +++-- doc/html/man/form_field_buffer.3x.html | 53 ++-- doc/html/man/form_variables.3x.html | 117 ++++++++ doc/html/man/infocmp.1m.html | 2 +- doc/html/man/infotocap.1m.html | 27 +- doc/html/man/menu.3x.html | 2 +- doc/html/man/menu_driver.3x.html | 52 ++-- doc/html/man/ncurses.3x.html | 22 +- doc/html/man/ncurses5-config.1.html | 2 +- doc/html/man/panel.3x.html | 2 +- doc/html/man/tabs.1.html | 2 +- doc/html/man/term_variables.3x.html | 165 ++++++++++++ doc/html/man/terminfo.5.html | 2 +- doc/html/man/tic.1m.html | 10 +- doc/html/man/toe.1m.html | 2 +- doc/html/man/tput.1.html | 2 +- doc/html/man/tset.1.html | 2 +- doc/html/man/wresize.3x.html | 14 +- man/curs_add_wch.3x | 14 +- man/curs_color.3x | 24 +- man/curs_getcchar.3x | 32 +-- man/curs_legacy.3x | 4 +- man/curs_slk.3x | 10 +- man/curs_sp_funcs.3x | 359 +++++++++++++++++++++++++ man/curs_threads.3x | 22 +- man/curs_util.3x | 34 +-- man/form_driver.3x | 29 +- man/form_field_buffer.3x | 28 +- man/man_db.renames | 3 +- man/menu_driver.3x | 41 ++- man/ncurses.3x | 20 +- test/README | 130 ++++++++- test/listused.sh | 7 +- 76 files changed, 2004 insertions(+), 694 deletions(-) create mode 100644 doc/html/man/curs_sp_funcs.3x.html create mode 100644 doc/html/man/curs_variables.3x.html create mode 100644 doc/html/man/form_variables.3x.html create mode 100644 doc/html/man/term_variables.3x.html create mode 100644 man/curs_sp_funcs.3x diff --git a/MANIFEST b/MANIFEST index b2a6a89a..ed71f393 100644 --- a/MANIFEST +++ b/MANIFEST @@ -377,6 +377,7 @@ ./doc/html/man/curs_scr_dump.3x.html ./doc/html/man/curs_scroll.3x.html ./doc/html/man/curs_slk.3x.html +./doc/html/man/curs_sp_funcs.3x.html ./doc/html/man/curs_termattrs.3x.html ./doc/html/man/curs_termcap.3x.html ./doc/html/man/curs_terminfo.3x.html @@ -384,6 +385,7 @@ ./doc/html/man/curs_touch.3x.html ./doc/html/man/curs_trace.3x.html ./doc/html/man/curs_util.3x.html +./doc/html/man/curs_variables.3x.html ./doc/html/man/curs_window.3x.html ./doc/html/man/default_colors.3x.html ./doc/html/man/define_key.3x.html @@ -409,6 +411,7 @@ ./doc/html/man/form_post.3x.html ./doc/html/man/form_requestname.3x.html ./doc/html/man/form_userptr.3x.html +./doc/html/man/form_variables.3x.html ./doc/html/man/form_win.3x.html ./doc/html/man/index.html ./doc/html/man/infocmp.1m.html @@ -447,6 +450,7 @@ ./doc/html/man/tabs.1.html ./doc/html/man/term.5.html ./doc/html/man/term.7.html +./doc/html/man/term_variables.3x.html ./doc/html/man/terminfo.5.html ./doc/html/man/tic.1m.html ./doc/html/man/toe.1m.html @@ -595,6 +599,7 @@ ./man/curs_scr_dump.3x ./man/curs_scroll.3x ./man/curs_slk.3x +./man/curs_sp_funcs.3x ./man/curs_termattrs.3x ./man/curs_termcap.3x ./man/curs_terminfo.3x diff --git a/NEWS b/NEWS index 20b49ecb..847017e9 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.1590 2010/09/11 21:41:14 tom Exp $ +-- $Id: NEWS,v 1.1593 2010/09/18 22:53:08 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,12 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20100918 + + regenerated html manpages. + + minor fixes for symlinks to curs_legacy.3x and curs_slk.3x manpages. + + add manpage for sp-funcs. + + add sp-funcs to test/listused.sh, for documentation aids. + 20100911 + add manpages for summarizing public variables of curses-, terminfo- and form-libraries. diff --git a/dist.mk b/dist.mk index a8731e16..7dc0a50b 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.773 2010/09/11 14:06:59 tom Exp $ +# $Id: dist.mk,v 1.774 2010/09/18 14:51:01 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 5 NCURSES_MINOR = 7 -NCURSES_PATCH = 20100911 +NCURSES_PATCH = 20100918 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/man/adacurses-config.1.html b/doc/html/man/adacurses-config.1.html index bd6fbdcc..bcbbfe57 100644 --- a/doc/html/man/adacurses-config.1.html +++ b/doc/html/man/adacurses-config.1.html @@ -81,7 +81,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 366545bc..deef19be 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: captoinfo.1m,v 1.23 2010/07/31 16:12:01 tom Exp @
+  * @Id: captoinfo.1m,v 1.24 2010/08/28 19:36:31 tom Exp @
 -->
 
 
@@ -59,25 +59,26 @@

DESCRIPTION

-       captoinfo looks in file  for  termcap  descriptions.   For
-       each  one  found,  an  equivalent  terminfo description is
-       written to standard output.  Termcap tc  capabilities  are
-       translated directly to terminfo use capabilities.
+       captoinfo looks  in  each  given  text  file  for  termcap
+       descriptions.   For each one found, an equivalent terminfo
+       description is written to  standard  output.   Termcap  tc
+       capabilities are translated directly to terminfo use capa-
+       bilities.
 
        If no file is given, then the environment variable TERMCAP
-       is used for the filename or entry.  If TERMCAP is  a  full
+       is  used  for the filename or entry.  If TERMCAP is a full
        pathname to a file, only the terminal whose name is speci-
-       fied in the environment variable TERM  is  extracted  from
-       that  file.   If  the  environment variable TERMCAP is not
+       fied  in  the  environment variable TERM is extracted from
+       that file.  If the environment  variable  TERMCAP  is  not
        set, then the file /usr/share/terminfo is read.
 
-       -v   print out tracing information on  standard  error  as
+       -v   print  out  tracing  information on standard error as
             the program runs.
 
-       -V   print  out the version of the program in use on stan-
+       -V   print out the version of the program in use on  stan-
             dard error and exit.
 
-       -1   cause the fields to print out one to a line.   Other-
+       -1   cause  the fields to print out one to a line.  Other-
             wise, the fields will be printed several to a line to
             a maximum width of 60 characters.
 
@@ -92,12 +93,12 @@

TRANSLATIONS FROM NONSTANDARD CAPABILITIES

-       Some  obsolete nonstandard capabilities will automatically
-       be translated into  standard  (SVr4/XSI  Curses)  terminfo
-       capabilities  by  captoinfo.   Whenever one of these auto-
-       matic translations is done,  the  program  will  issue  an
+       Some obsolete nonstandard capabilities will  automatically
+       be  translated  into  standard  (SVr4/XSI Curses) terminfo
+       capabilities by captoinfo.  Whenever one  of  these  auto-
+       matic  translations  is  done,  the  program will issue an
        notification to stderr, inviting the user to check that it
-       has not mistakenly translated  a  completely  unknown  and
+       has  not  mistakenly  translated  a completely unknown and
        random capability and/or syntax error.
 
        Nonstd   Std    From           Terminfo
@@ -115,8 +116,8 @@
        GE       ae     XENIX   exit_alt_charset_mode
        GS       as     XENIX   enter_alt_charset_mode
        HM       kh     XENIX   key_home
-       LD       kL     XENIX   key_dl
 
+       LD       kL     XENIX   key_dl
        PD       kN     XENIX   key_npage
        PN       po     XENIX   prtr_off
        PS       pf     XENIX   prtr_on
@@ -133,8 +134,8 @@
        FC       Sf     Tek     set_foreground
        HS       mh     Iris    enter_dim_mode
 
-       XENIX  termcap  also used to have a set of extension capa-
-       bilities for forms drawing, designed to take advantage  of
+       XENIX termcap also used to have a set of  extension  capa-
+       bilities  for forms drawing, designed to take advantage of
        the IBM PC high-half graphics.  They were as follows:
 
        Cap          Graphic
@@ -163,14 +164,14 @@
        Gc    intersection
        GG    acs magic cookie count
 
-       If  the  single-line  capabilities occur in an entry, they
-       will automatically be composed into an acsc  string.   The
+       If the single-line capabilities occur in  an  entry,  they
+       will  automatically  be composed into an acsc string.  The
        double-line capabilities and GG are discarded with a warn-
        ing message.
 
        IBM's AIX has a terminfo facility descended from SVr1 ter-
-       minfo but incompatible with the SVr4 format. The following
-       AIX extensions are automatically translated:
+       minfo but incompatible with the SVr4 format.  The  follow-
+       ing AIX extensions are automatically translated:
 
         IBM    XSI
        -------------
@@ -181,22 +182,22 @@
        font2   s2ds
        font3   s3ds
 
-       Additionally, the AIX box1 capability  will  be  automati-
+       Additionally,  the  AIX  box1 capability will be automati-
        cally translated to an acsc string.
 
-       Hewlett-Packard's  terminfo  library supports two nonstan-
-       dard terminfo capabilities meml  (memory  lock)  and  memu
-       (memory  unlock).   These will be discarded with a warning
+       Hewlett-Packard's terminfo library supports  two  nonstan-
+       dard  terminfo  capabilities  meml  (memory lock) and memu
+       (memory unlock).  These will be discarded with  a  warning
        message.

NOTES

-       This utility is actually a link to tic(1m), running in  -I
+       This  utility is actually a link to tic(1m), running in -I
        mode.  You can use other tic options such as -f and  -x.
 
-       The  trace option is not identical to SVr4's.  Under SVr4,
-       instead of following the -v with  a  trace  level  n,  you
+       The trace option is not identical to SVr4's.  Under  SVr4,
+       instead  of  following  the  -v  with a trace level n, you
        repeat it n times.
 
 
@@ -204,12 +205,13 @@
 
SEE ALSO
        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
 
 
 

 
AUTHOR
-       Eric S. Raymond <esr@snark.thyrsus.com>
+       Eric S. Raymond <esr@snark.thyrsus.com> and
+       Thomas E. Dickey <dickey@invisible-island.net>
 
 
 
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 97f16c17..bd91de34 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -69,7 +69,7 @@
 
SEE ALSO
        tput(1), terminfo(5)
 
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
 
 
 
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 607d6651..3f0ec170 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wch.3x,v 1.7 2010/07/31 16:12:01 tom Exp @
+  * @Id: curs_add_wch.3x,v 1.9 2010/09/18 20:18:34 tom Exp @
 -->
 
 
@@ -73,21 +73,21 @@
        perform  wrapping and special-character processing as fol-
        lows:
 
-       -    If wch refers to a spacing character, then any previ-
-            ous  character  at  that  location is removed.  A new
-            character specified by wch is placed at that location
-            with  rendition  specified  by  wch.  The cursor then
-            advances to the next spacing character on the screen.
+       o   If wch refers to a spacing character, then any  previ-
+           ous  character  at  that  location  is removed.  A new
+           character specified by wch is placed at that  location
+           with  rendition  specified  by  wch.   The cursor then
+           advances to the next spacing character on the screen.
 
-       -    If wch refers to a non-spacing character, all  previ-
-            ous  characters  at that location are preserved.  The
-            non-spacing characters of wch are added to the  spac-
-            ing complex character, and the rendition specified by
-            wch is ignored.
+       o   If wch refers to a non-spacing character, all previous
+           characters  at  that location are preserved.  The non-
+           spacing characters of wch are  added  to  the  spacing
+           complex  character, and the rendition specified by wch
+           is ignored.
 
-       -    If the character part  of  wch  is  a  tab,  newline,
-            backspace  or  other control character, the window is
-            updated and the cursor moves as if addch were called.
+       o   If the character  part  of  wch  is  a  tab,  newline,
+           backspace  or  other  control character, the window is
+           updated and the cursor moves as if addch were called.
 
        The echo_wchar function is functionally  equivalent  to  a
        call to add_wch followed by a call to refresh.  Similarly,
@@ -104,6 +104,10 @@
        All routines return the integer ERR upon failure and OK on
        success.
 
+       Functions with a "mv" prefix first perform a cursor  move-
+       ment  using  wmove, and return an error if the position is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_add_wchstr.3x.html b/doc/html/man/curs_add_wchstr.3x.html
index bc93e128..e4d7e47f 100644
--- a/doc/html/man/curs_add_wchstr.3x.html
+++ b/doc/html/man/curs_add_wchstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_add_wchstr.3x,v 1.7 2010/07/31 16:12:01 tom Exp @
+  * @Id: curs_add_wchstr.3x,v 1.8 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -103,6 +103,10 @@
        All routines return the integer ERR upon failure and OK on
        success.
 
+       Functions with a "mv" prefix first perform a cursor  move-
+       ment  using  wmove, and return an error if the position is
+       outside the window, or if the window pointer is null.
+
 
 

 
PORTABILITY
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html
index f526cf72..b2086c92 100644
--- a/doc/html/man/curs_addch.3x.html
+++ b/doc/html/man/curs_addch.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addch.3x,v 1.28 2010/07/31 16:12:01 tom Exp @
+  * @Id: curs_addch.3x,v 1.29 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -158,6 +158,10 @@
        other than ERR") upon successful completion, unless other-
        wise noted in the preceding routine descriptions.
 
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_addchstr.3x.html b/doc/html/man/curs_addchstr.3x.html
index 42eb0b7b..fb2a0a74 100644
--- a/doc/html/man/curs_addchstr.3x.html
+++ b/doc/html/man/curs_addchstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addchstr.3x,v 1.13 2010/07/31 16:12:01 tom Exp @
+  * @Id: curs_addchstr.3x,v 1.14 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -97,6 +97,10 @@
        X/Open does not define any error conditions.  This  imple-
        mentation returns an error if the window pointer is null.
 
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html
index 9330e617..b2f18634 100644
--- a/doc/html/man/curs_addstr.3x.html
+++ b/doc/html/man/curs_addstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addstr.3x,v 1.14 2010/07/31 16:12:01 tom Exp @
+  * @Id: curs_addstr.3x,v 1.15 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -89,6 +89,10 @@
        or if the string pointer is null or if  the  corresponding
        calls to waddch return an error.
 
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_addwstr.3x.html b/doc/html/man/curs_addwstr.3x.html
index 793af5f8..b0cbb894 100644
--- a/doc/html/man/curs_addwstr.3x.html
+++ b/doc/html/man/curs_addwstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_addwstr.3x,v 1.8 2010/07/31 16:12:01 tom Exp @
+  * @Id: curs_addwstr.3x,v 1.9 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -90,6 +90,10 @@
        All routines return the integer ERR upon failure and OK on
        success.
 
+       Functions with a "mv" prefix first perform a cursor  move-
+       ment  using  wmove, and return an error if the position is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 5b6f3023..e4deb00f 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.33 2010/07/31 16:12:01 tom Exp @
+  * @Id: curs_attr.3x,v 1.34 2010/08/14 23:30:02 tom Exp @
 -->
 
 
@@ -242,6 +242,10 @@
        OR_PAIRS-1.   This  implementation  also provides getattrs
        for compatibility with older versions of curses.
 
+       Functions with a "mv" prefix first perform a cursor  move-
+       ment  using  wmove, and return an error if the position is
+       outside the window, or if the window pointer is null.
+
 
 

 
SEE ALSO
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index bc6d74f0..99dfca94 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border.3x,v 1.20 2010/07/31 16:12:01 tom Exp @
+  * @Id: curs_border.3x,v 1.21 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -124,6 +124,10 @@
        X/Open does not define any error conditions.  This  imple-
        mentation returns an error if the window pointer is null.
 
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_border_set.3x.html b/doc/html/man/curs_border_set.3x.html
index 43b83fa7..2b599484 100644
--- a/doc/html/man/curs_border_set.3x.html
+++ b/doc/html/man/curs_border_set.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_border_set.3x,v 1.7 2010/07/31 16:12:01 tom Exp @
+  * @Id: curs_border_set.3x,v 1.8 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -161,6 +161,10 @@
        Functions  using  a window parameter return an error if it
        is null.
 
+       Functions with a "mv" prefix first perform a cursor  move-
+       ment  using  wmove, and return an error if the position is
+       outside the window, or if the window pointer is null.
+
 
 

 
SEE ALSO
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index b7bd241a..ac5c27e1 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.30 2010/07/31 16:12:01 tom Exp @
+  * @Id: curs_color.3x,v 1.32 2010/09/18 20:27:38 tom Exp @
 -->
 
 
@@ -55,6 +55,7 @@
 

 
SYNOPSIS
        # include <curses.h>
+
        int start_color(void);
        int init_pair(short pair, short f, short b);
        int init_color(short color, short r, short g, short b);
@@ -108,17 +109,17 @@
        pair to be changed, the foreground color number,  and  the
        background color number.  For portable applications:
 
-       -    The value of the first argument must be between 1 and
-            COLOR_PAIRS-1, except that if default colors are used
-            (see  use_default_colors) the upper limit is adjusted
-            to allow for extra pairs which use a default color in
-            foreground and/or background.
+       o   The  value of the first argument must be between 1 and
+           COLOR_PAIRS-1, except that if default colors are  used
+           (see  use_default_colors)  the upper limit is adjusted
+           to allow for extra pairs which use a default color  in
+           foreground and/or background.
 
-       -    The  value  of the second and third arguments must be
-            between 0 and COLORS.  Color pair 0 is assumed to  be
-            white on black, but is actually whatever the terminal
-            implements before color is initialized.  It cannot be
-            modified by the application.
+       o   The  value  of  the second and third arguments must be
+           between 0 and COLORS.  Color pair 0 is assumed  to  be
+           white  on black, but is actually whatever the terminal
+           implements before color is initialized.  It cannot  be
+           modified by the application.
 
        If  the  color-pair was previously initialized, the screen
        is refreshed and all occurrences of  that  color-pair  are
@@ -205,71 +206,70 @@
        turned from  secondary  functions  such  as  init_pair  if
        start_color was not called.
 
-              init_color
-                   returns an error if the terminal does not sup-
-                   port  this  feature,  e.g.,  if  the  initial-
-                   ize_color capability is absent from the termi-
-                   nal description.
+          init_color
+               returns  an error if the terminal does not support
+               this feature, e.g., if the initialize_color  capa-
+               bility is absent from the terminal description.
 
-              start_color
-                   returns an error If the color table cannot  be
-                   allocated.
+          start_color
+               returns  an error if the color table cannot be al-
+               located.
 
 
 

 
NOTES
-       In  the  ncurses implementation, there is a separate color
+       In the ncurses implementation, there is a  separate  color
        activation flag, color palette, color pairs table, and as-
-       sociated  COLORS  and  COLOR_PAIRS counts for each screen;
-       the start_color function only affects the current  screen.
+       sociated COLORS and COLOR_PAIRS counts  for  each  screen;
+       the  start_color function only affects the current screen.
        The SVr4/XSI interface is not really designed with this in
-       mind, and historical  implementations  may  use  a  single
+       mind,  and  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
+       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 curs_bkgd(3x).
 
-       Several  caveats  apply  on 386 and 486 machines with VGA-
+       Several caveats apply on 386 and 486  machines  with  VGA-
        compatible graphics:
 
-       -    COLOR_YELLOW is actually brown.  To get  yellow,  use
-            COLOR_YELLOW combined with the A_BOLD attribute.
+       o   COLOR_YELLOW  is  actually  brown.  To get yellow, use
+           COLOR_YELLOW combined with the A_BOLD attribute.
 
-       -    The  A_BLINK  attribute  should  in  theory cause the
-            background to go bright.  This often fails  to  work,
-            and  even  some cards for which it mostly works (such
-            as the Paradise and compatibles) do the  wrong  thing
-            when you try to set a bright "yellow" background (you
-            get a blinking yellow foreground instead).
+       o   The A_BLINK attribute should in theory cause the back-
+           ground  to  go  bright.  This often fails to work, and
+           even some cards for which it mostly works (such as the
+           Paradise  and compatibles) do the wrong thing when you
+           try to set a bright "yellow"  background  (you  get  a
+           blinking yellow foreground instead).
 
-       -    Color RGB values are not settable.
+       o   Color RGB values are not settable.
 
 
 

 
PORTABILITY
-       This implementation satisfies XSI Curses's  minimum  maxi-
+       This  implementation  satisfies XSI Curses's minimum maxi-
        mums for COLORS and COLOR_PAIRS.
 
-       The  init_pair  routine  accepts  negative values of fore-
-       ground  and  background  color  to  support  the   use_de-
-       fault_colors  extension, but only if that routine has been
+       The init_pair routine accepts  negative  values  of  fore-
+       ground   and  background  color  to  support  the  use_de-
+       fault_colors extension, but only if that routine has  been
        first invoked.
 
-       The assumption that COLOR_BLACK is the default  background
-       color  for  all  terminals  can  be modified using the as-
+       The  assumption that COLOR_BLACK is the default background
+       color for all terminals can  be  modified  using  the  as-
        sume_default_colors extension.
 
-       This implementation checks the  pointers,  e.g.,  for  the
-       values  returned  by  color_content  and pair_content, and
+       This  implementation  checks  the  pointers, e.g., for the
+       values returned by  color_content  and  pair_content,  and
        will treat those as optional parameters when null.
 
 
 

 
SEE ALSO
-       curses(3x), curs_initscr(3x), curs_attr(3x),  default_col-
+       curses(3x),  curs_initscr(3x), curs_attr(3x), default_col-
        ors(3x)
 
 
diff --git a/doc/html/man/curs_delch.3x.html b/doc/html/man/curs_delch.3x.html
index 4036dc39..6edc1c40 100644
--- a/doc/html/man/curs_delch.3x.html
+++ b/doc/html/man/curs_delch.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_delch.3x,v 1.9 2010/07/31 16:12:01 tom Exp @
+  * @Id: curs_delch.3x,v 1.10 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -78,6 +78,10 @@
        (SVr4  specifies  only  "an integer value other than ERR")
        upon successful completion.
 
+       Functions with a "mv" prefix first perform a cursor  move-
+       ment  using  wmove, and return an error if the position is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html
index 40a77c78..0b2373e6 100644
--- a/doc/html/man/curs_get_wch.3x.html
+++ b/doc/html/man/curs_get_wch.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -123,19 +123,23 @@
 
 

 
RETURN VALUES
-       When get_wch, wget_wch, mvget_wch,  and  mvwget_wch  func-
-       tions  successfully report the pressing of a function key,
+       When  get_wch,  wget_wch,  mvget_wch, and mvwget_wch func-
+       tions successfully report the pressing of a function  key,
        they return KEY_CODE_YES.  When they successfully report a
-       wide  character,  they  return OK.  Otherwise, they return
+       wide character, they return OK.   Otherwise,  they  return
        ERR.
 
-       Upon successful completion, unget_wch returns OK.   Other-
+       Upon  successful completion, unget_wch returns OK.  Other-
        wise, the function returns ERR.
 
+       Functions with a "mv" prefix first perform a cursor  move-
+       ment  using  wmove, and return an error if the position is
+       outside the window, or if the window pointer is null.
+
 
 

 
SEE ALSO
-       curses(3x),        curs_getch(3x),       curs_ins_wch(3x),
+       curses(3x),       curs_getch(3x),        curs_ins_wch(3x),
        curs_inopts(3x), curs_move(3x), curs_refresh(3x)
 
 
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 159cebe5..e8604660 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -129,6 +129,10 @@
                    returns an error if  the  associated  call  to
                    wget_wch failed.
 
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
+       outside the window, or if the window pointer is null.
+
 
 

 
PORTABILITY
@@ -147,7 +151,7 @@
 
 

 
SEE ALSO
-       Functions:  curses(3x), curs_get_wch(3x), curs_getstr(3x).
+       Functions: curses(3x), curs_get_wch(3x), curs_getstr(3x).
 
 
 
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index 889edbd5..df895827 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.13 2010/07/31 16:12:01 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.14 2010/09/18 20:26:21 tom Exp @
 -->
 
 
@@ -77,43 +77,43 @@
        rendition from a cchar_t argument.  When wch is not a null
        pointer, the getcchar function does the following:
 
-       -    Extracts information from a cchar_t value wcval
+       o   Extracts information from a cchar_t value wcval
 
-       -    Stores  the  character  attributes  in  the  location
-            pointed to by attrs
+       o   Stores   the  character  attributes  in  the  location
+           pointed to by attrs
 
-       -    Stores the color-pair in the location pointed  to  by
-            color_pair
+       o   Stores the color-pair in the location  pointed  to  by
+           color_pair
 
-       -    Stores  the  wide-character string, characters refer-
-            enced by wcval, into the array pointed to by wch.
+       o   Stores  the  wide-character  string, characters refer-
+           enced by wcval, into the array pointed to by wch.
 
        When wch is a null pointer, the getcchar function does the
        following:
 
-       -    Obtains  the  number of wide characters pointed to by
-            wcval
+       o   Obtains  the  number  of wide characters pointed to by
+           wcval
 
-       -    Does not change  the  data  referenced  by  attrs  or
-            color_pair
+       o   Does not  change  the  data  referenced  by  attrs  or
+           color_pair
 
        The  setcchar function initializes the location pointed to
        by wcval by using:
 
-       -    The character attributes in attrs
+       o   The character attributes in attrs
 
-       -    The color pair in color_pair
+       o   The color pair in color_pair
 
-       -    The wide-character string pointed  to  by  wch.   The
-            string  must be L'\0' terminated, contain at most one
-            spacing character, which must be the first.
+       o   The wide-character string  pointed  to  by  wch.   The
+           string  must  be L'\0' terminated, contain at most one
+           spacing character, which must be the first.
 
-            Up to CCHARW_MAX-1 nonspacing characters may  follow.
-            Additional nonspacing characters are ignored.
+           Up to CCHARW_MAX-1 nonspacing characters  may  follow.
+           Additional nonspacing characters are ignored.
 
-            The  string  may  contain  a single control character
-            instead.  In that case, no nonspacing characters  are
-            allowed.
+           The  string  may  contain  a  single control character
+           instead.  In that case, no nonspacing  characters  are
+           allowed.
 
 
 

diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 32194bb2..f1dd0434 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.31 2010/01/30 21:29:04 tom Exp @
+  * @Id: curs_getch.3x,v 1.32 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -247,6 +247,10 @@
                    null, or if its timeout expires without having
                    any data.
 
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index e0068aeb..1c08c4f3 100644
--- a/doc/html/man/curs_getstr.3x.html
+++ b/doc/html/man/curs_getstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getstr.3x,v 1.16 2010/07/31 16:12:01 tom Exp @
+  * @Id: curs_getstr.3x,v 1.17 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -107,6 +107,10 @@
        SIGWINCH interrupts the function, it will  return  KEY_RE-
        SIZE rather than OK or ERR.
 
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_in_wch.3x.html b/doc/html/man/curs_in_wch.3x.html
index a58e7c14..63cecb90 100644
--- a/doc/html/man/curs_in_wch.3x.html
+++ b/doc/html/man/curs_in_wch.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_in_wch.3x,v 1.3 2010/07/31 16:10:55 tom Exp @
+  * @Id: curs_in_wch.3x,v 1.4 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -76,6 +76,10 @@
        the  cursor,  returning  ERR in that case.  Otherwise they
        return OK
 
+       Functions with a "mv" prefix first perform a cursor  move-
+       ment  using  wmove, and return an error if the position is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_in_wchstr.3x.html b/doc/html/man/curs_in_wchstr.3x.html
index f5762860..6fb8509a 100644
--- a/doc/html/man/curs_in_wchstr.3x.html
+++ b/doc/html/man/curs_in_wchstr.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -94,6 +94,10 @@
        Upon successful completion,  these  functions  return  OK.
        Otherwise, they return ERR.
 
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
+       outside the window, or if the window pointer is null.
+
 
 

 
PORTABILITY
diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html
index 2d69e2cf..c6217fde 100644
--- a/doc/html/man/curs_inch.3x.html
+++ b/doc/html/man/curs_inch.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inch.3x,v 1.14 2010/07/31 16:11:27 tom Exp @
+  * @Id: curs_inch.3x,v 1.16 2010/08/14 23:35:36 tom Exp @
 -->
 
 
@@ -80,6 +80,13 @@
        A_COLOR        Bit-mask to extract color-pair field information
 
 
+

+
RETURN VALUE
+       Functions with a "mv" prefix first perform a cursor  move-
+       ment  using  wmove, and return an error if the position is
+       outside the window, or if the window pointer is null.
+
+
 

 
NOTES
        Note that all of these routines may be macros.
diff --git a/doc/html/man/curs_inchstr.3x.html b/doc/html/man/curs_inchstr.3x.html
index e105c5fd..996820cf 100644
--- a/doc/html/man/curs_inchstr.3x.html
+++ b/doc/html/man/curs_inchstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_inchstr.3x,v 1.13 2010/07/31 16:08:48 tom Exp @
+  * @Id: curs_inchstr.3x,v 1.14 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -91,6 +91,10 @@
        is null, no data is returned, and the return value is  ze-
        ro.
 
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_ins_wch.3x.html b/doc/html/man/curs_ins_wch.3x.html
index 6e69d8f9..5b6eb4f1 100644
--- a/doc/html/man/curs_ins_wch.3x.html
+++ b/doc/html/man/curs_ins_wch.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -77,6 +77,10 @@
        If successful, these functions return OK.   If  not,  they
        return ERR.
 
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
+       outside the window, or if the window pointer is null.
+
 
 

 
ERRORS
diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html
index 3d818704..c7b88b2e 100644
--- a/doc/html/man/curs_ins_wstr.3x.html
+++ b/doc/html/man/curs_ins_wstr.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -106,6 +106,10 @@
        Upon successful completion,  these  functions  return  OK.
        Otherwise, they return ERR.
 
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
+       outside the window, or if the window pointer is null.
+
 
 

 
SEE ALSO
diff --git a/doc/html/man/curs_insch.3x.html b/doc/html/man/curs_insch.3x.html
index addbbd38..05d52428 100644
--- a/doc/html/man/curs_insch.3x.html
+++ b/doc/html/man/curs_insch.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insch.3x,v 1.11 2010/07/31 16:11:27 tom Exp @
+  * @Id: curs_insch.3x,v 1.12 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -78,6 +78,10 @@
        than  ERR")  upon  successful completion, unless otherwise
        noted in the preceding routine descriptions.
 
+       Functions with a "mv" prefix first perform a cursor  move-
+       ment  using  wmove, and return an error if the position is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html
index 59d30027..266cae1b 100644
--- a/doc/html/man/curs_insstr.3x.html
+++ b/doc/html/man/curs_insstr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_insstr.3x,v 1.19 2010/07/31 16:11:27 tom Exp @
+  * @Id: curs_insstr.3x,v 1.20 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -92,6 +92,10 @@
        tion, if the window parameter is null or the str parameter
        is null, an error is returned.
 
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html
index b56b831a..77e40cc9 100644
--- a/doc/html/man/curs_instr.3x.html
+++ b/doc/html/man/curs_instr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_instr.3x,v 1.14 2010/07/31 16:11:27 tom Exp @
+  * @Id: curs_instr.3x,v 1.15 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -86,6 +86,10 @@
        tion, if the window parameter is null or the str parameter
        is null, a zero is returned.
 
+       Functions with a "mv" prefix first perform a cursor  move-
+       ment  using  wmove, and return an error if the position is
+       outside the window, or if the window pointer is null.
+
 
 

 
NOTES
diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html
index 17e13b06..d0055c2c 100644
--- a/doc/html/man/curs_inwstr.3x.html
+++ b/doc/html/man/curs_inwstr.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -93,6 +93,10 @@
        routines  return  the  number  of characters read into the
        string.
 
+       Functions with a "mv" prefix first perform a cursor  move-
+       ment  using  wmove, and return an error if the position is
+       outside the window, or if the window pointer is null.
+
 
 

 
SEE ALSO
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 19d43773..0f24b05e 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_kernel.3x,v 1.16 2010/07/31 16:11:27 tom Exp @
+  * @Id: curs_kernel.3x,v 1.17 2010/08/14 23:12:36 Tim.van.der.Molen Exp @
 -->
 
 
@@ -128,11 +128,11 @@
        ripoffline  can  be called up to five times before calling
        initscr or newterm.
 
-       The curs_set routine sets the cursor state is set  to  in-
-       visible,  normal,  or very visible for visibility equal to
-       0, 1, or 2 respectively.  If  the  terminal  supports  the
-       visibility  requested,  the  previous  cursor state is re-
-       turned; otherwise, ERR is returned.
+       The curs_set routine sets the cursor state  to  invisible,
+       normal, or very visible for visibility equal to 0, 1, or 2
+       respectively.  If the terminal supports the visibility re-
+       quested, the previous cursor state is returned; otherwise,
+       ERR is returned.
 
        The napms routine is used to sleep for ms milliseconds.
 
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html
index 4489f2c0..8f08da05 100644
--- a/doc/html/man/curs_legacy.3x.html
+++ b/doc/html/man/curs_legacy.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_legacy.3x,v 1.2 2010/07/31 16:11:27 tom Exp @
+  * @Id: curs_legacy.3x,v 1.3 2010/09/11 22:21:52 tom Exp @
 -->
 
 
@@ -47,14 +47,14 @@
 
 

 
NAME
-       getbegx, getbegy, getcurx, getcury, getmaxx, getmaxy, get-
-       parx, getpary - get curses cursor and window coordinates
+       get curses cursor and window coordinates, attributes
 
 
 

 
SYNOPSIS
        #include <curses.h>
 
+       int getattrs(WINDOW *win);
        int getbegx(WINDOW *win);
        int getbegy(WINDOW *win);
        int getcurx(WINDOW *win);
@@ -67,33 +67,33 @@
 
 

 
DESCRIPTION
-       The getbegy and getbegx functions return the same data  as
+       The  getbegy and getbegx functions return the same data as
        getbegyx.
 
-       The  getcury and getcurx functions return the same data as
+       The getcury and getcurx functions return the same data  as
        getyx.
 
-       The getmaxy and getmaxx functions return the same data  as
+       The  getmaxy and getmaxx functions return the same data as
        getmaxyx.
 
-       The  getpary and getparx functions return the same data as
+       The getpary and getparx functions return the same data  as
        getparyx.
 
 
 

 
RETURN VALUE
-       These functions return an integer, or ERR  if  the  window
+       These  functions  return  an integer, or ERR if the window
        parameter is null.
 
 
 

 
NOTES
-       All  of  these interfaces are provided as macros and func-
-       tions.  The macros are suppressed (and only the  functions
-       provided)  when  NCURSES_OPAQUE  is defined.  The standard
+       All of these interfaces are provided as macros  and  func-
+       tions.   The macros are suppressed (and only the functions
+       provided) when NCURSES_OPAQUE is  defined.   The  standard
        forms such as getyx must be implemented as macros, and (in
        this implementation) are defined in terms of the functions
-       described here, to avoid reliance on internal  details  of
+       described  here,  to avoid reliance on internal details of
        the WINDOW structure.
 
 
diff --git a/doc/html/man/curs_printw.3x.html b/doc/html/man/curs_printw.3x.html
index 3153059a..ce2c4d75 100644
--- a/doc/html/man/curs_printw.3x.html
+++ b/doc/html/man/curs_printw.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_printw.3x,v 1.18 2010/07/31 16:10:55 tom Exp @
+  * @Id: curs_printw.3x,v 1.19 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -91,6 +91,10 @@
        enough memory for the buffer used to format  the  results.
        It will return an error if the window pointer is null.
 
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
+       outside the window, or if the window pointer is null.
+
 
 

 
PORTABILITY
diff --git a/doc/html/man/curs_scanw.3x.html b/doc/html/man/curs_scanw.3x.html
index 7546649e..48e8e9f7 100644
--- a/doc/html/man/curs_scanw.3x.html
+++ b/doc/html/man/curs_scanw.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_scanw.3x,v 1.15 2010/07/31 16:10:55 tom Exp @
+  * @Id: curs_scanw.3x,v 1.16 2010/08/14 23:29:16 tom Exp @
 -->
 
 
@@ -86,6 +86,10 @@
        wscanw,  mvscanw  and  mvwscanw  routines to determine the
        number of fields which were mapped in the call.
 
+       Functions with a "mv" prefix first perform a cursor  move-
+       ment  using  wmove, and return an error if the position is
+       outside the window, or if the window pointer is null.
+
 
 

 
PORTABILITY
diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 10e79f2b..772937b9 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_slk.3x,v 1.18 2010/07/31 14:43:29 tom Exp @
+  * @Id: curs_slk.3x,v 1.19 2010/09/11 22:35:11 tom Exp @
 -->
 
 
@@ -47,7 +47,7 @@
 
 

 
NAME
-       slk_init, slk_set, slk_refresh, slk_noutrefresh,
+       slk_init, slk_set, slk_wset, slk_refresh, slk_noutrefresh,
        slk_label, slk_clear, slk_restore, slk_touch, slk_attron,
        slk_attrset, slk_attroff, slk_attr_on, slk_attr_set,
        slk_attr_off, slk_attr, slk_color - curses soft label
@@ -75,6 +75,7 @@
             short color_pair_number, void* opts);
        attr_t slk_attr(void);
        int slk_color(short color_pair_number);
+       int slk_wset (int labnum, const wchar_t *label, int fmt);
 
 
 

@@ -107,47 +108,48 @@
                  an index line is generated, helping the user  to
                  identify the key numbers easily.
 
-       The slk_set routine has three parameters:
+       The  slk_set  routine  (and  the  slk_wset routine for the
+       wide-character library) has three parameters:
 
               labnum
-                   is  the  label number, from 1 to 8 (12 for fmt
+                   is the label number, from 1 to 8 (12  for  fmt
                    in slk_init is 2 or 3);
 
               label
-                   is be the string to put on the  label,  up  to
-                   eight  (five  for  fmt  in slk_init is 2 or 3)
+                   is  be  the  string to put on the label, up to
+                   eight (five for fmt in slk_init  is  2  or  3)
                    characters in length.  A null string or a null
                    pointer sets up a blank label.
 
-              fmt  is  either  0, 1, or 2, indicating whether the
-                   label is to be  left-justified,  centered,  or
-                   right-justified,  respectively, within the la-
+              fmt  is either 0, 1, or 2, indicating  whether  the
+                   label  is  to  be left-justified, centered, or
+                   right-justified, respectively, within the  la-
                    bel.
 
        The slk_refresh and slk_noutrefresh routines correspond to
        the wrefresh and wnoutrefresh routines.
 
-       The  slk_label routine returns the current label for label
+       The slk_label routine returns the current label for  label
        number labnum, with leading and trailing blanks stripped.
 
-       The slk_clear routine clears  the  soft  labels  from  the
+       The  slk_clear  routine  clears  the  soft labels from the
        screen.
 
-       The  slk_restore  routine  restores the soft labels to the
+       The slk_restore routine restores the soft  labels  to  the
        screen after a slk_clear has been performed.
 
-       The slk_touch routine forces all the  soft  labels  to  be
+       The  slk_touch  routine  forces  all the soft labels to be
        output the next time a slk_noutrefresh is performed.
 
        The slk_attron, slk_attrset, slk_attroff and slk_attr rou-
        tines correspond to attron, attrset, attroff and attr_get.
-       They  have  an effect only if soft labels are simulated on
-       the bottom line of the screen.  The default highlight  for
+       They have an effect only if soft labels are  simulated  on
+       the  bottom line of the screen.  The default highlight for
        soft keys is A_STANDOUT (as in System V curses, which does
        not document this fact).
 
        The slk_color routine corresponds to color_set.  It has an
-       effect  only  if  soft  labels are simulated on the bottom
+       effect only if soft labels are  simulated  on  the  bottom
        line of the screen.
 
 
@@ -157,7 +159,7 @@
        fies only "an integer value other than ERR") upon success-
        ful completion.
 
-       X/Open defines no error conditions.  In  this  implementa-
+       X/Open  defines  no error conditions.  In this implementa-
        tion
 
               slk_attr
@@ -165,36 +167,36 @@
 
               slk_attroff, slk_attron, slk_clear,
               slk_noutrefresh, slk_refresh, slk_touch
-                   return an error if the terminal or  the  soft-
+                   return  an  error if the terminal or the soft-
                    keys were not initialized.
 
               slk_attrset
-                   returns  an error if the terminal or the soft-
+                   returns an error if the terminal or the  soft-
                    keys were not initialized.
 
               slk_attr_set
-                   returns an error if the terminal or the  soft-
-                   keys  were  not initialized, or the color pair
+                   returns  an error if the terminal or the soft-
+                   keys were not initialized, or the  color  pair
                    is outside the range 0..COLOR_PAIRS-1, or opts
                    is not null.
 
               slk_color
-                   returns  an error if the terminal or the soft-
-                   keys were not initialized, or the  color  pair
+                   returns an error if the terminal or the  soft-
+                   keys  were  not initialized, or the color pair
                    is outside the range 0..COLOR_PAIRS-1.
 
               slk_init
-                   returns  an  error  if the format parameter is
+                   returns an error if the  format  parameter  is
                    outside the range 0..3.
 
               slk_label
                    returns NULL on error.
 
               slk_set
-                   returns an error if the terminal or the  soft-
-                   keys  were  not initialized, or the labnum pa-
-                   rameter is outside the range of label  counts,
-                   or  if  the  format  parameter  is outside the
+                   returns  an error if the terminal or the soft-
+                   keys were not initialized, or the  labnum  pa-
+                   rameter  is outside the range of label counts,
+                   or if the  format  parameter  is  outside  the
                    range 0..2, or if memory for the labels cannot
                    be allocated.
 
@@ -207,17 +209,17 @@

PORTABILITY

-       The XSI Curses standard, Issue 4,  describes  these  func-
-       tions.   It changes the argument type of the attribute-ma-
-       nipulation functions slk_attron, slk_attroff,  slk_attrset
+       The  XSI  Curses  standard, Issue 4, describes these func-
+       tions.  It changes the argument type of the  attribute-ma-
+       nipulation  functions slk_attron, slk_attroff, slk_attrset
        to be attr_t, and adds const qualifiers.  The format codes
-       2 and 3 for slk_init() and the function slk_attr are  spe-
+       2  and 3 for slk_init() and the function slk_attr are spe-
        cific to ncurses.

SEE ALSO

-       curses(3x),   curs_attr(3x),   curs_initscr(3x),  curs_re-
+       curses(3x),  curs_attr(3x),   curs_initscr(3x),   curs_re-
        fresh(3x)
 
 
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
new file mode 100644
index 00000000..70958783
--- /dev/null
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -0,0 +1,283 @@
+
+
+
+
+curs_sp_funcs 3x
+
+
+
+
+
curs_sp_funcs 3x

+

+
+
+curs_sp_funcs(3x)                                     curs_sp_funcs(3x)
+
+
+
+
+

+
NAME
+       new_prescr - curses screen-pointer extension
+
+
+

+
SYNOPSIS
+       #include <curses.h>
+
+       int assume_default_colors_sp(SCREEN*, int, int);
+       int baudrate_sp(SCREEN*);
+       int beep_sp(SCREEN*);
+       bool can_change_color_sp(SCREEN*);
+       int cbreak_sp(SCREEN*);
+       int color_content_sp(SCREEN*, short, short*, short*, short*);
+       int curs_set_sp(SCREEN*, int);
+       int define_key_sp(SCREEN*, const char *, int);
+       int def_prog_mode_sp(SCREEN*);
+       int def_shell_mode_sp(SCREEN*);
+       int delay_output_sp(SCREEN*, int);
+       int doupdate_sp(SCREEN*);
+       int echo_sp(SCREEN*);
+       int endwin_sp(SCREEN*);
+       int erasechar_sp(SCREEN*);
+       int filter_sp(SCREEN*);
+       int flash_sp(SCREEN*);
+       int flushinp_sp(SCREEN*);
+       int get_escdelay_sp(SCREEN*);
+       int getmouse_sp(SCREEN*, MEVENT*);
+       WINDOW* getwin_sp(SCREEN*, FILE*);
+       int halfdelay_sp(SCREEN*);
+       bool has_colors_sp(SCREEN*);
+       bool has_ic_sp(SCREEN*);
+       bool has_il_sp(SCREEN*);
+       int has_key_sp(SCREEN*, int);
+       bool has_mouse_sp(SCREEN*);
+       int init_color_sp(SCREEN*, short, short, short, short);
+       int init_pair_sp(SCREEN*, short, short, short);
+       int intrflush_sp(SCREEN*, WINDOW*, bool);
+       bool isendwin_sp(SCREEN*);
+       bool is_term_resized_sp(SCREEN*, int, int);
+       char* keybound_sp(SCREEN*, int, int);
+       int key_defined_sp(SCREEN*, const char *);
+       NCURSES_CONST char * keyname_sp(SCREEN*, int);
+       int keyok_sp(SCREEN*, int, bool);
+       char killchar_sp(SCREEN*);
+       int mcprint_sp(SCREEN*, char *, int);
+       int mouseinterval_sp(SCREEN*, int);
+       mmask_t mousemask_sp(SCREEN*, mmask_t, mmask_t *);
+       int mvcur_sp(SCREEN*, int, int, int, int);
+       int napms_sp(SCREEN*, int);
+       WINDOW* newpad_sp(SCREEN*, int, int);
+       SCREEN* new_prescr(void);
+       SCREEN* newterm_sp(SCREEN*, NCURSES_CONST char *, FILE *, FILE *);
+       WINDOW* newwin_sp(SCREEN*, int, int, int, int);
+       int nl_sp(SCREEN*);
+       int nocbreak_sp(SCREEN*);
+       int noecho_sp(SCREEN*);
+       int nofilter_sp(SCREEN*);
+       int nonl_sp(SCREEN*);
+       void noqiflush_sp(SCREEN*);
+       int noraw_sp(SCREEN*);
+       int pair_content_sp(SCREEN*, short, short*, short*);
+       void qiflush_sp(SCREEN*);
+       int raw_sp(SCREEN*);
+       int reset_prog_mode_sp(SCREEN*);
+       int reset_shell_mode_sp(SCREEN*);
+       int resetty_sp(SCREEN*);
+       int resize_term_sp(SCREEN*, int, int);
+       int resizeterm_sp(SCREEN*, int, int);
+       int restartterm_sp(SCREEN*, NCURSES_CONST char*, int, int *);
+       int ripoffline_sp(SCREEN*, int, int (*)(WINDOW*, int));
+       int savetty_sp(SCREEN*);
+       int scr_init_sp(SCREEN*, const char *);
+       int scr_restore_sp(SCREEN*, const char *);
+       int scr_set_sp(SCREEN*, const char *);
+       TERMINAL* set_curterm_sp(SCREEN*, TERMINAL*);
+       int set_escdelay_sp(SCREEN*, int);
+       int set_tabsize_sp(SCREEN*, int);
+       int slk_attroff_sp(SCREEN*, const chtype);
+       int slk_attron_sp(SCREEN*, const chtype);
+       int slk_attr_set_sp(SCREEN*, const attr_t, short, void*);
+       int slk_attrset_sp(SCREEN*, const chtype);
+       int slk_attr_sp((SCREEN*);
+       int slk_clear_sp(SCREEN*);
+       int slk_color_sp(SCREEN*, short);
+       int slk_init_sp(SCREEN*, int);
+       int slk_label_sp(SCREEN*, int);
+       int slk_noutrefresh_sp(SCREEN*);
+       int slk_refresh_sp(SCREEN*);
+       int slk_restore_sp(SCREEN*);
+       int slk_set_sp(SCREEN*, int, const char *, int);
+       int slk_touch_sp(SCREEN*);
+       int start_color_sp(SCREEN*);
+       attr_t term_attrs_sp(SCREEN*);
+       chtype termattrs_sp(SCREEN*);
+       char* termname_sp(SCREEN*);
+       int typeahead_sp(SCREEN*, int);
+       NCURSES_CONST char* unctrl_sp(SCREEN*, chtype);
+       int ungetch_sp(SCREEN*, int);
+       int ungetmouse_sp(SCREEN*,MEVENT *);
+       int unget_wch_sp(SCREEN*, const wchar_t);
+       int use_default_colors_sp(SCREEN*);
+       void use_env_sp(SCREEN*, bool);
+       int use_legacy_coding_sp(SCREEN*, int);
+       int vid_attr_sp(SCREEN*, attr_t, short, void *);
+       int vidattr_sp(SCREEN*, chtype);
+       int vid_puts_sp(SCREEN*, attr_t, short, void *, NCURSES_SP_OUTC);
+       int vidputs_sp(SCREEN*, chtype, NCURSES_SP_OUTC);
+       wchar_t* wunctrl_sp(SCREEN*, cchar_t *);
+
+       #include <form.h>
+
+       int new_form_sp(SCREEN*, FIELD **);
+
+       #include <menu.h>
+
+       int new_menu_sp(SCREEN*, ITEM **);
+
+       #include <panel.h>
+
+       int ceiling_panel(SCREEN*);
+       PANEL* ground_panel(SCREEN*);
+       int update_panels_sp(SCREEN*);
+
+       #include <term.h>
+
+       int del_curterm_sp(SCREEN*, TERMINAL *);
+       int putp_sp(SCREEN*, const char *);
+       int tgetflag_sp(SCREEN*, char *, const char *);
+       int tgetent_sp(SCREEN*, char *, const char *);
+       int tgetnum_sp(SCREEN*, NCURSES_CONST char *);
+       char* tgetstr_sp(SCREEN*, NCURSES_CONST char *, char **);
+       int tigetflag_sp(SCREEN*, NCURSES_CONST char *);
+       int tigetnum_sp(SCREEN*, NCURSES_CONST char *);
+       char* tigetstr_sp(SCREEN*, NCURSES_CONST char *);
+       int tputs_sp(SCREEN*, const char *, int, NCURSES_SP_OUTC);
+
+
+

+
DESCRIPTION
+       This  implementation can be configured to provide a set of
+       functions which improve the  ability  to  manage  multiple
+       screens.  This feature can be added to any of the configu-
+       rations supported by  ncurses;  it  adds  new  entrypoints
+       without changing the meaning of any of the existing ones.
+
+   IMPROVED FUNCTIONS
+       Most  of  the functions are new versions of existing func-
+       tions.  A parameter is added at the front of the parameter
+       list.  It is a SCREEN pointer.
+
+       The  existing  functions all use the current screen, which
+       is a static variable.   The  extended  functions  use  the
+       specified screen, thereby reducing the number of variables
+       which must be modified to update multiple screens.
+
+   NEW FUNCTIONS
+       Here are the new functions:
+
+       ceiling_panel
+            this returns a pointer to the topmost  panel  in  the
+            given screen.
+
+       ground_panel
+            this  returns  a  pointer  to the lowest panel in the
+            given screen.
+
+       new_prescr
+            when creating a new screen, the library  uses  static
+            variables   which   have   been   preset,   e.g.,  by
+            use_env(3x), filter(3x), etc.  With the screen-point-
+            er extension, there are situations where it must cre-
+            ate a current screen before  the  unextended  library
+            does.   The new_prescr function is used internally to
+            handle these cases.  It is also provided as an entry-
+            point  to allow applications to customize the library
+            initialization.
+
+
+

+
NOTES
+       This extension introduces some new names:
+
+       NCURSES_SP_FUNCS
+            This is set to the library  patch-level  number.   In
+            the  unextended library, this is zero (0), to make it
+            useful for checking if the extension is provided.
+
+       NCURSES_SP_NAME
+            The new functions are named using  the  macro  NCURS-
+            ES_SP_NAME,  which  hides  the actual implementation.
+            Currently this adds a "_sp" suffix to the name of the
+            unextended  function.   This  manual page indexes the
+            extensions showing the full name.  However the proper
+            usage  of  these functions uses the macro, to provide
+            for the possibility of changing the naming convention
+            for specific library configurations.
+
+       NCURSES_SP_OUTC
+            This  is  a  new  function-pointer type to use in the
+            screen-pointer functions  where  an  NCURSES_OUTC  is
+            used in the unextended library.
+
+       NCURSES_OUTC
+            This  is  a  function-pointer type used for the cases
+            where a function  passes  characters  to  the  output
+            stream, e.g., vidputs(3x).
+
+
+

+
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 ncurses ex-
+       tensions be conditioned using NCURSES_SP_FUNCS.
+
+
+

+
SEE ALSO
+       curses(3x), curs_opaque(3x), curs_threads(3x).
+
+
+
+                                                      curs_sp_funcs(3x)
+

+

+

+Man(1) output converted with
+man2html
+

+
+
diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index c17b0230..7a2f1641 100644
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_termcap.3x,v 1.23 2010/07/31 16:10:55 tom Exp @
+  * @Id: curs_termcap.3x,v 1.24 2010/09/11 19:59:32 tom Exp @
 -->
 
 
@@ -47,8 +47,9 @@

NAME

-       tgetent, tgetflag, tgetnum, tgetstr, tgoto, tputs - direct
-       curses interface to the terminfo capability database
+       PC, UP, BC, ospeed, tgetent, tgetflag, tgetnum, tgetstr,
+       tgoto, tputs - direct curses interface to the terminfo
+       capability database
@@ -71,56 +72,56 @@

DESCRIPTION

-       These routines are included as a conversion aid  for  pro-
-       grams  that use the termcap library.  Their parameters are
-       the same and the routines are emulated using the  terminfo
-       database.   Thus, they can only be used to query the capa-
-       bilities of entries for which a terminfo  entry  has  been
+       These  routines  are included as a conversion aid for pro-
+       grams that use the termcap library.  Their parameters  are
+       the  same and the routines are emulated using the terminfo
+       database.  Thus, they can only be used to query the  capa-
+       bilities  of  entries  for which a terminfo entry has been
        compiled.
 
-       The  tgetent routine loads the entry for name.  It returns
-       1 on success, 0 if there is no such entry, and -1  if  the
-       terminfo  database  could  not  be  found.   The emulation
-       ignores the buffer pointer bp.
+       The tgetent routine loads the entry for name.  It  returns
+       1  on  success, 0 if there is no such entry, and -1 if the
+       terminfo database could not be found.  The  emulation  ig-
+       nores the buffer pointer bp.
 
-       The tgetflag routine gets the boolean  entry  for  id,  or
-       zero if it is not available.
+       The tgetflag routine gets the boolean entry for id, or ze-
+       ro if it is not available.
 
-       The  tgetnum  routine gets the numeric entry for id, or -1
+       The tgetnum routine gets the numeric entry for id,  or  -1
        if it is not available.
 
-       The tgetstr routine returns the string entry  for  id,  or
-       zero  if  it  is  not  available.  Use tputs to output the
-       returned string.  The return value will also be copied  to
-       the  buffer pointed to by area, and the area value will be
+       The  tgetstr  routine  returns the string entry for id, or
+       zero if it is not available.  Use tputs to output the  re-
+       turned  string.   The  return value will also be copied to
+       the buffer pointed to by area, and the area value will  be
        updated to point past the null ending this value.
 
        Only the first two characters of the id parameter of tget-
        flag, tgetnum and tgetstr are compared in lookups.
 
-       The  tgoto  routine  instantiates  the parameters into the
-       given capability.  The output from this routine is  to  be
+       The tgoto routine instantiates  the  parameters  into  the
+       given  capability.   The output from this routine is to be
        passed to tputs.
 
-       The  tputs  routine  is described on the curs_terminfo(3x)
+       The tputs routine is described  on  the  curs_terminfo(3x)
        manual page.  It can retrieve capabilities by either term-
        cap or terminfo name.
 
        The variables PC, UP and BC are set by tgetent to the ter-
        minfo   entry's   data   for   pad_char,   cursor_up   and
-       backspace_if_not_bs,  respectively.   UP  is  not  used by
+       backspace_if_not_bs, respectively.   UP  is  not  used  by
        ncurses.  PC is used in the tdelay_output function.  BC is
-       used  in  the tgoto emulation.  The variable ospeed is set
+       used in the tgoto emulation.  The variable ospeed  is  set
        by ncurses in a system-specific coding to reflect the ter-
        minal speed.

RETURN VALUE

-       Except  where  explicitly  noted,  routines that return an
-       integer return ERR upon failure and OK (SVr4  only  speci-
-       fies  "an  integer  value other than ERR") upon successful
-       completion.
+       Except where explicitly noted, routines that return an in-
+       teger  return ERR upon failure and OK (SVr4 only specifies
+       "an integer value other than ERR") upon successful comple-
+       tion.
 
        Routines that return pointers return NULL on error.
 
@@ -128,48 +129,48 @@

BUGS

        If you call tgetstr to fetch ca or any other parameterized
-       string,  be  aware  that  it  will be returned in terminfo
-       notation, not the older and  not-quite-compatible  termcap
-       notation.  This will not cause problems if all you do with
-       it is call tgoto or tparm,  which  both  expand  terminfo-
-       style  strings  as terminfo.  (The tgoto function, if con-
-       figured to support termcap, will check if  the  string  is
-       indeed  terminfo-style  by  looking for "%p" parameters or
-       "$<..>" delays, and invoke a termcap-style parser  if  the
+       string, be aware that it will be returned in terminfo  no-
+       tation, not the older and not-quite-compatible termcap no-
+       tation.  This will not cause problems if all you  do  with
+       it  is  call  tgoto  or tparm, which both expand terminfo-
+       style strings as terminfo.  (The tgoto function,  if  con-
+       figured  to  support  termcap, will check if the string is
+       indeed terminfo-style by looking for  "%p"  parameters  or
+       "$<..>"  delays,  and invoke a termcap-style parser if the
        string does not appear to be terminfo).
 
-       Because  terminfo  conventions for representing padding in
-       string capabilities differ  from  termcap's,  tputs("50");
-       will  put  out a literal "50" rather than busy-waiting for
+       Because terminfo conventions for representing  padding  in
+       string  capabilities  differ  from termcap's, tputs("50");
+       will put out a literal "50" rather than  busy-waiting  for
        50 milliseconds.  Cope with it.
 
-       Note that termcap has nothing analogous to terminfo's  sgr
-       string.   One consequence of this is that termcap applica-
-       tions assume me (terminfo sgr0) does not reset the  alter-
-       nate  character  set.  This implementation checks for, and
+       Note  that termcap has nothing analogous to terminfo's sgr
+       string.  One consequence of this is that termcap  applica-
+       tions  assume me (terminfo sgr0) does not reset the alter-
+       nate character set.  This implementation checks  for,  and
        modifies the data shown to the termcap interface to accom-
        modate termcap's limitation in this respect.

PORTABILITY

-       The  XSI  Curses  standard,  Issue 4 describes these func-
-       tions.  However, they are marked TO BE WITHDRAWN  and  may
+       The XSI Curses standard, Issue  4  describes  these  func-
+       tions.   However,  they are marked TO BE WITHDRAWN and may
        be removed in future versions.
 
-       Neither  the  XSI  Curses  standard nor the SVr4 man pages
-       documented the return values of tgetent correctly,  though
-       all  three were in fact returned ever since SVr1.  In par-
-       ticular, an omission in the XSI Curses  documentation  has
-       been  misinterpreted  to  mean  that tgetent returns OK or
+       Neither the XSI Curses standard nor  the  SVr4  man  pages
+       documented  the return values of tgetent correctly, though
+       all three were in fact returned ever since SVr1.  In  par-
+       ticular,  an  omission in the XSI Curses documentation has
+       been misinterpreted to mean that  tgetent  returns  OK  or
        ERR.  Because the purpose of these functions is to provide
-       compatibility  with  the termcap library, that is a defect
+       compatibility with the termcap library, that is  a  defect
        in XCurses, Issue 4, Version 2 rather than in ncurses.
 
-       External variables are provided  for  support  of  certain
-       termcap  applications.  However, termcap applications' use
+       External  variables  are  provided  for support of certain
+       termcap applications.  However, termcap applications'  use
        of those variables is poorly documented, e.g., not distin-
-       guishing  between  input  and output.  In particular, some
+       guishing between input and output.   In  particular,  some
        applications are reported to declare and/or modify ospeed.
 
 
diff --git a/doc/html/man/curs_threads.3x.html b/doc/html/man/curs_threads.3x.html
index 6a3ce0da..f2ee9b74 100644
--- a/doc/html/man/curs_threads.3x.html
+++ b/doc/html/man/curs_threads.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_threads.3x,v 1.13 2010/07/31 16:10:55 tom Exp @
+  * @Id: curs_threads.3x,v 1.16 2010/09/18 20:25:32 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
 -->
@@ -56,83 +56,86 @@
 
SYNOPSIS
        #include <curses.h>
 
-       typedef  int (*NCURSES_WINDOW_CB)(WINDOW *, void *); type-
-       def int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
+       typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
+       typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
+       int get_escdelay(void);
        int set_escdelay(int size);
        int set_tabsize(int size);
-       int use_screen(SCREEN *scr, NCURSES_WINDOW_CB  func,  void
+       int  use_screen(SCREEN  *scr, NCURSES_WINDOW_CB func, void
        *data);
-       int  use_window(WINDOW  *win, NCURSES_SCREEN_CB func, void
+       int use_window(WINDOW *win, NCURSES_SCREEN_CB  func,  void
        *data);
 
 
 

 
DESCRIPTION
-       This implementation can be configured to provide  rudimen-
-       tary  support for multi-threaded applications.  This makes
-       a different set of libraries, e.g., libncursest since  the
+       This  implementation can be configured to provide rudimen-
+       tary support for multi-threaded applications.  This  makes
+       a  different set of libraries, e.g., libncursest since the
        binary interfaces are different.
 
-       Rather  than modify the interfaces to pass a thread speci-
-       fier to each function, it adds a few functions  which  can
+       Rather than modify the interfaces to pass a thread  speci-
+       fier  to  each function, it adds a few functions which can
        be used in any configuration which hide the mutex's needed
-       to prevent concurrent use of  the  global  variables  when
+       to  prevent  concurrent  use  of the global variables when
        configured for threading.
 
-       In  addition  to  forcing  access to members of the WINDOW
-       structure to be via functions  (see  curs_opaque(3x)),  it
+       In addition to forcing access to  members  of  the  WINDOW
+       structure  to  be  via functions (see curs_opaque(3x)), it
        makes functions of the common global variables, e.g., COL-
-       ORS, COLOR_PAIRS, COLS, ESCDELAY, LINES,  TABSIZE  curscr,
-       newscr  and  ttytype.   Those  variables are maintained as
+       ORS,  COLOR_PAIRS,  COLS, ESCDELAY, LINES, TABSIZE curscr,
+       newscr and ttytype.  Those  variables  are  maintained  as
        read-only values, stored in the SCREEN structure.
 
-       Even this is not enough to make a thread-safe  application
-       using  curses.   A multi-threaded application would be ex-
-       pected to have threads updating separate  windows  (within
+       Even  this is not enough to make a thread-safe application
+       using curses.  A multi-threaded application would  be  ex-
+       pected  to  have threads updating separate windows (within
        the same device), or updating on separate screens (on dif-
-       ferent devices).  Also, a few of the global variables  are
-       considered  writable  by some applications.  The functions
+       ferent  devices).  Also, a few of the global variables are
+       considered writable by some applications.   The  functions
        described here address these special situations.
 
-       The ESCDELAY and TABSIZE global variables are modified  by
-       some  applications.   To modify them in any configuration,
-       use the  set_escdelay  or  set_tabsize  functions.   Other
+       The  ESCDELAY and TABSIZE global variables are modified by
+       some applications.  To modify them in  any  configuration,
+       use  the  set_escdelay  or  set_tabsize  functions.  Other
        global variables are not modifiable.
 
-       The  use_window  and  use_screen  functions provide coarse
+       The get_escdelay function returns the value for ESCDELAY.
+
+       The use_window and  use_screen  functions  provide  coarse
        granularity mutexes for their respective WINDOW and SCREEN
-       parameters,  and call a user-supplied function, passing it
-       a data parameter, and returning the value from  the  user-
+       parameters, and call a user-supplied function, passing  it
+       a  data  parameter, and returning the value from the user-
        supplied function to the application.
 
    USAGE
-       All  of  the ncurses library functions assume that the lo-
-       cale is not altered during operation.  In  addition,  they
+       All of the ncurses library functions assume that  the  lo-
+       cale  is  not altered during operation.  In addition, they
        use data which is maintained within a hierarchy of scopes.
 
-              -  global data, e.g., used in the low-level termin-
-                 fo or termcap interfaces.
+          o   global data, e.g., used in the  low-level  terminfo
+              or termcap interfaces.
 
-              -  terminal data, e.g., associated with a  call  to
-                 set_curterm.   The terminal data are initialized
-                 when screens are created.
+          o   terminal  data,  e.g.,  associated  with  a call to
+              set_curterm.  The  terminal  data  are  initialized
+              when screens are created.
 
-              -  screen data, e.g., associated  with  a  call  to
-                 newterm or initscr.
+          o   screen  data,  e.g.,  associated  with  a  call  to
+              newterm or initscr.
 
-              -  window  data,  e.g.,  associated  with a call to
-                 newwin or subwin.  Windows are  associated  with
-                 screens.   Pads  are  not necessarily associated
-                 with a particular screen.
+          o   window data, e.g., associated with a call to newwin
+              or  subwin.   Windows  are associated with screens.
+              Pads are not necessarily associated with a particu-
+              lar screen.
 
-                 Most curses applications operate on one or  more
-                 windows within a single screen.
+              Most  curses  applications  operate  on one or more
+              windows within a single screen.
 
-              -  reentrant, i.e., it uses only the data passed as
-                 parameters.
+          o   reentrant, i.e., it uses only the  data  passed  as
+              parameters.
 
        This table lists the scope of data used for each symbol in
-       the  ncurses  library  when  it  is  configured to support
+       the ncurses library  when  it  is  configured  to  support
        threading:
 
       Symbol                  Scope
@@ -178,10 +181,10 @@
       boolfnames              global (readonly)
       boolnames               global (readonly)
       border                  window (stdscr)
+
       border_set              window (stdscr)
       box                     window (stdscr)
       box_set                 window (stdscr)
-
       can_change_color        terminal
       cbreak                  screen
       chgat                   window (stdscr)
@@ -245,10 +248,10 @@
       has_key                 screen
       hline                   window (stdscr)
       hline_set               window (stdscr)
+
       idcok                   window
       idlok                   window
       immedok                 window
-
       in_wch                  window (stdscr)
       in_wchnstr              window (stdscr)
       in_wchstr               window (stdscr)
@@ -312,10 +315,10 @@
       mvaddstr                window (stdscr)
       mvaddwstr               window (stdscr)
       mvchgat                 window (stdscr)
+
       mvcur                   screen
       mvdelch                 window (stdscr)
       mvderwin                window (stdscr)
-
       mvget_wch               screen (input-operation)
       mvget_wstr              screen (input-operation)
       mvgetch                 screen (input-operation)
@@ -379,10 +382,10 @@
       mvwinsch                window
       mvwinsnstr              window
       mvwinsstr               window
+
       mvwinstr                window
       mvwinwstr               window
       mvwprintw               window
-
       mvwscanw                screen
       mvwvline                window
       mvwvline_set            window
@@ -446,10 +449,10 @@
       slk_attr_on             screen
       slk_attr_set            screen
       slk_attroff             screen
+
       slk_attron              screen
       slk_attrset             screen
       slk_clear               screen
-
       slk_color               screen
       slk_init                screen
       slk_label               screen
@@ -513,10 +516,10 @@
       wadd_wchnstr            window
       wadd_wchstr             window
       waddch                  window
+
       waddchnstr              window
       waddchstr               window
       waddnstr                window
-
       waddnwstr               window
       waddstr                 window
       waddwstr                window
@@ -580,10 +583,10 @@
       wprintw                 window
       wredrawln               window
       wrefresh                screen
+
       wresize                 window locks(windowlist)
       wscanw                  screen
       wscrl                   window
-
       wsetscrreg              window
       wstandend               window
       wstandout               window
@@ -608,9 +611,9 @@
 
 

 
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  ncurses  ex-
+       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 ncurses ex-
        tensions be conditioned using NCURSES_VERSION.
 
 
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index fcf95e1e..5b29a74a 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_util.3x,v 1.28 2010/07/31 16:10:55 tom Exp @
+  * @Id: curs_util.3x,v 1.30 2010/09/18 20:24:41 tom Exp @
 -->
 
 
@@ -76,173 +76,174 @@
        tributes.   Control characters are displayed in the ^X no-
        tation.  Printing characters are  displayed  as  is.   The
        corresponding  wunctrl  returns a printable representation
-       of a wide-character.
+       of a wide character.
 
        The keyname routine returns a character string correspond-
        ing to the key c:
 
-          -  Printable  characters  are  displayed as themselves,
-             e.g., a one-character string containing the key.
+          o   Printable  characters  are displayed as themselves,
+              e.g., a one-character string containing the key.
 
-          -  Control characters are displayed in the ^X notation.
+          o   Control characters are displayed in  the  ^X  nota-
+              tion.
 
-          -  DEL (character 127) is displayed as ^?.
+          o   DEL (character 127) is displayed as ^?.
 
-          -  Values above 128 are either meta characters (if  the
-             screen has not been initialized, or if meta has been
-             called with a TRUE parameter), shown in the M-X  no-
-             tation, or are displayed as themselves.  In the lat-
-             ter case, the values may not be printable; this fol-
-             lows the X/Open specification.
+          o   Values above 128 are either meta characters (if the
+              screen has not been initialized,  or  if  meta  has
+              been  called  with  a TRUE parameter), shown in the
+              M-X notation, or are displayed as  themselves.   In
+              the  latter  case, the values may not be printable;
+              this follows the X/Open specification.
 
-          -  Values  above  256  may be the names of the names of
-             function keys.
+          o   Values above 256 may be the names of the  names  of
+              function keys.
 
-          -  Otherwise (if there is no  corresponding  name)  the
-             function  returns  null, to denote an error.  X/Open
-             also lists an "UNKNOWN KEY" return value, which some
-             implementations return rather than null.
+          o   Otherwise  (if  there is no corresponding name) the
+              function returns null, to denote an error.   X/Open
+              also  lists  an  "UNKNOWN  KEY" return value, which
+              some implementations return rather than null.
 
        The corresponding key_name returns a character string cor-
-       responding to the wide-character value w.  The  two  func-
-       tions  do  not  return the same set of strings; the latter
+       responding  to  the wide-character value w.  The two func-
+       tions do not return the same set of  strings;  the  latter
        returns null where the former would display a meta charac-
        ter.
 
        The filter routine, if used, must be called before initscr
-       or newterm are called.  The effect is that,  during  those
-       calls,  LINES  is  set  to 1; the capabilities clear, cup,
-       cud, cud1, cuu1, cuu,  vpa  are  disabled;  and  the  home
+       or  newterm  are called.  The effect is that, during those
+       calls, LINES is set to 1;  the  capabilities  clear,  cup,
+       cud,  cud1,  cuu1,  cuu,  vpa  are  disabled; and the home
        string is set to the value of cr.
 
-       The  nofilter  routine  cancels  the effect of a preceding
-       filter call.  That  allows  the  caller  to  initialize  a
-       screen  on  a different device, using a different value of
-       $TERM.  The limitation arises because the  filter  routine
+       The nofilter routine cancels the  effect  of  a  preceding
+       filter  call.   That  allows  the  caller  to initialize a
+       screen on a different device, using a different  value  of
+       $TERM.   The  limitation arises because the filter routine
        modifies the in-memory copy of the terminal information.
 
-       The  use_env routine, if used, is called before initscr or
-       newterm are called.  When called with FALSE  as  an  argu-
-       ment,  the  values  of  lines and columns specified in the
-       terminfo database will be used, even if environment  vari-
-       ables  LINES  and COLUMNS (used by default) are set, or if
-       curses is running in a window (in which case  default  be-
-       havior  would  be to use the window size if LINES and COL-
-       UMNS are not set).  Note that  setting  LINES  or  COLUMNS
-       overrides  the  corresponding  size  which may be obtained
+       The use_env routine, if used, is called before initscr  or
+       newterm  are  called.   When called with FALSE as an argu-
+       ment, the values of lines and  columns  specified  in  the
+       terminfo  database will be used, even if environment vari-
+       ables LINES and COLUMNS (used by default) are set,  or  if
+       curses  is  running in a window (in which case default be-
+       havior would be to use the window size if LINES  and  COL-
+       UMNS  are  not  set).   Note that setting LINES or COLUMNS
+       overrides the corresponding size  which  may  be  obtained
        from the operating system.
 
-       The putwin routine writes all data associated with  window
+       The  putwin routine writes all data associated with window
        win into the file to which filep points.  This information
        can be later retrieved using the getwin function.
 
        The getwin routine reads window related data stored in the
-       file  by putwin.  The routine then creates and initializes
+       file by putwin.  The routine then creates and  initializes
        a new window using that data.  It returns a pointer to the
        new window.
 
-       The  delay_output  routine inserts an ms millisecond pause
-       in output.  This routine should not  be  used  extensively
-       because  padding  characters  are  used  rather than a CPU
-       pause.  If no padding character is  specified,  this  uses
+       The delay_output routine inserts an ms  millisecond  pause
+       in  output.   This  routine should not be used extensively
+       because padding characters are  used  rather  than  a  CPU
+       pause.   If  no  padding character is specified, this uses
        napms to perform the delay.
 
-       The  flushinp  routine  throws away any typeahead that has
-       been typed by the user and has not yet been  read  by  the
+       The flushinp routine throws away any  typeahead  that  has
+       been  typed  by  the user and has not yet been read by the
        program.
 
 
 

 
RETURN VALUE
-       Except  for  flushinp, routines that return an integer re-
-       turn ERR upon failure and OK (SVr4 specifies only "an  in-
+       Except for flushinp, routines that return an  integer  re-
+       turn  ERR upon failure and OK (SVr4 specifies only "an in-
        teger value other than ERR") upon successful completion.
 
        Routines that return pointers return NULL on error.
 
-       X/Open  does not define any error conditions.  In this im-
+       X/Open does not define any error conditions.  In this  im-
        plementation
 
           flushinp
-               returns an error if the terminal was not  initial-
+               returns  an error if the terminal was not initial-
                ized.
 
-          meta returns  an error if the terminal was not initial-
+          meta returns an error if the terminal was not  initial-
                ized.
 
           putwin
-               returns an error if the  associated  fwrite  calls
+               returns  an  error  if the associated fwrite calls
                return an error.
 
 
 

 
PORTABILITY
-       The  XSI  Curses  standard,  Issue 4 describes these func-
-       tions.  It states that unctrl and wunctrl  will  return  a
-       null  pointer if unsuccessful, but does not define any er-
+       The XSI Curses standard, Issue  4  describes  these  func-
+       tions.   It  states  that unctrl and wunctrl will return a
+       null pointer if unsuccessful, but does not define any  er-
        ror conditions.  This implementation checks for three cas-
        es:
 
-              -    the  parameter is a 7-bit US-ASCII code.  This
-                   is the case that X/Open Curses documented.
+          o   the parameter is a 7-bit US-ASCII  code.   This  is
+              the case that X/Open Curses documented.
 
-              -    the parameter is in the range 128-159, i.e., a
-                   C1  control  code.   If  use_legacy_coding has
-                   been called with a 2 parameter, unctrl returns
-                   the  parameter,  i.e.,  a one-character string
-                   with the parameter  as  the  first  character.
-                   Otherwise,  it  returns  ``~@'', ``~A'', etc.,
-                   analogous to ``^@'', ``^A'', C0 controls.
+          o   the  parameter  is in the range 128-159, i.e., a C1
+              control code.  If use_legacy_coding has been called
+              with  a  2 parameter, unctrl returns the parameter,
+              i.e., a one-character string with the parameter  as
+              the first character.  Otherwise, it returns ``~@'',
+              ``~A'', etc., analogous to ``^@'', ``^A'', C0  con-
+              trols.
 
-                   X/Open Curses does not document whether unctrl
-                   can  be  called  before  initializing  curses.
-                   This implementation permits that, and  returns
-                   the ``~@'', etc., values in that case.
+              X/Open  Curses does not document whether unctrl can
+              be called before initializing curses.  This  imple-
+              mentation  permits  that,  and  returns the ``~@'',
+              etc., values in that case.
 
-              -    parameter  values  outside the 0 to 255 range.
-                   unctrl returns a null pointer.
+          o   parameter values outside the 0 to 255 range.   unc-
+              trl returns a null pointer.
 
        The SVr4 documentation describes the action of filter only
-       in  the  vaguest  terms.   The description here is adapted
-       from the XSI Curses standard (which erroneously  fails  to
+       in the vaguest terms.  The  description  here  is  adapted
+       from  the  XSI Curses standard (which erroneously fails to
        describe the disabling of cuu).
 
-       The  strings returned by unctrl in this implementation are
-       determined at compile time, showing C1 controls  from  the
-       upper-128  codes with a `~' prefix rather than `^'.  Other
-       implementations have different conventions.  For  example,
-       they  may  show  both sets of control characters with `^',
-       and strip the parameter to 7 bits.  Or they may ignore  C1
-       controls  and  treat  all of the upper-128 codes as print-
+       The strings returned by unctrl in this implementation  are
+       determined  at  compile time, showing C1 controls from the
+       upper-128 codes with a `~' prefix rather than `^'.   Other
+       implementations  have different conventions.  For example,
+       they may show both sets of control  characters  with  `^',
+       and  strip the parameter to 7 bits.  Or they may ignore C1
+       controls and treat all of the upper-128  codes  as  print-
        able.  This implementation uses 8 bits but does not modify
        the string to reflect locale.  The use_legacy_coding func-
        tion allows the caller to change the output of unctrl.
 
-       Likewise, the meta function allows the  caller  to  change
-       the  output of keyname, i.e., it determines whether to use
-       the `M-' prefix for ``meta'' keys (codes in the range  128
+       Likewise,  the  meta  function allows the caller to change
+       the output of keyname, i.e., it determines whether to  use
+       the  `M-' prefix for ``meta'' keys (codes in the range 128
        to 255).  Both use_legacy_coding and meta succeed only af-
-       ter curses is initialized.  X/Open Curses does  not  docu-
-       ment  the  treatment  of  codes 128 to 159.  When treating
+       ter  curses  is initialized.  X/Open Curses does not docu-
+       ment the treatment of codes 128  to  159.   When  treating
        them as ``meta'' keys (or if keyname is called before ini-
-       tializing  curses),  this  implementation  returns strings
+       tializing curses),  this  implementation  returns  strings
        ``M-^@'', ``M-^A'', etc.
 
-       The keyname function may return the names of  user-defined
-       string  capabilities which are defined in the terminfo en-
-       try via the -x option of tic.  This  implementation  auto-
-       matically  assigns  at  run-time  keycodes to user-defined
-       strings which begin  with  "k".   The  keycodes  start  at
-       KEY_MAX,  but  are not guaranteed to be the same value for
-       different runs because user-defined codes are merged  from
-       all  terminal  descriptions  which  have been loaded.  The
-       use_extended_names function controls whether this data  is
-       loaded  when  the  terminal description is read by the li-
+       The  keyname function may return the names of user-defined
+       string capabilities which are defined in the terminfo  en-
+       try  via  the -x option of tic.  This implementation auto-
+       matically assigns at  run-time  keycodes  to  user-defined
+       strings  which  begin  with  "k".   The  keycodes start at
+       KEY_MAX, but are not guaranteed to be the same  value  for
+       different  runs because user-defined codes are merged from
+       all terminal descriptions which  have  been  loaded.   The
+       use_extended_names  function controls whether this data is
+       loaded when the terminal description is read  by  the  li-
        brary.
 
-       The nofilter routine is specific to ncurses.  It  was  not
-       supported  on  Version 7, BSD or System V implementations.
-       It is recommended that any code depending on  ncurses  ex-
+       The  nofilter  routine is specific to ncurses.  It was not
+       supported on Version 7, BSD or System  V  implementations.
+       It  is  recommended that any code depending on ncurses ex-
        tensions be conditioned using NCURSES_VERSION.
 
 
diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html
new file mode 100644
index 00000000..1241180b
--- /dev/null
+++ b/doc/html/man/curs_variables.3x.html
@@ -0,0 +1,164 @@
+
+
+
+
+curs_variables 3x
+
+
+
+
+
curs_variables 3x

+

+
+
+curs_variables(3x)                                   curs_variables(3x)
+
+
+
+
+

+
NAME
+       COLORS, COLOR_PAIRS, COLS, ESCDELAY, LINES, TABSIZE,
+       curscr, newscr, stdscr - curses global variables
+
+
+

+
SYNOPSIS
+       #include <curses.h>
+
+       int COLOR_PAIRS;
+       int COLORS;
+       int COLS;
+       int ESCDELAY;
+       int LINES;
+       int TABSIZE;
+       WINDOW * curscr;
+       WINDOW * newscr;
+       WINDOW * stdscr;
+
+
+

+
DESCRIPTION
+       This page summarizes variables provided by the curses  li-
+       brary.   A more complete description is given in the curs-
+       es(3x) manual page.
+
+       Depending on the configuration, these may be actual  vari-
+       ables,  or  macros  (see  curs_threads(3x))  which provide
+       read-only access to curses's state.  In either  case,  ap-
+       plications should treat them as read-only to avoid confus-
+       ing the library.
+
+   COLOR_PAIRS
+       After initializing curses, this variable contains the num-
+       ber of color pairs which the terminal can support.  Usual-
+       ly the number of color pairs  will  be  the  product  COL-
+       ORS*COLORS, however this is not always true:
+
+       o   a  few  terminals  use HLS colors, which do not follow
+           this rule
+
+       o   terminals supporting a large number of colors are lim-
+           ited  by  the number of color pairs that can be repre-
+           sented in a signed short value.
+
+   COLORS
+       After initializing curses, this variable contains the num-
+       ber of colors which the terminal can support.
+
+   COLS
+       After  initializing  curses,  this  variable  contains the
+       width of the screen, i.e., the number of columns.
+
+   ESCDELAY
+       This variable holds the number of milliseconds to wait af-
+       ter reading an escape character, to distinguish between an
+       individual escape character entered on the  keyboard  from
+       escape  sequences  sent  by cursor- and function-keys (see
+       curses(3x).
+
+   LINES
+       After initializing  curses,  this  variable  contains  the
+       height of the screen, i.e., the number of lines.
+
+   TABSIZE
+       This  variable  holds  the  number  of columns used by the
+       curses library when converting a tab character  to  spaces
+       as it adds the tab to a window (see curs_addch(3x).
+
+   The Current Screen
+       This implementation of curses uses a special window curscr
+       to record its updates to the terminal screen.
+
+   The New Screen
+       This implementation of curses uses a special window newscr
+       to  hold  updates  to  the terminal screen before applying
+       them to curscr.
+
+   The Standard Screen
+       Upon initializing curses, a default window called  stdscr,
+       which  is  the  size  of  the terminal screen, is created.
+       Many curses functions use this window.
+
+
+

+
NOTES
+       The   curses   library   is   initialized   using   either
+       initscr(3x), or newterm(3x).
+
+       If  curses  is  configured to use separate curses/terminfo
+       libraries, most of these variables reside  in  the  curses
+       library.
+
+
+

+
PORTABILITY
+       ESCDELAY  and TABSIZE are extensions, not provided in most
+       other implementations of curses.
+
+
+

+
SEE ALSO
+       curses(3x), curs_threads(3x), term_variables(3x),  termin-
+       fo(3x), terminfo(5).
+
+
+
+                                                     curs_variables(3x)
+

+

+

+Man(1) output converted with
+man2html
+

+
+
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 2f231712..fc78a90f 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -243,7 +243,7 @@
 
 

 
SEE ALSO
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
 
 
 
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index a66307f1..ddd90de7 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.18 2010/07/31 14:49:44 tom Exp @
+  * @Id: form_driver.3x,v 1.19 2010/09/18 20:23:02 tom Exp @
 -->
 
 
@@ -62,17 +62,17 @@
        input events to it through form_driver.  This routine  has
        three major input cases:
 
-       -  The  input  is  a  form navigation request.  Navigation
-          request codes are constants defined in <form.h>,  which
-          are distinct from the key- and character codes returned
-          by wgetch.
+       o   The  input  is  a form navigation request.  Navigation
+           request codes are constants defined in <form.h>, which
+           are   distinct  from  the  key-  and  character  codes
+           returned by wgetch.
 
-       -  The input is a printable character.  Printable  charac-
-          ters  (which  must  be  positive,  less  than  256) are
-          checked according to the program's locale settings.
+       o   The input is a printable character.  Printable charac-
+           ters  (which  must  be  positive,  less  than 256) are
+           checked according to the program's locale settings.
 
-       -  The input is the KEY_MOUSE special key associated  with
-          an mouse event.
+       o   The input is the KEY_MOUSE special key associated with
+           an mouse event.
 
        The form driver requests are as follows:
 
@@ -267,47 +267,46 @@
 
        If you click above the display region of the form:
 
-              a REQ_PREV_FIELD is generated for a single click,
+          a REQ_PREV_FIELD is generated for a single click,
 
-              a REQ_PREV_PAGE is generated for a double-click and
+          a REQ_PREV_PAGE is generated for a double-click and
 
-              a REQ_FIRST_FIELD is generated for a triple-click.
+          a REQ_FIRST_FIELD is generated for a triple-click.
 
        If you click below the display region of the form:
 
-              a REQ_NEXT_FIELD is generated for a single click,
+          a REQ_NEXT_FIELD is generated for a single click,
 
-              a REQ_NEXT_PAGE is generated for a double-click and
+          a REQ_NEXT_PAGE is generated for a double-click and
 
-              a REQ_LAST_FIELD is generated for a triple-click.
+          a REQ_LAST_FIELD is generated for a triple-click.
 
        If you click at an field inside the display  area  of  the
        form:
 
-              -  the form cursor is positioned to that field.
+          o   the form cursor is positioned to that field.
 
-              -  If  you double-click a field, the form cursor is
-                 positioned to that field  and  E_UNKNOWN_COMMAND
-                 is  returned.   This  return  value makes sense,
-                 because a double click  usually  means  that  an
-                 field-specific action should be returned.  It is
-                 exactly the purpose of this return value to sig-
-                 nal  that an application specific command should
-                 be executed.
+          o   If  you  double-click  a  field, the form cursor is
+              positioned to that field and  E_UNKNOWN_COMMAND  is
+              returned.  This return value makes sense, because a
+              double click usually means that  an  field-specific
+              action  should be returned.  It is exactly the pur-
+              pose of this return value to signal that an  appli-
+              cation specific command should be executed.
 
-              -  If  a  translation  into  a  request  was  done,
-                 form_driver returns the result of this request.
+          o   If   a   translation   into  a  request  was  done,
+              form_driver returns the result of this request.
 
-       If  you clicked outside the user window or the mouse event
-       could  not  be  translated  into   a   form   request   an
+       If you clicked outside the user window or the mouse  event
+       could   not   be   translated   into  a  form  request  an
        E_REQUEST_DENIED is returned.
 
    APPLICATION-DEFINED COMMANDS
        If the second argument is neither printable nor one of the
-       above pre-defined form requests, the driver assumes it  is
+       above  pre-defined form requests, the driver assumes it is
        an application-specific command and returns E_UNKNOWN_COM-
        MAND.  Application-defined commands should be defined rel-
-       ative  to  MAX_COMMAND,  the  maximum  value of these pre-
+       ative to MAX_COMMAND, the  maximum  value  of  these  pre-
        defined requests.
 
 
@@ -318,7 +317,7 @@
        E_OK The routine succeeded.
 
        E_BAD_ARGUMENT
-            Routine detected an incorrect or  out-of-range  argu-
+            Routine  detected  an incorrect or out-of-range argu-
             ment.
 
        E_BAD_STATE
@@ -354,13 +353,13 @@
 
 

 
PORTABILITY
-       These  routines  emulate the System V forms library.  They
+       These routines emulate the System V forms  library.   They
        were not supported on Version 7 or BSD versions.
 
 
 

 
AUTHORS
-       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/form_field_buffer.3x.html b/doc/html/man/form_field_buffer.3x.html
index 995f4620..9f0f7c13 100644
--- a/doc/html/man/form_field_buffer.3x.html
+++ b/doc/html/man/form_field_buffer.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_field_buffer.3x,v 1.16 2010/07/31 16:09:36 tom Exp @
+  * @Id: form_field_buffer.3x,v 1.18 2010/09/18 20:22:01 tom Exp @
 -->
 
 
@@ -54,6 +54,7 @@
 

 
SYNOPSIS
        #include <form.h>
+
        int  set_field_buffer(FIELD  *field,  int  buf, const char
        *value);
        char *field_buffer(const FIELD *field, int buffer);
@@ -67,39 +68,39 @@
        The function set_field_buffer sets the numbered buffer  of
        the given field to contain a given string:
 
-          -  Buffer 0 is the displayed value of the field.
+          o   Buffer 0 is the displayed value of the field.
 
-          -  Other  numbered buffers may be allocated by applica-
-             tions   through   the   nbuf   argument   of    (see
-             form_field_new(3x))  but  are not manipulated by the
-             forms library.
+          o   Other numbered buffers may be allocated by applica-
+              tions   through   the   nbuf   argument   of   (see
+              form_field_new(3x))  but are not manipulated by the
+              forms library.
 
        The function field_buffer returns a pointer  to  the  con-
        tents of the given numbered buffer:
 
-          -  The buffer contents always have the same length, and
-             are padded with trailing spaces as needed to  ensure
-             this length is the same.
+          o   The  buffer  contents  always have the same length,
+              and are padded with trailing spaces  as  needed  to
+              ensure this length is the same.
 
-          -  The  buffer may contain leading spaces, depending on
-             how it was set.
+          o   The buffer may contain leading spaces, depending on
+              how it was set.
 
-          -  The buffer contents are set  with  set_field_buffer,
-             or as a side effect of any editing operations on the
-             corresponding field.
+          o   The buffer contents are set with  set_field_buffer,
+              or  as  a  side effect of any editing operations on
+              the corresponding field.
 
-          -  Editing operations are based  on  the  window  which
-             displays  the field, rather than a string.  The win-
-             dow  contains  only  printable  characters,  and  is
-             filled  with  blanks.  If you want the raw data, you
-             must write your own routine that  copies  the  value
-             out of the buffer and removes the leading and trail-
-             ing spaces.
+          o   Editing operations are based on  the  window  which
+              displays the field, rather than a string.  The win-
+              dow contains  only  printable  characters,  and  is
+              filled  with blanks.  If you want the raw data, you
+              must write your own routine that copies  the  value
+              out  of  the  buffer  and  removes  the leading and
+              trailing spaces.
 
-          -  Because editing operations change the content of the
-             buffer  to  correspond to the window, you should not
-             rely on using buffers for long-term storage of  form
-             data.
+          o   Because editing operations change  the  content  of
+              the  buffer to correspond to the window, you should
+              not rely on using buffers for long-term storage  of
+              form data.
 
        The  function  set_field_status sets the associated status
        flag of field; field_status gets the current  value.   The
@@ -147,7 +148,7 @@
        The header file <form.h> automatically includes the header
        file
 
-       When  configured for wide-characters, field_buffer returns
+       When  configured for wide characters, field_buffer returns
        a pointer to temporary storage (allocated and freed by the
        library).   The  application  should not attempt to modify
        the data.  It will be freed on the next call to field_buf-
diff --git a/doc/html/man/form_variables.3x.html b/doc/html/man/form_variables.3x.html
new file mode 100644
index 00000000..dfece78e
--- /dev/null
+++ b/doc/html/man/form_variables.3x.html
@@ -0,0 +1,117 @@
+
+
+
+
+form_variables 3x
+
+
+
+
+
form_variables 3x

+

+
+
+form_variables(3x)                                   form_variables(3x)
+
+
+
+
+

+
NAME
+       TYPE_ALNUM TYPE_ALPHA TYPE_ENUM TYPE_INTEGER TYPE_IPV4
+       TYPE_NUMERIC TYPE_REGEXP - form system global variables
+
+
+

+
SYNOPSIS
+       #include <form.h>
+
+       FIELDTYPE * TYPE_ALNUM;
+       FIELDTYPE * TYPE_ALPHA;
+       FIELDTYPE * TYPE_ENUM;
+       FIELDTYPE * TYPE_INTEGER;
+       FIELDTYPE * TYPE_IPV4;
+       FIELDTYPE * TYPE_NUMERIC;
+       FIELDTYPE * TYPE_REGEXP;
+
+
+

+
DESCRIPTION
+       These are building blocks for the form  library,  defining
+       fields  that can be created using set_fieldtype(3x).  Each
+       provides functions for  field-  and  character-validation,
+       according to the given datatype.
+
+   TYPE_ALNUM
+       This holds alphanumeric data.
+
+   TYPE_ALPHA
+       This holds alphabetic data.
+
+   TYPE_ENUM
+       This holds an enumerated type.
+
+   TYPE_INTEGER
+       This holds a decimal integer.
+
+   TYPE_IPV4
+       This holds an IPv4 internet address, e.g., "127.0.0.1".
+
+   TYPE_NUMERIC
+       This  holds a decimal number, with optional sign and deci-
+       mal point.
+
+   TYPE_REGEXP
+       This holds a regular expression.
+
+
+

+
PORTABILITY
+       The TYPE_IPV4 variable is an  extension  not  provided  by
+       older implementations of the form library.
+
+
+

+
SEE ALSO
+       form(3x).
+
+
+
+                                                     form_variables(3x)
+

+

+

+Man(1) output converted with
+man2html
+

+
+
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 033b5044..df8d2cad 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -423,7 +423,7 @@
        captoinfo(1m),    infotocap(1m),     tic(1m),     toe(1m),
        curses(3x), terminfo(5).
 
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
 
 
 

diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 3908d3de..865f057f 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: infotocap.1m,v 1.9 2010/07/31 16:08:48 tom Exp @
+  * @Id: infotocap.1m,v 1.10 2010/08/28 19:40:02 tom Exp @
 -->
 
 
@@ -59,18 +59,19 @@

DESCRIPTION

-       infotocap looks in file for  terminfo  descriptions.   For
-       each one found, an equivalent termcap description is writ-
-       ten to standard output.   Terminfo  use  capabilities  are
-       translated directly to termcap tc capabilities.
+       infotocap looks in  each  given  text  file  for  terminfo
+       descriptions.   For  each  terminfo  description found, an
+       equivalent termcap description is written to standard out-
+       put.  Terminfo use capabilities are translated directly to
+       termcap tc capabilities.
 
-       -v   print  out  tracing  information on standard error as
+       -v   print out tracing information on  standard  error  as
             the program runs.
 
-       -V   print out the version of the program in use on  stan-
+       -V   print  out the version of the program in use on stan-
             dard error and exit.
 
-       -1   cause  the fields to print out one to a line.  Other-
+       -1   cause the fields to print out one to a line.   Other-
             wise, the fields will be printed several to a line to
             a maximum width of 60 characters.
 
@@ -85,7 +86,7 @@

NOTES

-       This utility is actually a link  to  tic,  running  in  -C
+       This  utility  is  actually  a  link to tic, running in -C
        mode.  You can use other tic options such as -f and  -x.
 
 
@@ -93,7 +94,13 @@
 
SEE ALSO
        curses(3x), tic(1m), infocmp(1m), terminfo(5)
 
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
+
+
+

+
AUTHOR
+       Eric S. Raymond <esr@snark.thyrsus.com> and
+       Thomas E. Dickey <dickey@invisible-island.net>
 
 
 
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index ba30aa57..bd65d2f5 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -226,7 +226,7 @@
 
 

 
SEE ALSO
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
 
 
 
diff --git a/doc/html/man/menu_driver.3x.html b/doc/html/man/menu_driver.3x.html
index 3fd2da9e..c5d00225 100644
--- a/doc/html/man/menu_driver.3x.html
+++ b/doc/html/man/menu_driver.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: menu_driver.3x,v 1.17 2010/07/31 15:16:18 tom Exp @
+  * @Id: menu_driver.3x,v 1.18 2010/09/18 20:20:39 tom Exp @
 -->
 
 
@@ -62,17 +62,17 @@
        input events to it through menu_driver.  This routine  has
        three major input cases:
 
-       -  The  input  is  a  form navigation request.  Navigation
-          request codes are constants defined in <form.h>,  which
-          are distinct from the key- and character codes returned
-          by wgetch.
+       o   The  input  is  a form navigation request.  Navigation
+           request codes are constants defined in <form.h>, which
+           are   distinct  from  the  key-  and  character  codes
+           returned by wgetch.
 
-       -  The input is a printable character.  Printable  charac-
-          ters  (which  must  be  positive,  less  than  256) are
-          checked according to the program's locale settings.
+       o   The input is a printable character.  Printable charac-
+           ters  (which  must  be  positive,  less  than 256) are
+           checked according to the program's locale settings.
 
-       -  The input is the KEY_MOUSE special key associated  with
-          an mouse event.
+       o   The input is the KEY_MOUSE special key associated with
+           an mouse event.
 
        The menu driver requests are as follows:
 
@@ -146,35 +146,35 @@
 
        If you click above the display region of the menu:
 
-              a REQ_SCR_ULINE is generated for a single click,
+       o   a REQ_SCR_ULINE is generated for a single click,
 
-              a REQ_SCR_UPAGE is generated for a double-click and
+       o   a REQ_SCR_UPAGE is generated for a double-click and
 
-              a REQ_FIRST_ITEM is generated for a triple-click.
+       o   a REQ_FIRST_ITEM is generated for a triple-click.
 
        If you click below the display region of the menu:
 
-              a REQ_SCR_DLINE is generated for a single click,
+       o   a REQ_SCR_DLINE is generated for a single click,
 
-              a REQ_SCR_DPAGE is generated for a double-click and
+       o   a REQ_SCR_DPAGE is generated for a double-click and
 
-              a REQ_LAST_ITEM is generated for a triple-click.
+       o   a REQ_LAST_ITEM is generated for a triple-click.
 
        If  you  click  at  an item inside the display area of the
        menu:
 
-              -  the menu cursor is positioned to that item.
+       o   the menu cursor is positioned to that item.
 
-              -  If you double-click an item a REQ_TOGGLE_ITEM is
-                 generated  and  E_UNKNOWN_COMMAND  is  returned.
-                 This return value makes sense, because a  double
-                 click usually means that an item-specific action
-                 should be returned.  It is exactly  the  purpose
-                 of  this return value to signal that an applica-
-                 tion specific command should be executed.
+       o   If you double-click an item a REQ_TOGGLE_ITEM is  gen-
+           erated and E_UNKNOWN_COMMAND is returned.  This return
+           value makes sense,  because  a  double  click  usually
+           means that an item-specific action should be returned.
+           It is exactly the purpose of this return value to sig-
+           nal  that  an  application  specific command should be
+           executed.
 
-              -  If  a  translation  into  a  request  was  done,
-                 menu_driver returns the result of this request.
+       o   If a translation into a request was done,  menu_driver
+           returns the result of this request.
 
        If  you clicked outside the user window or the mouse event
        could  not  be  translated  into   a   menu   request   an
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index a68bd8d7..7aaa61b4 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: ncurses.3x,v 1.96 2010/07/31 15:55:04 tom Exp @
+  * @Id: ncurses.3x,v 1.98 2010/09/18 20:17:20 tom Exp @
 -->
 
 
@@ -63,7 +63,7 @@
        sonable   optimization.    This  implementation  is  ``new
        curses'' (ncurses) and is  the  approved  replacement  for
        4.4BSD  classic curses, which has been discontinued.  This
-       describes ncurses version 5.7 (patch 20100731).
+       describes ncurses version 5.7 (patch 20100918).
 
        The ncurses library emulates the curses library of  System
        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
@@ -262,7 +262,7 @@
 
               ncursesw
                    the  so-called  "wide"  library, which handles
-                   multibyte  characters  (See  the  section   on
+                   multibyte  characters  (see  the  section   on
                    ALTERNATE CONFIGURATIONS).  The "wide" library
                    includes all of the calls  from  the  "normal"
                    library.   It  adds about one third more calls
@@ -1001,18 +1001,18 @@
             not the only way to change the list  of  directories.
             The complete list of directories in order follows:
 
-            -  the last directory to which ncurses wrote, if any,
-               is searched first
+            o   the  last  directory  to  which ncurses wrote, if
+                any, is searched first
 
-            -  the directory specified by the TERMINFO symbol
+            o   the directory specified by the TERMINFO symbol
 
-            -  $HOME/.terminfo
+            o   $HOME/.terminfo
 
-            -  directories listed in the TERMINFO_DIRS symbol
+            o   directories listed in the TERMINFO_DIRS symbol
 
-            -  one or more directories whose names are configured
-               and  compiled  into  the  ncurses  library,  e.g.,
-               /usr/share/terminfo
+            o   one or more directories whose names  are  config-
+                ured and compiled into the ncurses library, e.g.,
+                /usr/share/terminfo
 
        TERMINFO_DIRS
             Specifies a list of directories to search for  termi-
diff --git a/doc/html/man/ncurses5-config.1.html b/doc/html/man/ncurses5-config.1.html
index c07c8f6d..02026dca 100644
--- a/doc/html/man/ncurses5-config.1.html
+++ b/doc/html/man/ncurses5-config.1.html
@@ -118,7 +118,7 @@
 
SEE ALSO
        curses(3x)
 
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index ded22994..55967718 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -218,7 +218,7 @@
 
SEE ALSO
        curses(3x)
 
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
 
 
 

diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 21b58dc2..e8ff5b97 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -156,7 +156,7 @@
 
SEE ALSO
        tset(1), infocmp(1m), curses(3x), terminfo(5).
 
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
 
 
 
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
new file mode 100644
index 00000000..3a867313
--- /dev/null
+++ b/doc/html/man/term_variables.3x.html
@@ -0,0 +1,165 @@
+
+
+
+
+term_variables 3x
+
+
+
+
+
term_variables 3x

+

+
+
+term_variables(3x)                                   term_variables(3x)
+
+
+
+
+

+
NAME
+       SP, acs_map, boolcodes, boolfnames, boolnames, cur_term,
+       numcodes, numfnames, numnames, strcodes, strfnames,
+       strnames, ttytype - curses terminfo global variables
+
+
+

+
SYNOPSIS
+       #include <curses.h>
+       #include <term.h>
+
+       chtype acs_map[];
+       NCURSES_CONST char * const * boolcodes;
+       NCURSES_CONST char * const * boolfnames;
+       NCURSES_CONST char * const * boolnames;
+       TERMINAL * cur_term;
+       NCURSES_CONST char * const * numcodes;
+       NCURSES_CONST char * const * numfnames;
+       NCURSES_CONST char * const * numnames;
+       NCURSES_CONST char * const * strcodes;
+       NCURSES_CONST char * const * strfnames;
+       NCURSES_CONST char * const * strnames;
+       char ttytype[];
+
+
+

+
DESCRIPTION
+       This  page summarizes variables provided by the curses li-
+       brary's low-level terminfo interface.  A more complete de-
+       scription is given in the curs_terminfo(3x) manual page.
+
+       Depending  on the configuration, these may be actual vari-
+       ables, or  macros  (see  curs_threads(3x))  which  provide
+       read-only  access  to curses's state.  In either case, ap-
+       plications should treat them as read-only to avoid confus-
+       ing the library.
+
+   Alternate Character Set Mapping
+       After  initializing the curses or terminfo interfaces, the
+       acs_map array holds information used  to  translate  cells
+       with  the  A_ALTCHARSET  video attribute into line-drawing
+       characters.
+
+       The encoding of the information in this array has  changed
+       periodically.   Application developers need only know that
+       it is used for the "ACS_" constants in <curses.h>.
+
+       The comparable data for the wide-character  library  is  a
+       private variable.
+
+   Current Terminal Data
+       After  initializing the curses or terminfo interfaces, the
+       cur_term contains data describing  the  current  terminal.
+       This variable is also set as a side-effect of set_term(3x)
+       and delscreen(3x).
+
+       It is possible to save a value of cur_term for  subsequent
+       use  as  a  parameter  to  set_term, for switching between
+       screens.  Alternatively, one can  save  the  return  value
+       from newterm or setupterm to reuse in set_term.
+
+   Terminfo Names
+       The  tic(1)  and infocmp(1) programs use lookup tables for
+       the long and short names of terminfo capabilities, as well
+       as  the  corresponding  names  for  termcap  capabilities.
+       These are available  to  other  applications,  though  the
+       hash-tables are not available.
+
+       The  long  terminfo  capability  names  use a "l" (ell) in
+       their names: boolfnames numfnames strfnames
+
+       These are the short names for terminfo capabilities: bool-
+       names, numnames, and strnames.
+
+       These  are  the  corresponding  names used for termcap de-
+       scriptions: boolcodes, numcodes, and strcodes.
+
+   Terminal Type
+       On initialization of the curses  or  terminfo  interfaces,
+       setupterm copies the terminal name to the array ttytype.
+
+
+

+
NOTES
+       The  low-level terminfo interface is initialized using se-
+       tupterm(3x).  The upper-level curses  interface  uses  the
+       low-level terminfo interface, internally.
+
+
+

+
PORTABILITY
+       X/Open  Curses  does  not describe any of these except for
+       cur_term.  (The inclusion of cur_term  appears  to  be  an
+       oversight, since other comparable low-level information is
+       omitted by X/Open).
+
+       Other implementations may have comparable variables.  Some
+       implementations  provide the variables in their libraries,
+       but omit them from the header files.
+
+
+

+
SEE ALSO
+       curses(3x), curs_terminfo(3x),  curs_threads(3x),  termin-
+       fo(3x), terminfo(5).
+
+
+
+                                                     term_variables(3x)
+

+

+

+Man(1) output converted with
+man2html
+

+
+
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index f8c93d32..48850ad7 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -78,7 +78,7 @@
        nals by giving a set of capabilities which they  have,  by
        specifying how to perform screen operations, and by speci-
        fying padding requirements and  initialization  sequences.
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
 
        Entries in terminfo consist of a sequence of `,' separated
        fields (embedded commas may be escaped with a backslash or
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 3e9f69bb..a082b6ee 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tic.1m,v 1.45 2010/07/31 16:08:48 tom Exp @
+  * @Id: tic.1m,v 1.46 2010/08/28 19:41:09 tom Exp @
 -->
 
 
@@ -309,7 +309,13 @@
        infocmp(1m),    captoinfo(1m),   infotocap(1m),   toe(1m),
        curses(3x), terminfo(5).
 
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
+
+
+

+
AUTHOR
+       Eric S. Raymond <esr@snark.thyrsus.com> and
+       Thomas E. Dickey <dickey@invisible-island.net>
 
 
 
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index a2e3d3e5..eb0979ff 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -111,7 +111,7 @@
        tic(1m),    infocmp(1m),   captoinfo(1m),   infotocap(1m),
        curses(3x), terminfo(5).
 
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index b4519f45..b6bae384 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -327,7 +327,7 @@
 
SEE ALSO
        clear(1), stty(1), tabs(1), terminfo(5).
 
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 45494818..2b9b74b4 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -319,7 +319,7 @@
        csh(1), sh(1), stty(1),  curs_terminfo(3x),  tty(4),  ter-
        minfo(5), ttys(5), environ(7)
 
-       This describes ncurses version 5.7 (patch 20100731).
+       This describes ncurses version 5.7 (patch 20100918).
 
 
 
diff --git a/doc/html/man/wresize.3x.html b/doc/html/man/wresize.3x.html
index 170c2d63..4287e621 100644
--- a/doc/html/man/wresize.3x.html
+++ b/doc/html/man/wresize.3x.html
@@ -28,7 +28,7 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1996
-  * @Id: wresize.3x,v 1.11 2010/07/31 15:30:32 tom Exp @
+  * @Id: wresize.3x,v 1.12 2010/08/14 23:12:04 Tim.van.der.Molen Exp @
 -->
 
 
@@ -60,12 +60,12 @@
 
 

 
DESCRIPTION
-       The  wresize  function  reallocates storage for an ncurses
-       window to adjust its dimensions to the  specified  values.
-       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  wbkgdset) merged into
-       them.
+       This  is  an  extension to the curses library.  It reallo-
+       cates storage for an ncurses window to adjust  its  dimen-
+       sions  to  the  specified  values.  If either dimension is
+       larger than the  current  values,  the  window's  data  is
+       filled with blanks that have the current background rendi-
+       tion (as set by wbkgdset) merged into them.
 
 
 

diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index d55be634..8d5d640a 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -26,8 +26,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.8 2010/08/14 23:29:16 tom Exp $
+.\" $Id: curs_add_wch.3x,v 1.9 2010/09/18 20:18:34 tom Exp $
 .TH curs_add_wch 3X ""
+.de bP
+.IP \(bu 4
+..
 .SH NAME
 \fBadd_wch\fP,
 \fBwadd_wch\fP,
@@ -63,23 +66,20 @@ window at its current position,
 which is then advanced.
 These functions perform
 wrapping and special-character processing as follows:
-.TP 5
-\-
+.bP
 If \fIwch\fP refers to a spacing character,
 then any previous character at that location is removed.
 A new character specified by \fIwch\fP is
 placed at that location with rendition specified by \fIwch\fP.
 The cursor then advances to
 the next spacing character on the screen.
-.TP 5
-\-
+.bP
 If \fIwch\fP refers to a non-spacing character,
 all previous characters at that location are preserved.
 The non-spacing characters of \fIwch\fP
 are added to the spacing complex character,
 and the rendition specified by \fIwch\fP is ignored.
-.TP 5
-\-
+.bP
 If the character part of \fIwch\fP is
 a tab, newline, backspace or other control character,
 the window is updated and the cursor moves as if \fBaddch\fR were called.
diff --git a/man/curs_color.3x b/man/curs_color.3x
index a1107d71..64689a29 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -26,8 +26,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.31 2010/08/14 23:11:23 Tim.van.der.Molen Exp $
+.\" $Id: curs_color.3x,v 1.32 2010/09/18 20:27:38 tom Exp $
 .TH curs_color 3X ""
+.de bP
+.IP \(bu 4
+..
 .na
 .hy 0
 .SH NAME
@@ -43,7 +46,7 @@
 .hy
 .SH SYNOPSIS
 \fB# include \fR
-.br
+.sp
 \fBint start_color(void);\fR
 .br
 \fBint init_pair(short pair, short f, short b);\fR
@@ -93,15 +96,13 @@ The \fBinit_pair\fR routine changes the definition of a color-pair.  It takes
 three arguments: the number of the color-pair to be changed, the foreground
 color number, and the background color number.
 For portable applications:
-.TP 5
-\-
+.bP
 The value of the first argument
 must be between \fB1\fR and \fBCOLOR_PAIRS\-1\fR,
 except that if default colors are used (see \fBuse_default_colors\fP)
 the upper limit is adjusted to allow for extra pairs which use
 a default color in foreground and/or background.
-.TP 5
-\-
+.bP
 The value of the second and
 third arguments must be between 0 and \fBCOLORS\fR.
 Color pair 0 is assumed to be white on black,
@@ -185,7 +186,7 @@ An error is returned from all functions
 if the terminal has not been initialized.
 An error is returned from secondary functions such as \fBinit_pair\fP
 if \fBstart_color\fP was not called.
-.RS
+.RS 3
 .TP 5
 \fBinit_color\fP
 returns an error if the terminal does not support
@@ -208,18 +209,15 @@ the background color used when parts of a window are blanked by erasing or
 scrolling operations, see \fBcurs_bkgd\fR(3X).
 .PP
 Several caveats apply on 386 and 486 machines with VGA-compatible graphics:
-.TP 5
-\-
+.bP
 COLOR_YELLOW is actually brown.  To get yellow, use COLOR_YELLOW combined with
 the \fBA_BOLD\fR attribute.
-.TP 5
-\-
+.bP
 The A_BLINK attribute should in theory cause the background to go bright.  This
 often fails to work, and even some cards for which it mostly works (such as the
 Paradise and compatibles) do the wrong thing when you try to set a bright
 "yellow" background (you get a blinking yellow foreground instead).
-.TP 5
-\-
+.bP
 Color RGB values are not settable.
 .SH PORTABILITY
 This implementation satisfies XSI Curses's minimum maximums
diff --git a/man/curs_getcchar.3x b/man/curs_getcchar.3x
index 8085c952..f6ac298c 100644
--- a/man/curs_getcchar.3x
+++ b/man/curs_getcchar.3x
@@ -26,8 +26,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getcchar.3x,v 1.13 2010/07/31 16:12:01 tom Exp $
+.\" $Id: curs_getcchar.3x,v 1.14 2010/09/18 20:26:21 tom Exp $
 .TH curs_getcchar 3X ""
+.de bP
+.IP \(bu 4
+..
 .SH NAME
 \fBgetcchar\fP,
 \fBsetcchar\fP \- Get a wide character string and rendition from a \fBcchar_t\fP or set a \fBcchar_t\fP from a wide-character string
@@ -63,17 +66,13 @@ The \fBgetcchar\fP function gets a wide-character string
 and rendition from a \fBcchar_t\fP argument.
 When \fIwch\fP is not a null pointer,
 the \fBgetcchar\fP function does the following:
-.TP 5
-\-
+.bP
 Extracts information from a \fBcchar_t\fP value \fIwcval\fP
-.TP 5
-\-
+.bP
 Stores the character attributes in the location pointed to by \fIattrs\fP
-.TP 5
-\-
+.bP
 Stores the color-pair in the location pointed to by \fIcolor_pair\fP
-.TP 5
-\-
+.bP
 Stores the wide-character string,
 characters referenced by \fIwcval\fP, into the array pointed to by \fIwch\fP.
 .PP
@@ -82,11 +81,9 @@ When
 is a null pointer, the
 \fBgetcchar\fP
 function does the following:
-.TP 5
-\-
+.bP
 Obtains the number of wide characters pointed to by \fIwcval\fP
-.TP 5
-\-
+.bP
 Does not change the data referenced by
 \fIattrs\fP
 or
@@ -94,16 +91,13 @@ or
 .PP
 The \fBsetcchar\fP function initializes the location pointed to by \fIwcval\fP
 by using:
-.TP 5
-\-
+.bP
 The character attributes in
 \fIattrs\fP
-.TP 5
-\-
+.bP
 The color pair in
 \fIcolor_pair\fP
-.TP 5
-\-
+.bP
 The wide-character string pointed to by \fIwch\fP.
 The string must be L'\\0' terminated,
 contain at most one spacing character,
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index 3fb8a27e..786fe701 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -26,10 +26,10 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.3 2010/09/11 22:21:52 tom Exp $
+.\" $Id: curs_legacy.3x,v 1.4 2010/09/18 22:31:47 tom Exp $
 .TH curs_legacy 3X ""
 .SH NAME
-get \fBcurses\fR cursor and window coordinates, attributes
+getattrs \- get \fBcurses\fR cursor and window coordinates, attributes
 .SH SYNOPSIS
 \fB#include \fR
 .sp
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index ffc6f4e0..efcc4f35 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.19 2010/09/11 22:35:11 tom Exp $
+.\" $Id: curs_slk.3x,v 1.20 2010/09/18 22:38:29 tom Exp $
 .TH curs_slk 3X ""
 .na
 .hy 0
@@ -79,15 +79,13 @@
 .br
 \fBint slk_attr_off(const attr_t attrs, void * opts);\fR
 .br
-\fBint slk_attr_set(const attr_t attrs,\fR
-.br
-	\fBshort color_pair_number, void* opts);\fR
+\fBint slk_attr_set(const attr_t attrs, short color_pair, void* opts);\fR
 .br
 \fBattr_t slk_attr(void);\fR
 .br
-\fBint slk_color(short color_pair_number);\fR
+\fBint slk_color(short color_pair);\fR
 .br
-\fBint slk_wset (int labnum, const wchar_t *label, int fmt);\fR
+\fBint slk_wset(int labnum, const wchar_t *label, int fmt);\fR
 .br
 .SH DESCRIPTION
 The slk* functions manipulate the set of soft function-key labels that exist on
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
new file mode 100644
index 00000000..6e02af29
--- /dev/null
+++ b/man/curs_sp_funcs.3x
@@ -0,0 +1,359 @@
+.\"***************************************************************************
+.\" Copyright (c) 2010 Free Software Foundation, Inc.                        *
+.\"                                                                          *
+.\" Permission is hereby granted, free of charge, to any person obtaining a  *
+.\" copy of this software and associated documentation files (the            *
+.\" "Software"), to deal in the Software without restriction, including      *
+.\" without limitation the rights to use, copy, modify, merge, publish,      *
+.\" distribute, distribute with modifications, sublicense, and/or sell       *
+.\" copies of the Software, and to permit persons to whom the Software is    *
+.\" furnished to do so, subject to the following conditions:                 *
+.\"                                                                          *
+.\" The above copyright notice and this permission notice shall be included  *
+.\" in all copies or substantial portions of the Software.                   *
+.\"                                                                          *
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+.\"                                                                          *
+.\" Except as contained in this notice, the name(s) of the above copyright   *
+.\" holders shall not be used in advertising or otherwise to promote the     *
+.\" sale, use or other dealings in this Software without prior written       *
+.\" authorization.                                                           *
+.\"***************************************************************************
+.\"
+.\" $Id: curs_sp_funcs.3x,v 1.4 2010/09/18 20:07:36 tom Exp $
+.TH curs_sp_funcs 3X ""
+.na
+.hy 0
+.SH NAME
+new_prescr \- \fBcurses\fR screen-pointer extension
+.ad
+.hy
+.SH SYNOPSIS
+\fB#include \fR
+.nf
+.sp
+\fBint assume_default_colors_sp(SCREEN*, int, int);\fR
+.br
+\fBint baudrate_sp(SCREEN*);\fR
+.br
+\fBint beep_sp(SCREEN*);\fR
+.br
+\fBbool can_change_color_sp(SCREEN*);\fR
+.br
+\fBint cbreak_sp(SCREEN*);\fR
+.br
+\fBint color_content_sp(SCREEN*, short, short*, short*, short*);\fR
+.br
+\fBint curs_set_sp(SCREEN*, int);\fR
+.br
+\fBint define_key_sp(SCREEN*, const char *, int);\fR
+.br
+\fBint def_prog_mode_sp(SCREEN*);\fR
+.br
+\fBint def_shell_mode_sp(SCREEN*);\fR
+.br
+\fBint delay_output_sp(SCREEN*, int);\fR
+.br
+\fBint doupdate_sp(SCREEN*);\fR
+.br
+\fBint echo_sp(SCREEN*);\fR
+.br
+\fBint endwin_sp(SCREEN*);\fR
+.br
+\fBint erasechar_sp(SCREEN*);\fR
+.br
+\fBint filter_sp(SCREEN*);\fR
+.br
+\fBint flash_sp(SCREEN*);\fR
+.br
+\fBint flushinp_sp(SCREEN*);\fR
+.br
+\fBint get_escdelay_sp(SCREEN*);\fR
+.br
+\fBint getmouse_sp(SCREEN*, MEVENT*);\fR
+.br
+\fBWINDOW* getwin_sp(SCREEN*, FILE*);\fR
+.br
+\fBint halfdelay_sp(SCREEN*);\fR
+.br
+\fBbool has_colors_sp(SCREEN*);\fR
+.br
+\fBbool has_ic_sp(SCREEN*);\fR
+.br
+\fBbool has_il_sp(SCREEN*);\fR
+.br
+\fBint has_key_sp(SCREEN*, int);\fR
+.br
+\fBbool has_mouse_sp(SCREEN*);\fR
+.br
+\fBint init_color_sp(SCREEN*, short, short, short, short);\fR
+.br
+\fBint init_pair_sp(SCREEN*, short, short, short);\fR
+.br
+\fBint intrflush_sp(SCREEN*, WINDOW*, bool);\fR
+.br
+\fBbool isendwin_sp(SCREEN*);\fR
+.br
+\fBbool is_term_resized_sp(SCREEN*, int, int);\fR
+.br
+\fBchar* keybound_sp(SCREEN*, int, int);\fR
+.br
+\fBint key_defined_sp(SCREEN*, const char *);\fR
+.br
+\fBNCURSES_CONST char * keyname_sp(SCREEN*, int);\fR
+.br
+\fBint keyok_sp(SCREEN*, int, bool);\fR
+.br
+\fBchar killchar_sp(SCREEN*);\fR
+.br
+\fBint mcprint_sp(SCREEN*, char *, int);\fR
+.br
+\fBint mouseinterval_sp(SCREEN*, int);\fR
+.br
+\fBmmask_t mousemask_sp(SCREEN*, mmask_t, mmask_t *);\fR
+.br
+\fBint mvcur_sp(SCREEN*, int, int, int, int);\fR
+.br
+\fBint napms_sp(SCREEN*, int);\fR
+.br
+\fBWINDOW* newpad_sp(SCREEN*, int, int);\fR
+.br
+\fBSCREEN* new_prescr(void);\fR
+.br
+\fBSCREEN* newterm_sp(SCREEN*, NCURSES_CONST char *, FILE *, FILE *);\fR
+.br
+\fBWINDOW* newwin_sp(SCREEN*, int, int, int, int);\fR
+.br
+\fBint nl_sp(SCREEN*);\fR
+.br
+\fBint nocbreak_sp(SCREEN*);\fR
+.br
+\fBint noecho_sp(SCREEN*);\fR
+.br
+\fBint nofilter_sp(SCREEN*);\fR
+.br
+\fBint nonl_sp(SCREEN*);\fR
+.br
+\fBvoid noqiflush_sp(SCREEN*);\fR
+.br
+\fBint noraw_sp(SCREEN*);\fR
+.br
+\fBint pair_content_sp(SCREEN*, short, short*, short*);\fR
+.br
+\fBvoid qiflush_sp(SCREEN*);\fR
+.br
+\fBint raw_sp(SCREEN*);\fR
+.br
+\fBint reset_prog_mode_sp(SCREEN*);\fR
+.br
+\fBint reset_shell_mode_sp(SCREEN*);\fR
+.br
+\fBint resetty_sp(SCREEN*);\fR
+.br
+\fBint resize_term_sp(SCREEN*, int, int);\fR
+.br
+\fBint resizeterm_sp(SCREEN*, int, int);\fR
+.br
+\fBint restartterm_sp(SCREEN*, NCURSES_CONST char*, int, int *);\fR
+.br
+\fBint ripoffline_sp(SCREEN*, int, int (*)(WINDOW*, int));\fR
+.br
+\fBint savetty_sp(SCREEN*);\fR
+.br
+\fBint scr_init_sp(SCREEN*, const char *);\fR
+.br
+\fBint scr_restore_sp(SCREEN*, const char *);\fR
+.br
+\fBint scr_set_sp(SCREEN*, const char *);\fR
+.br
+\fBTERMINAL* set_curterm_sp(SCREEN*, TERMINAL*);\fR
+.br
+\fBint set_escdelay_sp(SCREEN*, int);\fR
+.br
+\fBint set_tabsize_sp(SCREEN*, int);\fR
+.br
+\fBint slk_attroff_sp(SCREEN*, const chtype);\fR
+.br
+\fBint slk_attron_sp(SCREEN*, const chtype);\fR
+.br
+\fBint slk_attr_set_sp(SCREEN*, const attr_t, short, void*);\fR
+.br
+\fBint slk_attrset_sp(SCREEN*, const chtype);\fR
+.br
+\fBint slk_attr_sp((SCREEN*);\fR
+.br
+\fBint slk_clear_sp(SCREEN*);\fR
+.br
+\fBint slk_color_sp(SCREEN*, short);\fR
+.br
+\fBint slk_init_sp(SCREEN*, int);\fR
+.br
+\fBint slk_label_sp(SCREEN*, int);\fR
+.br
+\fBint slk_noutrefresh_sp(SCREEN*);\fR
+.br
+\fBint slk_refresh_sp(SCREEN*);\fR
+.br
+\fBint slk_restore_sp(SCREEN*);\fR
+.br
+\fBint slk_set_sp(SCREEN*, int, const char *, int);\fR
+.br
+\fBint slk_touch_sp(SCREEN*);\fR
+.br
+\fBint start_color_sp(SCREEN*);\fR
+.br
+\fBattr_t term_attrs_sp(SCREEN*);\fR
+.br
+\fBchtype termattrs_sp(SCREEN*);\fR
+.br
+\fBchar* termname_sp(SCREEN*);\fR
+.br
+\fBint typeahead_sp(SCREEN*, int);\fR
+.br
+\fBNCURSES_CONST char* unctrl_sp(SCREEN*, chtype);\fR
+.br
+\fBint ungetch_sp(SCREEN*, int);\fR
+.br
+\fBint ungetmouse_sp(SCREEN*,MEVENT *);\fR
+.br
+\fBint unget_wch_sp(SCREEN*, const wchar_t);\fR
+.br
+\fBint use_default_colors_sp(SCREEN*);\fR
+.br
+\fBvoid use_env_sp(SCREEN*, bool);\fR
+.br
+\fBint use_legacy_coding_sp(SCREEN*, int);\fR
+.br
+\fBint vid_attr_sp(SCREEN*, attr_t, short, void *);\fR
+.br
+\fBint vidattr_sp(SCREEN*, chtype);\fR
+.br
+\fBint vid_puts_sp(SCREEN*, attr_t, short, void *, NCURSES_SP_OUTC);\fR
+.br
+\fBint vidputs_sp(SCREEN*, chtype, NCURSES_SP_OUTC);\fR
+.br
+\fBwchar_t* wunctrl_sp(SCREEN*, cchar_t *);\fR
+.sp
+\fB#include \fR
+.sp
+\fBint new_form_sp(SCREEN*, FIELD **);\fR
+.sp
+\fB#include \fR
+.sp
+\fBint new_menu_sp(SCREEN*, ITEM **);\fR
+.sp
+\fB#include \fR
+.sp
+\fBint ceiling_panel(SCREEN*);\fR
+.br
+\fBPANEL* ground_panel(SCREEN*);\fR
+.br
+\fBint update_panels_sp(SCREEN*);\fR
+.sp
+\fB#include \fR
+.sp
+\fBint del_curterm_sp(SCREEN*, TERMINAL *);\fR
+.br
+\fBint putp_sp(SCREEN*, const char *);\fR
+.br
+\fBint tgetflag_sp(SCREEN*, char *, const char *);\fR
+.br
+\fBint tgetent_sp(SCREEN*, char *, const char *);\fR
+.br
+\fBint tgetnum_sp(SCREEN*, NCURSES_CONST char *);\fR
+.br
+\fBchar* tgetstr_sp(SCREEN*, NCURSES_CONST char *, char **);\fR
+.br
+\fBint tigetflag_sp(SCREEN*, NCURSES_CONST char *);\fR
+.br
+\fBint tigetnum_sp(SCREEN*, NCURSES_CONST char *);\fR
+.br
+\fBchar* tigetstr_sp(SCREEN*, NCURSES_CONST char *);\fR
+.br
+\fBint tputs_sp(SCREEN*, const char *, int, NCURSES_SP_OUTC);\fR
+.ad
+.br
+.SH DESCRIPTION
+This implementation can be configured to provide a set of functions which
+improve the ability to manage multiple screens.
+This feature can be added to any of the configurations supported by ncurses;
+it adds new entrypoints
+without changing the meaning of any of the existing ones.
+.PP
+.\" ***************************************************************************
+.SS IMPROVED FUNCTIONS
+Most of the functions are new versions of existing functions.
+A parameter is added at the front of the parameter list.
+It is a SCREEN pointer.
+.PP
+The existing functions all use the current screen,
+which is a static variable.
+The extended functions use the specified screen,
+thereby reducing the number of variables which must be modified
+to update multiple screens.
+.\" ***************************************************************************
+.SS NEW FUNCTIONS
+Here are the new functions:
+.TP 5
+ceiling_panel
+this returns a pointer to the topmost panel in the given screen.
+.TP 5
+ground_panel
+this returns a pointer to the lowest panel in the given screen.
+.TP 5
+new_prescr
+when creating a new screen, the library uses static variables which
+have been preset, e.g., by \fBuse_env\fP(3X), \fBfilter\fP(3X), etc.
+With the screen-pointer extension,
+there are situations where it must create a current screen before
+the unextended library does.
+The \fBnew_prescr\fP function is used internally to handle these cases.
+It is also provided as an entrypoint to allow applications to customize
+the library initialization.
+.\" ***************************************************************************
+.SH NOTES
+This extension introduces some new names:
+.TP 5
+NCURSES_SP_FUNCS
+This is set to the library patch-level number.
+In the unextended library, this is zero (0),
+to make it useful for checking if the extension is provided.
+.TP 5
+NCURSES_SP_NAME
+The new functions are named using the macro \fINCURSES_SP_NAME\fP,
+which hides the actual implementation.
+Currently this adds a "_sp" suffix to the name of the unextended function.
+This manual page indexes the extensions showing the full name.
+However the proper usage of these functions uses the macro,
+to provide for the possibility of changing the naming convention
+for specific library configurations.
+.TP 5
+NCURSES_SP_OUTC
+This is a new function-pointer type to use in the screen-pointer functions
+where an \fINCURSES_OUTC\fP is used in the unextended library.
+.TP 5
+NCURSES_OUTC
+This is a function-pointer type used for the cases where a function passes
+characters to the output stream, e.g., \fBvidputs\fP(3X).
+.PP
+.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 ncurses extensions
+be conditioned using \fINCURSES_SP_FUNCS\fP.
+.SH SEE ALSO
+\fBcurses\fR(3X),
+\fBcurs_opaque\fR(3X),
+\fBcurs_threads\fR(3X).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index 24e24938..74882087 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -26,8 +26,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.15 2010/09/11 22:17:11 tom Exp $
+.\" $Id: curs_threads.3x,v 1.16 2010/09/18 20:25:32 tom Exp $
 .TH curs_threads 3X ""
+.de bP
+.IP \(bu 4
+..
 .na
 .hy 0
 .SH NAME
@@ -105,26 +108,21 @@ All of the ncurses library functions assume that the locale is not
 altered during operation.
 In addition,
 they use data which is maintained within a hierarchy of scopes.
-.RS
-.TP 3
-\-
+.RS 3
+.bP
 global data, e.g., used in the low-level terminfo or termcap interfaces.
-.TP 3
-\-
+.bP
 terminal data, e.g., associated with a call to \fIset_curterm\fP.
 The terminal data are initialized when screens are created.
-.TP 3
-\-
+.bP
 screen data, e.g., associated with a call to \fInewterm\fP or \fIinitscr\fP.
-.TP 3
-\-
+.bP
 window data, e.g., associated with a call to \fInewwin\fP or \fIsubwin\fP.
 Windows are associated with screens.
 Pads are not necessarily associated with a particular screen.
 .IP
 Most curses applications operate on one or more windows within a single screen.
-.TP 3
-\-
+.bP
 reentrant, i.e., it uses only the data passed as parameters.
 .RE
 .PP
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 5e141e66..28e0f2b1 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -26,8 +26,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.29 2010/09/11 18:13:16 Jason.McIntyre Exp $
+.\" $Id: curs_util.3x,v 1.30 2010/09/18 20:24:41 tom Exp $
 .TH curs_util 3X ""
+.de bP
+.IP \(bu 4
+..
 .na
 .hy 0
 .SH NAME
@@ -79,17 +82,13 @@ a wide character.
 .PP
 The \fBkeyname\fR routine returns a character string corresponding to the key \fIc\fR:
 .RS 3
-.TP 3
-\-
+.bP
 Printable characters are displayed as themselves, e.g., a one-character string containing the key.
-.TP 3
-\-
+.bP
 Control characters are displayed in the \fB^\fR\fIX\fR notation.
-.TP 3
-\-
+.bP
 DEL (character 127) is displayed as \fB^?\fP.
-.TP 3
-\-
+.bP
 Values above 128 are either meta characters
 (if the screen has not been initialized,
 or if \fBmeta\fP has been called with a TRUE parameter),
@@ -97,11 +96,9 @@ shown in the \fBM\-\fR\fIX\fR notation,
 or are displayed as themselves.
 In the latter case, the values may not be printable;
 this follows the X/Open specification.
-.TP 3
-\-
+.bP
 Values above 256 may be the names of the names of function keys.
-.TP 3
-\-
+.bP
 Otherwise (if there is no corresponding name) the function returns null,
 to denote an error.
 X/Open also lists an "UNKNOWN KEY" return value, which some implementations
@@ -177,13 +174,11 @@ The XSI Curses standard, Issue 4 describes these functions.
 It states that \fBunctrl\fR and \fBwunctrl\fR will return a null pointer if
 unsuccessful, but does not define any error conditions.
 This implementation checks for three cases:
-.RS
-.TP 5
-\-
+.RS 3
+.bP
 the parameter is a 7-bit US\-ASCII code.
 This is the case that X/Open Curses documented.
-.TP 5
-\-
+.bP
 the parameter is in the range 128\-159, i.e., a C1 control code.
 If \fBuse_legacy_coding\fP has been called with a \fB2\fP parameter,
 \fBunctrl\fP returns the parameter, i.e., a one-character string with
@@ -194,8 +189,7 @@ X/Open Curses does not document whether \fBunctrl\fP can be called before
 initializing curses.
 This implementation permits that,
 and returns the ``~@'', etc., values in that case.
-.TP 5
-\-
+.bP
 parameter values outside the 0 to 255 range.
 \fBunctrl\fP returns a null pointer.
 .RE
diff --git a/man/form_driver.3x b/man/form_driver.3x
index 0e4567fb..486ea3c3 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -26,8 +26,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.18 2010/07/31 14:49:44 tom Exp $
+.\" $Id: form_driver.3x,v 1.19 2010/09/18 20:23:02 tom Exp $
 .TH form_driver 3X ""
+.de bP
+.IP \(bu 4
+..
 .SH NAME
 \fBform_driver\fR \- command-processing loop of the form system
 .SH SYNOPSIS
@@ -38,18 +41,15 @@ int form_driver(FORM *form, int c);
 .SH DESCRIPTION
 Once a form has been posted (displayed), you should funnel input events to it
 through \fBform_driver\fR.  This routine has three major input cases:
-.TP 3
-\-
+.bP
 The input is a form navigation request.
 Navigation request codes are constants defined in \fB\fP,
 which are distinct from the key- and character codes returned by \fBwgetch\fP.
-.TP 3
-\-
+.bP
 The input is a printable character.
 Printable characters (which must be positive, less than 256) are
 checked according to the program's locale settings.
-.TP 3
-\-
+.bP
 The input is the KEY_MOUSE special key associated with an mouse event.
 .PP
 The form driver requests are as follows:
@@ -242,7 +242,7 @@ Currently only clicks in the user window (e.g., inside the form display
 area or the decoration window) are handled.
 .PP
 If you click above the display region of the form:
-.RS
+.RS 3
 .TP
 a REQ_PREV_FIELD is generated for a single click,
 .TP
@@ -252,7 +252,7 @@ a REQ_FIRST_FIELD is generated for a triple-click.
 .RE
 .PP
 If you click below the display region of the form:
-.RS
+.RS 3
 .TP
 a REQ_NEXT_FIELD is generated for a single click,
 .TP
@@ -262,12 +262,10 @@ a REQ_LAST_FIELD is generated for a triple-click.
 .RE
 .PP
 If you click at an field inside the display area of the form:
-.RS
-.TP 3
-\-
+.RS 3
+.bP
 the form cursor is positioned to that field.
-.TP 3
-\-
+.bP
 If you double-click a field,
 the form cursor is positioned to that field
 and \fBE_UNKNOWN_COMMAND\fR is returned.
@@ -276,8 +274,7 @@ because a double click usually means that an field-specific action should
 be returned.
 It is exactly the purpose of this return value to signal that an
 application specific command should be executed.
-.TP 3
-\-
+.bP
 If a translation
 into a request was done, \fBform_driver\fR returns the result of this request.
 .RE
diff --git a/man/form_field_buffer.3x b/man/form_field_buffer.3x
index 9eea9982..48594731 100644
--- a/man/form_field_buffer.3x
+++ b/man/form_field_buffer.3x
@@ -27,13 +27,16 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_buffer.3x,v 1.17 2010/09/11 18:13:24 Jason.McIntyre Exp $
+.\" $Id: form_field_buffer.3x,v 1.18 2010/09/18 20:22:01 tom Exp $
 .TH form_field_buffer 3X ""
+.de bP
+.IP \(bu 4
+..
 .SH NAME
 \fBform_field_buffer\fR \- field buffer control
 .SH SYNOPSIS
 \fB#include \fR
-.br
+.sp
 int set_field_buffer(FIELD *field, int buf, const char *value);
 .br
 char *field_buffer(const FIELD *field, int buffer);
@@ -48,11 +51,9 @@ 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:
 .RS 3
-.TP 3
-\-
+.bP
 Buffer 0 is the displayed value of the field.
-.TP 3
-\-
+.bP
 Other numbered buffers may be allocated by applications through the \fBnbuf\fR
 argument of (see \fBform_field_new\fR(3X))
 but are not manipulated by the forms library.
@@ -61,28 +62,23 @@ but are not manipulated by the forms library.
 The function \fBfield_buffer\fR returns a pointer to
 the contents of the given numbered buffer:
 .RS 3
-.TP 3
-\-
+.bP
 The buffer contents always have the same length,
 and are padded with trailing spaces
 as needed to ensure this length is the same.
-.TP 3
-\-
+.bP
 The buffer may contain leading spaces, depending on how it was set.
-.TP 3
-\-
+.bP
 The buffer contents are set with \fBset_field_buffer\fP,
 or as a side effect of any editing operations on the corresponding field.
-.TP 3
-\-
+.bP
 Editing operations are based on the \fIwindow\fP which displays the field,
 rather than a \fIstring\fP.
 The window contains only printable characters, and is filled with blanks.
 If you want the raw data, you must write your
 own routine that copies the value out of the buffer and removes the leading
 and trailing spaces.
-.TP 3
-\-
+.bP
 Because editing operations change the content of the buffer to
 correspond to the window, you should not rely on using buffers
 for long-term storage of form data.
diff --git a/man/man_db.renames b/man/man_db.renames
index 9a2a1b62..e98fd69d 100644
--- a/man/man_db.renames
+++ b/man/man_db.renames
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames,v 1.46 2010/09/11 18:47:13 tom Exp $
+# $Id: man_db.renames,v 1.47 2010/09/18 15:43:20 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -82,6 +82,7 @@ curs_scanw.3x			scanw.3ncurses
 curs_scr_dump.3x		scr_dump.3ncurses
 curs_scroll.3x			scroll.3ncurses
 curs_slk.3x			slk.3ncurses
+curs_sp_funcs.3x		sp_funcs.3ncurses
 curs_termattrs.3x		termattrs.3ncurses
 curs_termcap.3x			termcap.3ncurses
 curs_terminfo.3x		terminfo.3ncurses
diff --git a/man/menu_driver.3x b/man/menu_driver.3x
index 349cd653..1f5f28dc 100644
--- a/man/menu_driver.3x
+++ b/man/menu_driver.3x
@@ -26,8 +26,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_driver.3x,v 1.17 2010/07/31 15:16:18 tom Exp $
+.\" $Id: menu_driver.3x,v 1.18 2010/09/18 20:20:39 tom Exp $
 .TH menu_driver 3X ""
+.de bP
+.IP \(bu 4
+..
 .SH NAME
 \fBmenu_driver\fR \- command-processing loop of the menu system
 .SH SYNOPSIS
@@ -38,18 +41,15 @@ int menu_driver(MENU *menu, int c);
 .SH DESCRIPTION
 Once a menu has been posted (displayed), you should funnel input events to it
 through \fBmenu_driver\fR.  This routine has three major input cases:
-.TP 3
-\-
+.bP
 The input is a form navigation request.
 Navigation request codes are constants defined in \fB\fP,
 which are distinct from the key- and character codes returned by \fBwgetch\fP.
-.TP 3
-\-
+.bP
 The input is a printable character.
 Printable characters (which must be positive, less than 256) are
 checked according to the program's locale settings.
-.TP 3
-\-
+.bP
 The input is the KEY_MOUSE special key associated with an mouse event.
 .PP
 The menu driver requests are as follows:
@@ -120,32 +120,25 @@ Currently only clicks in the user window (e.g., inside the menu display
 area or the decoration window) are handled.
 .PP
 If you click above the display region of the menu:
-.RS
-.TP
+.bP
 a REQ_SCR_ULINE is generated for a single click,
-.TP
+.bP
 a REQ_SCR_UPAGE is generated for a double-click and
-.TP
+.bP
 a REQ_FIRST_ITEM is generated for a triple-click.
-.RE
 .PP
 If you click below the display region of the menu:
-.RS
-.TP
+.bP
 a REQ_SCR_DLINE is generated for a single click,
-.TP
+.bP
 a REQ_SCR_DPAGE is generated for a double-click and
-.TP
+.bP
 a REQ_LAST_ITEM is generated for a triple-click.
-.RE
 .PP
 If you click at an item inside the display area of the menu:
-.RS
-.TP 3
-\-
+.bP
 the menu cursor is positioned to that item.
-.TP 3
-\-
+.bP
 If you double-click an item a REQ_TOGGLE_ITEM
 is generated and \fBE_UNKNOWN_COMMAND\fR is returned.
 This return value makes sense,
@@ -153,11 +146,9 @@ because a double click usually means that an item-specific action should
 be returned.
 It is exactly the purpose of this return value to signal that an
 application specific command should be executed.
-.TP 3
-\-
+.bP
 If a translation
 into a request was done, \fBmenu_driver\fR returns the result of this request.
-.RE
 .PP
 If you clicked outside the user window or the mouse event could not be translated
 into a menu request an \fBE_REQUEST_DENIED\fR is returned.
diff --git a/man/ncurses.3x b/man/ncurses.3x
index 374eb5bc..ba360e5c 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -27,9 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.97 2010/09/11 20:54:13 tom Exp $
+.\" $Id: ncurses.3x,v 1.98 2010/09/18 20:17:20 tom Exp $
 .hy 0
 .TH ncurses 3X ""
+.de bP
+.IP \(bu 4
+..
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
@@ -960,20 +963,15 @@ description.
 This is the simplest, but not the only way to change the list of directories.
 The complete list of directories in order follows:
 .RS
-.TP 3
-\-
+.bP
 the last directory to which \fBncurses\fR wrote, if any, is searched first
-.TP 3
-\-
+.bP
 the directory specified by the TERMINFO symbol
-.TP 3
-\-
+.bP
 $HOME/.terminfo
-.TP 3
-\-
+.bP
 directories listed in the TERMINFO_DIRS symbol
-.TP 3
-\-
+.bP
 one or more directories whose names are configured and compiled into the
 ncurses library, e.g.,
 @TERMINFO@
diff --git a/test/README b/test/README
index c698c74b..b2dae0e4 100644
--- a/test/README
+++ b/test/README
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: README,v 1.42 2010/09/11 22:00:58 tom Exp $
+-- $Id: README,v 1.43 2010/09/18 15:11:39 tom Exp $
 -------------------------------------------------------------------------------
 
 The programs in this directory are designed to test your newest toy :-)
@@ -110,6 +110,7 @@ move_field			-
 new_field			test: cardfile demo_forms ncurses
 new_fieldtype			test: ncurses
 new_form			test: cardfile demo_forms ncurses
+new_form_sp			-
 new_page			test: demo_forms
 pos_form_cursor			-
 post_form			test: cardfile demo_forms ncurses
@@ -179,6 +180,7 @@ menu_userptr			-
 menu_win			test: demo_menus ncurses
 new_item			test: demo_menus ncurses
 new_menu			test: demo_menus ncurses
+new_menu_sp			-
 pos_menu_cursor			lib: menu
 post_menu			test: demo_menus ncurses
 scale_menu			test: demo_menus ncurses
@@ -233,6 +235,7 @@ addnwstr			test: ncurses test_addwstr
 addstr				test: blue bs cardfile gdc hanoi lrtest ncurses savescreen test_addstr
 addwstr				test: ncurses test_addwstr
 assume_default_colors		test: ncurses
+assume_default_colors_sp	-
 attr_get			test: ncurses
 attr_off			test: ncurses
 attr_on				test: ncurses
@@ -241,7 +244,9 @@ attroff				test: echochar filter gdc ncurses tclock
 attron				test: bs echochar filter gdc ncurses
 attrset				test: bs firework gdc hanoi insdelln ncurses rain tclock testaddch testcurs
 baudrate			lib: ncurses
+baudrate_sp			lib: ncurses
 beep				test: blue bs cardfile chgat clip_printw demo_forms demo_menus demo_panels edit_field hanoi inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
+beep_sp				lib: ncurses
 bkgd				test: background cardfile demo_forms ncurses savescreen tclock view
 bkgdset				test: background ncurses testaddch
 bkgrnd				test: ncurses
@@ -254,42 +259,59 @@ border_set			-
 box				test: cardfile chgat clip_printw demo_forms demo_menus demo_panels ditto edit_field inch_wide inchs ins_wide insdelln inserts lrtest ncurses newdemo redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
 box_set				test: ncurses
 can_change_color		test: ncurses
+can_change_color_sp		-
 cbreak				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
+cbreak_sp			lib: ncurses
 chgat				test: chgat
 clear				test: blue bs gdc ncurses testcurs xmas
 clearok				test: bs knight
 clrtobot			test: demo_menus ncurses
 clrtoeol			test: blue bs demo_altkeys demo_menus foldkeys hanoi hashtest movewindow ncurses view
 color_content			test: ncurses
+color_content_sp		-
 color_set			test: color_set ncurses
 copywin				test: ncurses testcurs
 cur_term			test: demo_terminfo dots dots_mvcur lrtest progs: clear tabs tput tset
 curs_set			test: echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas
+curs_set_sp			lib: ncurses
 curscr				test: demo_panels edit_field knight lrtest ncurses savescreen tclock view
 curses_version			test: ncurses progs: infocmp tic toe tput tset
 def_prog_mode			test: bs ncurses
-def_shell_mode			lib: ncurses
+def_prog_mode_sp		lib: ncurses
+def_shell_mode			-
+def_shell_mode_sp		lib: ncurses
 define_key			test: demo_altkeys demo_defkey foldkeys
+define_key_sp			-
 del_curterm			lib: ncurses
+del_curterm_sp			lib: ncurses
 delay_output			test: newdemo
+delay_output_sp			-
 delch				-
 deleteln			test: insdelln
 delscreen			test: ditto dots_mvcur
 delwin				test: cardfile chgat clip_printw demo_forms demo_panels edit_field inch_wide inchs ins_wide insdelln inserts movewindow ncurses newdemo redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
 derwin				test: cardfile chgat clip_printw demo_forms demo_menus ditto inch_wide inchs ins_wide insdelln inserts movewindow ncurses test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque
 doupdate			test: cardfile demo_menus demo_panels ditto edit_field ins_wide inserts knight movewindow ncurses redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr
+doupdate_sp			lib: ncurses
 dupwin				test: edit_field
 echo				test: bs hanoi ncurses test_get_wstr test_getstr testcurs testscanw
+echo_sp				lib: ncurses
 echo_wchar			test: ncurses
 echochar			test: echochar ncurses
 endwin				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_mvcur echochar filter firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
+endwin_sp			lib: ncurses
 erase				test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses tclock test_opaque testcurs
 erasechar			lib: ncurses
+erasechar_sp			lib: ncurses
 erasewchar			-
 filter				test: filter
+filter_sp			-
 flash				test: cardfile lrtest ncurses tclock testcurs
+flash_sp			-
 flushinp			test: ncurses newdemo testcurs
+flushinp_sp			lib: ncurses
 get_escdelay			-
+get_escdelay_sp			-
 get_wch				-
 get_wstr			test: test_get_wstr
 getattrs			-
@@ -304,18 +326,26 @@ getcury				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels edit_
 getmaxx				test: chgat clip_printw demo_panels inch_wide inchs insdelln movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
 getmaxy				test: chgat clip_printw demo_forms demo_panels inch_wide inchs insdelln movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
 getmouse			test: bs knight movewindow ncurses
+getmouse_sp			-
 getn_wstr			test: test_get_wstr
 getnstr				test: filter ncurses test_getstr
 getparx				test: movewindow
 getpary				test: movewindow
 getstr				test: test_getstr
 getwin				test: ncurses
+getwin_sp			-
 halfdelay			test: view
+halfdelay_sp			-
 has_colors			test: background bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testcurs view worm xmas
+has_colors_sp			lib: ncurses
 has_ic				test: lrtest
-has_il				lib: ncurses
-has_key				lib: ncurses
+has_ic_sp			lib: ncurses
+has_il				-
+has_il_sp			lib: ncurses
+has_key				-
+has_key_sp			lib: ncurses
 has_mouse			-
+has_mouse_sp			-
 hline				test: gdc ncurses
 hline_set			-
 idcok				test: test_opaque
@@ -328,7 +358,9 @@ inch				test: inchs
 inchnstr			test: inchs
 inchstr				test: inchs
 init_color			test: ncurses
+init_color_sp			lib: ncurses
 init_pair			test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas
+init_pair_sp			-
 initscr				test: background blue bs cardfile chgat clip_printw color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar filter firework firstlast gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
 innstr				test: test_instr
 innwstr				test: test_inwstr
@@ -342,6 +374,7 @@ insnstr				test: inserts
 insstr				test: inserts
 instr				test: test_instr
 intrflush			test: demo_forms movewindow
+intrflush_sp			-
 inwstr				test: test_inwstr
 is_cleared			test: test_opaque
 is_idcok			test: test_opaque
@@ -357,23 +390,33 @@ is_scrollok			test: test_opaque
 is_subwin			-
 is_syncok			test: test_opaque
 is_term_resized			-
+is_term_resized_sp		-
 is_wintouched			lib: ncurses
 isendwin			-
+isendwin_sp			-
 key_defined			test: demo_defkey foldkeys
+key_defined_sp			lib: ncurses
 key_name			test: key_names ncurses
 keybound			test: demo_altkeys demo_defkey
+keybound_sp			lib: ncurses
 keyname				test: demo_altkeys demo_defkey demo_keyok demo_menus edit_field foldkeys keynames movewindow ncurses redraw testcurs view progs: tic
+keyname_sp			lib: ncurses
 keyok				test: demo_keyok foldkeys
+keyok_sp			lib: ncurses
 keypad				test: bs cardfile chgat clip_printw demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
 killchar			lib: ncurses
+killchar_sp			lib: ncurses
 killwchar			-
 leaveok				test: hanoi test_opaque
 longname			test: testcurs progs: tput
 mcprint				-
+mcprint_sp			-
 meta				test: key_names keynames ncurses
 mouse_trafo			-
 mouseinterval			-
+mouseinterval_sp		-
 mousemask			test: bs demo_forms demo_menus knight movewindow ncurses
+mousemask_sp			-
 move				test: blue bs cardfile chgat demo_altkeys demo_menus echochar foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testscanw view xmas
 mvadd_wch			test: ncurses test_add_wchstr test_addwstr
 mvadd_wchnstr			test: test_add_wchstr
@@ -387,6 +430,7 @@ mvaddstr			test: bs demo_forms gdc hanoi knight ncurses rain tclock test_addstr
 mvaddwstr			test: test_addwstr
 mvchgat				test: chgat
 mvcur				test: dots_mvcur redraw
+mvcur_sp			lib: ncurses
 mvdelch				-
 mvderwin			test: movewindow
 mvget_wch			-
@@ -459,18 +503,30 @@ mvwscanw			test: testcurs
 mvwvline			test: ins_wide inserts movewindow test_add_wchstr test_addchstr test_addstr test_addwstr
 mvwvline_set			-
 napms				test: demo_panels ditto dots dots_mvcur echochar firework gdc hanoi lrtest ncurses railroad rain tclock test_opaque testcurs view worm xmas progs: tset
+napms_sp			-
+new_prescr			lib: ncurses
 newpad				test: edit_field ncurses testcurs
+newpad_sp			lib: ncurses
 newscr				lib: ncurses
 newterm				test: demo_altkeys ditto dots_mvcur filter foldkeys gdc key_names keynames
+newterm_sp			-
 newwin				test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas
+newwin_sp			lib: ncurses
 nl				test: demo_forms ncurses rain testcurs
+nl_sp				lib: ncurses
 nocbreak			test: testcurs
+nocbreak_sp			lib: ncurses
 nodelay				test: ditto firework gdc lrtest ncurses newdemo rain tclock test_opaque view worm xmas
 noecho				test: background bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
+noecho_sp			lib: ncurses
 nofilter			-
+nofilter_sp			-
 nonl				test: bs demo_forms hashtest movewindow ncurses view worm xmas
+nonl_sp				lib: ncurses
 noqiflush			-
+noqiflush_sp			-
 noraw				test: demo_forms demo_menus ncurses testcurs
+noraw_sp			lib: ncurses
 notimeout			test: test_opaque
 numcodes			test: demo_termcap test_arrays progs: dump_entry
 numfnames			test: demo_terminfo test_arrays progs: dump_entry
@@ -479,36 +535,54 @@ ospeed				progs: tset
 overlay				test: ncurses testcurs xmas
 overwrite			test: ncurses savescreen
 pair_content			test: background color_set
+pair_content_sp			lib: ncurses
 pecho_wchar			-
 pechochar			-
 pnoutrefresh			test: edit_field ncurses
 prefresh			test: testcurs
 printw				test: background blue bs color_set demo_altkeys demo_defkey demo_keyok demo_menus filter foldkeys ncurses savescreen testcurs testscanw view
 putp				progs: tput
+putp_sp				lib: ncurses
 putwin				test: ncurses
 qiflush				-
+qiflush_sp			-
 raw				test: demo_forms ncurses redraw testcurs
+raw_sp				lib: ncurses
 redrawwin			test: redraw
 refresh				test: blue bs demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar filter firstlast gdc hanoi hashtest lrtest movewindow ncurses savescreen tclock testcurs view xmas
 reset_prog_mode			test: filter ncurses
+reset_prog_mode_sp		lib: ncurses
 reset_shell_mode		test: bs filter savescreen
+reset_shell_mode_sp		lib: ncurses
 resetty				-
+resetty_sp			-
 resize_term			test: view
-resizeterm			lib: ncurses
+resize_term_sp			-
+resizeterm			-
+resizeterm_sp			lib: ncurses
 restartterm			-
+restartterm_sp			-
 ripoffline			test: demo_menus ncurses
+ripoffline_sp			-
 savetty				-
+savetty_sp			-
 scanw				test: testcurs testscanw
 scr_dump			test: savescreen
 scr_init			test: savescreen
+scr_init_sp			-
 scr_restore			test: savescreen
+scr_restore_sp			-
 scr_set				test: savescreen
+scr_set_sp			-
 scrl				test: view
 scroll				test: testcurs
 scrollok			test: clip_printw demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view
 set_curterm			lib: ncurses
+set_curterm_sp			-
 set_escdelay			test: test_opaque
+set_escdelay_sp			lib: ncurses
 set_tabsize			test: test_opaque
+set_tabsize_sp			-
 set_term			lib: ncurses
 setcchar			test: demo_panels ins_wide ncurses test_add_wchstr test_addwstr view
 setscrreg			test: view
@@ -517,22 +591,37 @@ slk_attr			-
 slk_attr_off			-
 slk_attr_on			-
 slk_attr_set			test: ncurses
+slk_attr_set_sp			-
+slk_attr_sp			-
 slk_attroff			lib: ncurses
+slk_attroff_sp			-
 slk_attron			lib: ncurses
+slk_attron_sp			-
 slk_attrset			test: ncurses
+slk_attrset_sp			-
 slk_clear			test: ncurses
+slk_clear_sp			-
 slk_color			test: ncurses
+slk_color_sp			-
 slk_init			test: ncurses
+slk_init_sp			-
 slk_label			test: ncurses
+slk_label_sp			-
 slk_noutrefresh			test: ncurses
+slk_noutrefresh_sp		-
 slk_refresh			test: ncurses
+slk_refresh_sp			lib: ncurses
 slk_restore			test: ncurses
+slk_restore_sp			lib: ncurses
 slk_set				test: ncurses
+slk_set_sp			-
 slk_touch			test: ncurses
+slk_touch_sp			lib: ncurses
 slk_wset			test: ncurses
 standend			test: blue gdc ncurses
 standout			test: blue ncurses
 start_color			test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas
+start_color_sp			-
 stdscr				test: bs chgat clip_printw demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
 strcodes			test: demo_termcap test_arrays progs: dump_entry
 strfnames			test: demo_terminfo test_arrays progs: dump_entry
@@ -541,40 +630,63 @@ subpad				test: testcurs
 subwin				test: movewindow ncurses newdemo testcurs
 syncok				test: test_opaque
 term_attrs			test: ncurses
+term_attrs_sp			-
 termattrs			test: ncurses testcurs
+termattrs_sp			lib: ncurses
 termname			test: testcurs
+termname_sp			lib: ncurses
 tgetent				test: demo_termcap railroad
+tgetent_sp			-
 tgetflag			test: demo_termcap
+tgetflag_sp			-
 tgetnum				test: demo_termcap railroad
+tgetnum_sp			-
 tgetstr				test: demo_termcap railroad
+tgetstr_sp			-
 tgoto				test: railroad
 tigetflag			test: demo_terminfo progs: tput
+tigetflag_sp			-
 tigetnum			test: demo_terminfo ncurses progs: tput
+tigetnum_sp			-
 tigetstr			test: blue demo_defkey demo_terminfo foldkeys testcurs progs: tput
+tigetstr_sp			-
 timeout				test: rain savescreen
 tiparm				-
 touchline			test: chgat clip_printw insdelln
 touchwin			test: chgat clip_printw demo_menus edit_field filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
 tparm				test: dots dots_mvcur progs: tabs tic tput
 tputs				test: dots dots_mvcur railroad progs: clear tabs tset
+tputs_sp			lib: ncurses
 trace				test: demo_menus hanoi hashtest lrtest ncurses testcurs view worm
 ttytype				lib: ncurses
 typeahead			test: testcurs
+typeahead_sp			lib: ncurses
 unctrl				test: ncurses redraw testcurs
+unctrl_sp			lib: ncurses
 unget_wch			-
+unget_wch_sp			-
 ungetch				test: bs knight
+ungetch_sp			lib: ncurses
 ungetmouse			-
+ungetmouse_sp			-
 untouchwin			lib: form
 use_default_colors		test: filter firework gdc hanoi knight ncurses rain tclock worm xmas
+use_default_colors_sp		-
 use_env				progs: tput
+use_env_sp			-
 use_extended_names		test: demo_terminfo progs: infocmp tic
 use_legacy_coding		-
+use_legacy_coding_sp		-
 use_screen			test: ditto
 use_window			test: rain worm
 vid_attr			-
+vid_attr_sp			-
 vid_puts			-
-vidattr				lib: ncurses
-vidputs				lib: ncurses
+vid_puts_sp			-
+vidattr				-
+vidattr_sp			lib: ncurses
+vidputs				-
+vidputs_sp			lib: ncurses
 vline				test: gdc ncurses
 vline_set			-
 vw_printw			test: clip_printw
@@ -662,13 +774,16 @@ wsyncup				lib: form
 wtimeout			test: ncurses
 wtouchln			lib: ncurses
 wunctrl				lib: ncurses
+wunctrl_sp			-
 wvline				test: testcurs
 wvline_set			lib: ncurses
 
 libpanel:
 --------
 bottom_panel			test: demo_panels ncurses
+ceiling_panel			-
 del_panel			test: demo_panels ncurses
+ground_panel			-
 hide_panel			test: demo_panels ncurses
 move_panel			test: demo_panels ncurses
 new_panel			test: cardfile demo_panels ncurses
@@ -682,3 +797,4 @@ set_panel_userptr		test: demo_panels ncurses
 show_panel			test: demo_panels ncurses
 top_panel			test: cardfile demo_panels ncurses
 update_panels			test: cardfile demo_panels ncurses
+update_panels_sp		-
diff --git a/test/listused.sh b/test/listused.sh
index 525f712f..1c3fe0a6 100755
--- a/test/listused.sh
+++ b/test/listused.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
-# Copyright (c) 2003,2006 Free Software Foundation, Inc.                     #
+# Copyright (c) 2003-2006,2010 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -26,12 +26,13 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: listused.sh,v 1.7 2006/06/03 16:39:37 tom Exp $
-# A very simple script to list entrypoints that are used by either a test
+# $Id: listused.sh,v 1.8 2010/09/18 15:15:15 tom Exp $
+# A very simple script to list all entrypoints that are used by either a test
 # program, or within the libraries.  This relies on the output format of 'nm',
 # and assumes that the libraries are configured with TRACE defined, and using
 # these options:
 #	--disable-macros
+#	--enable-sp-funcs
 #	--enable-widec
 # Static libraries are used, to provide some filtering based on internal usage
 # of the different symbols.
-- 
2.44.0