From 82a087c4c47679fcfa59bb6d7bdbe587355ba3f6 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 4 Mar 2007 00:18:45 +0000 Subject: [PATCH] ncurses 5.6 - patch 20070303 + regenerated html documentation. + add NCURSES_OPAQUE symbol to curses.h, will use to make structs opaque in selected configurations. + move the chunk in lib_acs.c which resets acs capabilities when running on a terminal whose locale interferes with those into _nc_setupscreen(), so the libtinfo/libtinfow files can be made identical (requested by Miroslav Lichvar). + do not use configure variable SHLIB_LIBS for building libraries outside the ncurses directory, since that symbol is customized only for that directory, and using it introduces an unneeded dependency on libdl (requested by Miroslav Lichvar). + modify mk-1st.awk so the generated makefile rules for linking or installing shared libraries do not first remove the library, in case it is in use, e.g., libncurses.so by /bin/sh (report by Jeff Chua). + revised section "Using NCURSES under XTERM" in ncurses-intro.html (prompted by newsgroup comment by Nick Guenther). --- NEWS | 29 +++- c++/Makefile.in | 4 +- c++/cursesw.cc | 14 +- c++/cursesw.h | 11 +- dist.mk | 5 +- doc/hackguide.doc | 2 +- .../ada/terminal_interface-curses__ads.htm | 4 +- doc/html/man/captoinfo.1m.html | 14 +- doc/html/man/clear.1.html | 4 +- doc/html/man/curs_border.3x.html | 8 +- doc/html/man/curs_extend.3x.html | 4 +- doc/html/man/curs_mouse.3x.html | 127 +++++++++--------- doc/html/man/curs_terminfo.3x.html | 6 +- doc/html/man/curs_trace.3x.html | 6 +- doc/html/man/curs_util.3x.html | 6 +- doc/html/man/form.3x.html | 2 +- doc/html/man/form_field_opts.3x.html | 12 +- doc/html/man/form_hook.3x.html | 20 +-- doc/html/man/form_opts.3x.html | 12 +- doc/html/man/infocmp.1m.html | 4 +- doc/html/man/infotocap.1m.html | 6 +- doc/html/man/menu.3x.html | 2 +- doc/html/man/menu_hook.3x.html | 20 +-- doc/html/man/menu_opts.3x.html | 12 +- doc/html/man/mitem_opts.3x.html | 12 +- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/panel.3x.html | 2 +- doc/html/man/term.5.html | 4 +- doc/html/man/term.7.html | 2 +- doc/html/man/terminfo.5.html | 16 +-- doc/html/man/tic.1m.html | 4 +- doc/html/man/toe.1m.html | 4 +- doc/html/man/tput.1.html | 4 +- doc/html/man/tset.1.html | 2 +- doc/html/ncurses-intro.html | 32 +++-- doc/ncurses-intro.doc | 33 +++-- form/Makefile.in | 4 +- include/curses.h.in | 27 +++- include/curses.wide | 7 +- man/terminfo.head | 4 +- menu/Makefile.in | 4 +- misc/terminfo.src | 85 ++++++++++++ mk-1st.awk | 5 +- ncurses/base/lib_set_term.c | 13 +- ncurses/curses.priv.h | 5 +- ncurses/tinfo/lib_acs.c | 14 +- panel/Makefile.in | 4 +- test/ncurses.c | 4 +- 48 files changed, 388 insertions(+), 239 deletions(-) diff --git a/NEWS b/NEWS index ecd633cc..4e5c9185 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.1092 2007/02/25 00:45:56 tom Exp $ +-- $Id: NEWS,v 1.1096 2007/03/04 00:17:25 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,25 @@ 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. +20070303 + + regenerated html documentation. + + add NCURSES_OPAQUE symbol to curses.h, will use to make structs + opaque in selected configurations. + + move the chunk in lib_acs.c which resets acs capabilities when + running on a terminal whose locale interferes with those into + _nc_setupscreen(), so the libtinfo/libtinfow files can be made + identical (requested by Miroslav Lichvar). + + do not use configure variable SHLIB_LIBS for building libraries + outside the ncurses directory, since that symbol is customized + only for that directory, and using it introduces an unneeded + dependency on libdl (requested by Miroslav Lichvar). + + modify mk-1st.awk so the generated makefile rules for linking or + installing shared libraries do not first remove the library, in + case it is in use, e.g., libncurses.so by /bin/sh (report by Jeff + Chua). + + revised section "Using NCURSES under XTERM" in ncurses-intro.html + (prompted by newsgroup comment by Nick Guenther). + 20070224 + change internal return codes of _nc_wgetch() to check for cases where KEY_CODE_YES should be returned, e.g., if a KEY_RESIZE was @@ -71,7 +90,7 @@ it is not possible to add this information. + remove "-ldl" from some library lists to reduce dependencies in programs (report by Miroslav Lichvar). + correct description of --enable-signed-char in configure --help - (report by Michail Vidiassov). + (report by Michail Vidiassov). + add pattern for GNU/kFreeBSD configuration to CF_XOPEN_SOURCE, which matches an earlier change to CF_SHARED_OPTS, from xterm #224 fixes. @@ -90,7 +109,7 @@ it is not possible to add this information. 20070203 + modify fix_wchnstr() in form library to strip attributes (and color) - from the cchar_t array (field cells) read from a field's window. + from the cchar_t array (field cells) read from a field's window. Otherwise, when copying the field cells back to the window, the associated color overrides the field's background color (report by Ricardo Cantu). @@ -102,7 +121,7 @@ it is not possible to add this information. no longer relies on it. + disallow combining configure script options --with-ticlib and --enable-termcap (report by Rong-En Fan). - + remove tack from ncurses tree. + + remove tack from ncurses tree. 20070128 + fix typo in configure script that broke --with-termlib option @@ -118,7 +137,7 @@ it is not possible to add this information. + review/eliminate other original-file artifacts in cursesw.cc, making its license consistent with ncurses. + use ncurses vw_scanw() rather than reading into a fixed buffer in - the c++ binding for scanw() methods. + the c++ binding for scanw() methods (prompted by report by Nuno Dias). + eliminate fixed-buffer vsprintf() calls in c++ binding. 20070120 diff --git a/c++/Makefile.in b/c++/Makefile.in index 3b6b0b8b..b48105c7 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.78 2006/10/21 17:07:49 tom Exp $ +# $Id: Makefile.in,v 1.79 2007/03/03 20:51:25 tom Exp $ ############################################################################## # Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. # # # @@ -93,7 +93,7 @@ LOCAL_LIBDIR = @top_builddir@/lib LINK = @LINK_PROGS@ $(LIBTOOL_LINK) $(CXX) @CXXLDFLAGS@ SHLIB_DIRS = -L../lib -SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ +SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ # @SHLIB_LIST@ LIBROOT = ncurses++ diff --git a/c++/cursesw.cc b/c++/cursesw.cc index acf9ce94..8a42c39b 100644 --- a/c++/cursesw.cc +++ b/c++/cursesw.cc @@ -42,7 +42,7 @@ #include "internal.h" #include "cursesw.h" -MODULE_ID("$Id: cursesw.cc,v 1.46 2007/01/27 22:31:12 tom Exp $") +MODULE_ID("$Id: cursesw.cc,v 1.47 2007/03/03 21:49:24 tom Exp $") #define COLORS_NEED_INITIALIZATION -1 #define COLORS_NOT_INITIALIZED 0 @@ -355,13 +355,19 @@ NCursesWindow::useColors(void) } } +short +NCursesWindow::getPair() const +{ + return static_cast(PAIR_NUMBER(getattrs(w))); +} + short NCursesWindow::getcolor(int getback) const { short fore, back; if (HaveColors()) { - if (::pair_content(static_cast(PAIR_NUMBER(w->_attrs)), &fore, &back) == ERR) + if (::pair_content(getPair(), &fore, &back) == ERR) err_handler("Can't get color pair"); } else { // Monochrome means white on black @@ -379,7 +385,7 @@ int NCursesWindow::NumberOfColors() short NCursesWindow::getcolor() const { - return (HaveColors()) ? PAIR_NUMBER(w->_attrs) : 0; + return (HaveColors()) ? getPair() : 0; } int @@ -391,7 +397,7 @@ NCursesWindow::setpalette(short fore, short back, short pair) int NCursesWindow::setpalette(short fore, short back) { - return setpalette(fore, back, static_cast(PAIR_NUMBER(w->_attrs))); + return setpalette(fore, back, getPair()); } diff --git a/c++/cursesw.h b/c++/cursesw.h index e391fa22..217df6da 100644 --- a/c++/cursesw.h +++ b/c++/cursesw.h @@ -30,7 +30,7 @@ #ifndef NCURSES_CURSESW_H_incl #define NCURSES_CURSESW_H_incl 1 -// $Id: cursesw.h,v 1.41 2007/01/27 22:29:36 tom Exp $ +// $Id: cursesw.h,v 1.42 2007/03/03 21:49:18 tom Exp $ #include #include @@ -707,6 +707,7 @@ private: void set_keyboard(); short getcolor(int getback) const; + short getPair() const; static int setpalette(short fore, short back, short pair); static int colorInitialized; @@ -820,16 +821,16 @@ public: int width() const { return maxx() + 1; } // Number of columns in this window - int begx() const { return w->_begx; } + int begx() const { return getbegx(w); } // Column of top left corner relative to stdscr - int begy() const { return w->_begy; } + int begy() const { return getbegy(w); } // Line of top left corner relative to stdscr - int maxx() const { return w->_maxx; } + int maxx() const { return getmaxx(w) == ERR ? ERR : getmaxx(w)-1; } // Largest x coord in window - int maxy() const { return w->_maxy; } + int maxy() const { return getmaxy(w) == ERR ? ERR : getmaxy(w)-1; } // Largest y coord in window short getcolor() const; diff --git a/dist.mk b/dist.mk index c02812b9..be3754fd 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.579 2007/02/18 15:15:32 tom Exp $ +# $Id: dist.mk,v 1.581 2007/03/04 00:04: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 = 6 -NCURSES_PATCH = 20070224 +NCURSES_PATCH = 20070303 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) @@ -106,6 +106,7 @@ manhtml: fi ;\ done # change some things to make weblint happy: + @cat man_alias.sed >> subst.tmp @echo 's///g' >> subst.tmp @echo 's/<\/B>/<\/STRONG>/g' >> subst.tmp @echo 's///g' >> subst.tmp diff --git a/doc/hackguide.doc b/doc/hackguide.doc index ddd75210..8e0ba5c0 100644 --- a/doc/hackguide.doc +++ b/doc/hackguide.doc @@ -261,7 +261,7 @@ Library Overview lib_tracedmp.c lib_tracemse.c trace_buf.c It is rather unlikely you will ever need to change these, unless you - want to introduce a new debug trace level for some reasoon. + want to introduce a new debug trace level for some reason. There is another group of files that do direct I/O via tputs(), computations on the terminal capabilities, or queries to the OS diff --git a/doc/html/ada/terminal_interface-curses__ads.htm b/doc/html/ada/terminal_interface-curses__ads.htm index cedb6ee6..9cc10aa4 100644 --- a/doc/html/ada/terminal_interface-curses__ads.htm +++ b/doc/html/ada/terminal_interface-curses__ads.htm @@ -57,8 +57,8 @@ pragma Linker_Options ("-lncurses"); NC_Major_Version : constant := 5; -- Major version of the library - NC_Minor_Version : constant := 5; -- Minor version of the library - NC_Version : constant String := "5.5"; -- Version of library + NC_Minor_Version : constant := 6; -- Minor version of the library + NC_Version : constant String := "5.6"; -- Version of library type Window is private; Null_Window : constant Window; diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html index 7fa89cf5..b980f1d6 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.20 2006/05/13 15:14:01 tom Exp @ + * @Id: captoinfo.1m,v 1.21 2006/12/24 18:07:15 tom Exp @ --> @@ -166,7 +166,7 @@ GG acs magic cookie count If the single-line capabilities occur in an entry, they - will automatically be composed into an acsc string. The + will automatically be composed into an acsc string. The double-line capabilities and GG are discarded with a warn- ing message. @@ -183,11 +183,11 @@ font2 s2ds font3 s3ds - Additionally, the AIX box1 capability will be automati- - cally translated to an acsc string. + 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 + dard terminfo capabilities meml (memory lock) and memu (memory unlock). These will be discarded with a warning message. @@ -195,7 +195,7 @@

NOTES

        This utility is actually a link to tic(1m), running in  -I
-       mode.  You can use other tic options such as -f and  -x.
+       mode.  You can use other tic options such as -f and  -x.
 
        The  trace  option isn't identical to SVr4's.  Under SVr4,
        instead of following the -v with  a  trace  level  n,  you
@@ -206,7 +206,7 @@
 
SEE ALSO
        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 5.6 (patch 20061224).
+       This describes ncurses version 5.6 (patch 20070303).
 
 
 

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index fc3e2601..54a6a043 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: clear.1,v 1.5 2006/07/01 21:55:09 tom Exp @
+  * @Id: clear.1,v 1.6 2006/12/24 18:07:53 tom Exp @
 -->
 
 
@@ -69,7 +69,7 @@
 
SEE ALSO
        tput(1), terminfo(5)
 
-       This describes ncurses version 5.6 (patch 20061224).
+       This describes ncurses version 5.6 (patch 20070303).
 
 
 
diff --git a/doc/html/man/curs_border.3x.html b/doc/html/man/curs_border.3x.html
index 36aa8d57..e084827e 100644
--- a/doc/html/man/curs_border.3x.html
+++ b/doc/html/man/curs_border.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -65,8 +65,8 @@
        int whline(WINDOW *win, chtype ch, int n);
        int vline(chtype ch, int n);
        int wvline(WINDOW *win, chtype ch, int n);
-       mvhline(int y, int x, chtype ch, int n);
-       mvwhline(WINDOW *, int y, int x, chtype ch, int n);
+       int mvhline(int y, int x, chtype ch, int n);
+       int mvwhline(WINDOW *, int y, int x, chtype ch, int n);
        int mvvline(int y, int x, chtype ch, int n);
        int mvwvline(WINDOW *, int y, int x, chtype ch, int n);
 
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index fa71f041..483003c9 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -28,7 +28,7 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.16 2006/12/24 15:01:45 tom Exp @
+  * @Id: curs_extend.3x,v 1.17 2006/12/24 18:01:48 tom Exp @
 -->
 
 
@@ -73,7 +73,7 @@
        standard names which may be  compiled  into  the  terminfo
        description, i.e., via the terminfo or termcap interfaces.
        Normally these names are  available  for  use,  since  the
-       essential  decision  is made by using the -x option of tic
+       essential  decision  is made by using the -x option of tic
        to compile extended terminal definitions.  However you can
        disable  this  feature  to ensure compatibility with other
        implementations of curses.
diff --git a/doc/html/man/curs_mouse.3x.html b/doc/html/man/curs_mouse.3x.html
index e9085f51..23094826 100644
--- a/doc/html/man/curs_mouse.3x.html
+++ b/doc/html/man/curs_mouse.3x.html
@@ -28,7 +28,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_mouse.3x,v 1.29 2006/12/24 16:34:32 tom Exp @
+  * @Id: curs_mouse.3x,v 1.30 2006/12/30 23:43:34 tom Exp @
 -->
 
 
@@ -162,45 +162,48 @@
        screen windows enclose the location of a mouse event.
 
        The wmouse_trafo function transforms a given pair of coor-
-       dinates from stdscr-relative coordinates  to  screen-rela-
-       tive  coordinates  or  vice  versa.  Please remember, that
-       stdscr-relative coordinates are not  always  identical  to
-       screen-relative  coordinates  due  to the mechanism to re-
-       serve lines on top or bottom of the screen for other  pur-
-       poses  (ripoff()  call,  see also slk_...  functions).  If
-       the parameter to_screen is TRUE, the pointers pY, pX  must
-       reference  the coordinates of a location inside the window
-       win.  They are converted  to  screen-relative  coordinates
-       and  returned through the pointers.  If the conversion was
-       successful, the function returns TRUE.  If one of the  pa-
-       rameters  was  NULL or the location is not inside the win-
-       dow, FALSE is returned.  If to_screen is FALSE, the point-
-       ers  pY,  pX  must  reference screen-relative coordinates.
-       They are converted to stdscr-relative coordinates  if  the
-       window win encloses this point.  In this case the function
-       returns TRUE.  If one of the parameters  is  NULL  or  the
-       point is not inside the window, FALSE is returned.  Please
-       notice, that the referenced coordinates are only  replaced
-       by  the  converted  coordinates  if the transformation was
-       successful.
+       dinates from stdscr-relative  coordinates  to  coordinates
+       relative to the given window or vice versa.  Please remem-
+       ber, that stdscr-relative coordinates are not always iden-
+       tical  to window-relative coordinates due to the mechanism
+       to reserve lines on top or bottom of the screen for  other
+       purposes (see the ripoffline() and slk_init calls, for ex-
+       ample).  If the parameter to_screen is TRUE, the  pointers
+       pY, pX must reference the coordinates of a location inside
+       the window win.  They are converted to window-relative co-
+       ordinates  and returned through the pointers.  If the con-
+       version was successful, the function returns TRUE.  If one
+       of  the  parameters was NULL or the location is not inside
+       the window, FALSE is returned.  If to_screen is FALSE, the
+       pointers  pY,  pX  must  reference window-relative coordi-
+       nates.  They are converted to stdscr-relative  coordinates
+       if  the  window win encloses this point.  In this case the
+       function returns TRUE.  If one of the parameters  is  NULL
+       or  the point is not inside the window, FALSE is returned.
+       Please notice, that the referenced  coordinates  are  only
+       replaced  by  the converted coordinates if the transforma-
+       tion was successful.
+
+       The mouse_trafo function performs the same translation  as
+       wmouse_trafo, using stdscr for win.
 
        The mouseinterval function sets the maximum time (in thou-
-       sands  of  a second) that can elapse between press and re-
-       lease events for them to be recognized as  a  click.   Use
-       mouseinterval(0)  to disable click resolution.  This func-
+       sands of a second) that can elapse between press  and  re-
+       lease  events  for  them to be recognized as a click.  Use
+       mouseinterval(0) to disable click resolution.  This  func-
        tion returns the previous interval value.  Use mouseinter-
-       val(-1)  to  obtain the interval without altering it.  The
+       val(-1) to obtain the interval without altering  it.   The
        default is one sixth of a second.
 
-       Note that mouse events will be ignored when  input  is  in
+       Note  that  mouse  events will be ignored when input is in
        cooked mode, and will cause an error beep when cooked mode
-       is being simulated in a window by a function such as  get-
+       is  being simulated in a window by a function such as get-
        str that expects a linefeed for input-loop termination.
 
 
 

 
RETURN VALUE
-       getmouse  and ungetmouse return the integer ERR upon fail-
+       getmouse and ungetmouse return the integer ERR upon  fail-
        ure or OK upon successful completion.
 
               getmouse
@@ -212,83 +215,85 @@
 
        mousemask returns the mask of reportable events.
 
-       mouseinterval  returns the previous interval value, unless
-       the terminal was not initialized.  In that  case,  it  re-
+       mouseinterval returns the previous interval value,  unless
+       the  terminal  was  not initialized.  In that case, it re-
        turns the maximum interval value (166).
 
-       wenclose  and wmouse_trafo are boolean functions returning
+       wenclose and wmouse_trafo are boolean functions  returning
        TRUE or FALSE depending on their test result.
 
 
 

 
PORTABILITY
-       These calls were designed for  ncurses(3x),  and  are  not
+       These  calls  were  designed  for ncurses(3x), and are not
        found in SVr4 curses, 4.4BSD curses, or any other previous
        version of curses.
 
        The feature macro NCURSES_MOUSE_VERSION is provided so the
-       preprocessor  can  be  used to test whether these features
-       are present.  If the interface is changed,  the  value  of
-       NCURSES_MOUSE_VERSION  will  be incremented.  These values
-       for NCURSES_MOUSE_VERSION may be specified when  configur-
+       preprocessor can be used to test  whether  these  features
+       are  present.   If  the interface is changed, the value of
+       NCURSES_MOUSE_VERSION will be incremented.   These  values
+       for  NCURSES_MOUSE_VERSION may be specified when configur-
        ing ncurses:
 
-              1  has  definitions  for reserved events.  The mask
+              1  has definitions for reserved events.   The  mask
                  uses 28 bits.
 
               2  adds definitions for button 5, removes the defi-
-                 nitions  for  reserved events.  The mask uses 29
+                 nitions for reserved events.  The mask  uses  29
                  bits.
 
-       The order of the MEVENT structure members is  not  guaran-
-       teed.   Additional fields may be added to the structure in
+       The  order  of the MEVENT structure members is not guaran-
+       teed.  Additional fields may be added to the structure  in
        the future.
 
-       Under ncurses(3x), these calls are implemented  using  ei-
-       ther  xterm's built-in mouse-tracking API or platform-spe-
+       Under  ncurses(3x),  these calls are implemented using ei-
+       ther xterm's built-in mouse-tracking API or  platform-spe-
        cific drivers including
               Alessandro Rubini's gpm server.
               FreeBSD sysmouse
               OS/2 EMX
-       If you  are  using  an  unsupported  configuration,  mouse
-       events  will not be visible to ncurses(3x) (and the mouse-
+       If  you  are  using  an  unsupported  configuration, mouse
+       events will not be visible to ncurses(3x) (and the  mouse-
        mask function will always return 0).
 
-       If the terminfo entry contains a XM string, this  is  used
-       in  the xterm mouse driver to control the way the terminal
+       If  the  terminfo entry contains a XM string, this is used
+       in the xterm mouse driver to control the way the  terminal
        is initialized for mouse operation.  The default, if XM is
        not found, corresponds to private mode 1000 of xterm:
               \E[?1000%?%p1%{1}%=%th%el%;
        The z member in the event structure is not presently used.
-       It is intended for use with touch screens  (which  may  be
+       It  is  intended  for use with touch screens (which may be
        pressure-sensitive)   or   with   3D-mice/trackballs/power
        gloves.
 
 
 

 
BUGS
-       Mouse events under xterm will not in fact be ignored  dur-
-       ing  cooked  mode, if they have been enabled by mousemask.
-       Instead, the xterm mouse report sequence  will  appear  in
+       Mouse  events under xterm will not in fact be ignored dur-
+       ing cooked mode, if they have been enabled  by  mousemask.
+       Instead,  the  xterm  mouse report sequence will appear in
        the string read.
 
        Mouse events under xterm will not be detected correctly in
-       a window with its keypad bit off, since  they  are  inter-
-       preted  as  a  variety of function key.  Your terminfo de-
-       scription must have kmous set to "\E[M" (the beginning  of
-       the response from xterm for mouse clicks).
-
-       Because  there  are  no  standard  terminal responses that
-       would serve to identify terminals which support the  xterm
-       mouse  protocol,  ncurses assumes that if your $TERM envi-
-       ronment variable contains "xterm", or kmous is defined  in
+       a  window  with  its keypad bit off, since they are inter-
+       preted as a variety of function key.   Your  terminfo  de-
+       scription  should  have kmous set to "\E[M" (the beginning
+       of the response from xterm for mouse clicks).  Other  val-
+       ues  for  kmous  are permitted, but under the same assump-
+       tion, i.e., it is the beginning of the response.
+
+       Because there are  no  standard  terminal  responses  that
+       would  serve to identify terminals which support the xterm
+       mouse protocol, ncurses assumes that if your  $TERM  envi-
+       ronment  variable contains "xterm", or kmous is defined in
        the terminal description, then the terminal may send mouse
        events.
 
 
 

 
SEE ALSO
-       curses(3x).
+       curses(3x), curs_kernel(3x), curs_slk(3x).
 
 
 
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 226e8064..85ad7f9b 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -62,7 +62,7 @@
        int setterm(char *term);
        TERMINAL *set_curterm(TERMINAL *nterm);
        int del_curterm(TERMINAL *oterm);
-       int restartterm(const char *term, int fildes, int *errret);
+       int restartterm(char *term, int fildes, int *errret);
        char *tparm(char *str, ...);
        int tputs(const char *str, int affcnt, int (*putc)(int));
        int putp(const char *str);
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index 8c3c5553..f24a8c81 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -61,7 +61,7 @@
        char *_traceattr(attr_t attr);
        char *_traceattr2(int buffer, chtype ch);
        char *_nc_tracebits(void);
-       char *_tracechar(const unsigned char ch);
+       char *_tracechar(int);
        char *_tracechtype(chtype ch);
        char *_tracechtype2(int buffer, chtype ch);
        char *_tracemouse(const MEVENT *event);
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 46b73047..cc499251 100644
--- a/doc/html/man/curs_util.3x.html
+++ b/doc/html/man/curs_util.3x.html
@@ -1,7 +1,7 @@
 
 
 
 
@@ -57,7 +57,7 @@
        #include <curses.h>
 
        char *unctrl(chtype c);
-       char *wunctrl(cchar_t *c);
+       wchar_t *wunctrl(cchar_t *c);
        char *keyname(int c);
        char *key_name(wchar_t w);
        void filter(void);
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index b98cb4a6..f7ef5957 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -236,7 +236,7 @@
 
 

 
SEE ALSO
-       This describes ncurses version 5.6 (patch 20061224).
+       This describes ncurses version 5.6 (patch 20070303).
 
 
 
diff --git a/doc/html/man/form_field_opts.3x.html b/doc/html/man/form_field_opts.3x.html
index 7d8f5f1c..f9a13217 100644
--- a/doc/html/man/form_field_opts.3x.html
+++ b/doc/html/man/form_field_opts.3x.html
@@ -2,7 +2,7 @@
 
 
 
@@ -54,10 +54,10 @@
 

 
SYNOPSIS
        #include <form.h>
-       int set_field_opts(FIELD *field, OPTIONS opts);
-       int field_opts_on(FIELD *field, OPTIONS opts);
-       int field_opts_off(FIELD *field, OPTIONS opts);
-       OPTIONS field_opts(const FIELD *field);
+       int set_field_opts(FIELD *field, Field_Options opts);
+       int field_opts_on(FIELD *field, Field_Options opts);
+       int field_opts_off(FIELD *field, Field_Options opts);
+       Field_Options field_opts(const FIELD *field);
 
 
 

diff --git a/doc/html/man/form_hook.3x.html b/doc/html/man/form_hook.3x.html
index 0cffefa1..f88aa1d9 100644
--- a/doc/html/man/form_hook.3x.html
+++ b/doc/html/man/form_hook.3x.html
@@ -2,7 +2,7 @@
 
 
 
@@ -55,14 +55,14 @@

SYNOPSIS

        #include <form.h>
-       int set_field_init(FORM *form, void (*func)(FORM *));
-       void (*)(FORM *) field_init(const FORM *form);
-       int set_field_term(FORM *form, void (*func)(FORM *));
-       void (*)(FORM *) field_term(const FORM *form);
-       int set_form_init(FORM *form, void (*func)(FORM *));
-       void (*)(FORM *) form_init(const FORM *form);
-       int set_form_term(FORM *form, void (*func)(FORM *));
-       void (*)(FORM *) form_term(const FORM *form);
+       int set_field_init(FORM *form, Form_Hook func);
+       Form_Hook field_init(const FORM *form);
+       int set_field_term(FORM *form, Form_Hook func);
+       Form_Hook field_term(const FORM *form);
+       int set_form_init(FORM *form, Form_Hook func);
+       Form_Hook form_init(const FORM *form);
+       int set_form_term(FORM *form, Form_Hook func);
+       Form_Hook form_term(const FORM *form);
diff --git a/doc/html/man/form_opts.3x.html b/doc/html/man/form_opts.3x.html index 9652273c..53869a51 100644 --- a/doc/html/man/form_opts.3x.html +++ b/doc/html/man/form_opts.3x.html @@ -2,7 +2,7 @@ @@ -54,10 +54,10 @@

SYNOPSIS

        #include <form.h>
-       int set_form_opts(FORM *form, OPTIONS opts);
-       int form_opts_on(FORM *form, OPTIONS opts);
-       int form_opts_off(FORM *form, OPTIONS opts);
-       OPTIONS form_opts(const FORM *form);
+       int set_form_opts(FORM *form, Field_Options opts);
+       int form_opts_on(FORM *form, Field_Options opts);
+       int form_opts_off(FORM *form, Field_Options opts);
+       Field_Options form_opts(const FORM *form);
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html index 9f48f193..7bdc3bf2 100644 --- a/doc/html/man/infocmp.1m.html +++ b/doc/html/man/infocmp.1m.html @@ -28,7 +28,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: infocmp.1m,v 1.43 2006/05/13 15:14:01 tom Exp @ + * @Id: infocmp.1m,v 1.44 2006/12/24 18:16:31 tom Exp @ --> @@ -423,7 +423,7 @@ captoinfo(1m), infotocap(1m), tic(1m), toe(1m), curses(3x), terminfo(5). - This describes ncurses version 5.6 (patch 20061224). + This describes ncurses version 5.6 (patch 20070303). diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html index f78beaed..28ce9604 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.6 2006/05/13 15:35:45 tom Exp @ + * @Id: infotocap.1m,v 1.8 2006/12/24 20:13:56 tom Exp @ --> @@ -85,7 +85,7 @@

NOTES

-       This utility is actually a link to tic(1m), 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 +93,7 @@
 
SEE ALSO
        curses(3x), tic(1m), infocmp(1m), terminfo(5)
 
-       This describes ncurses version 5.6 (patch 20061224).
+       This describes ncurses version 5.6 (patch 20070303).
 
 
 
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 17707615..64be8a86 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.6 (patch 20061224).
+       This describes ncurses version 5.6 (patch 20070303).
 
 
 
diff --git a/doc/html/man/menu_hook.3x.html b/doc/html/man/menu_hook.3x.html
index 7c2e4ec8..95addf4b 100644
--- a/doc/html/man/menu_hook.3x.html
+++ b/doc/html/man/menu_hook.3x.html
@@ -2,7 +2,7 @@
 
 
 
@@ -55,14 +55,14 @@
 

 
SYNOPSIS
        #include <menu.h>
-       int set_item_init(MENU *menu, void (*func)(MENU *));
-       void (*)(MENU *) item_init(const MENU *menu);
-       int set_item_term(MENU *menu, void (*func)(MENU *));
-       void (*)(MENU *) item_term(const MENU *menu);
-       int set_menu_init(MENU *menu, void (*func)(MENU *));
-       void (*)(MENU *) menu_init(const MENU *menu);
-       int set_menu_term(MENU *menu, void (*func)(MENU *));
-       void (*)(MENU *) menu_term(const MENU *menu);
+       int set_item_init(MENU *menu, Menu_Hook func);
+       Menu_Hook item_init(const MENU *menu);
+       int set_item_term(MENU *menu, Menu_Hook func);
+       Menu_Hook item_term(const MENU *menu);
+       int set_menu_init(MENU *menu, Menu_Hook func);
+       Menu_Hook menu_init(const MENU *menu);
+       int set_menu_term(MENU *menu, Menu_Hook func);
+       Menu_Hook menu_term(const MENU *menu);
 
 
 

diff --git a/doc/html/man/menu_opts.3x.html b/doc/html/man/menu_opts.3x.html
index 0aec7bf6..3fb96709 100644
--- a/doc/html/man/menu_opts.3x.html
+++ b/doc/html/man/menu_opts.3x.html
@@ -2,7 +2,7 @@
 
 
 
@@ -54,10 +54,10 @@

SYNOPSIS

        #include <menu.h>
-       int set_menu_opts(MENU *menu, OPTIONS opts);
-       int menu_opts_on(MENU *menu, OPTIONS opts);
-       int menu_opts_off(MENU *menu, OPTIONS opts);
-       OPTIONS menu_opts(const MENU *menu);
+       int set_menu_opts(MENU *menu, Menu_Options opts);
+       int menu_opts_on(MENU *menu, Menu_Options opts);
+       int menu_opts_off(MENU *menu, Menu_Options opts);
+       Menu_Options menu_opts(const MENU *menu);
diff --git a/doc/html/man/mitem_opts.3x.html b/doc/html/man/mitem_opts.3x.html index c96e092b..459930a3 100644 --- a/doc/html/man/mitem_opts.3x.html +++ b/doc/html/man/mitem_opts.3x.html @@ -2,7 +2,7 @@ @@ -54,10 +54,10 @@

SYNOPSIS

        #include <menu.h>
-       int set_item_opts(ITEM *item, OPTIONS opts);
-       int item_opts_on(ITEM *item, OPTIONS opts);
-       int item_opts_off(ITEM *item, OPTIONS opts);
-       OPTIONS item_opts(const ITEM *item);
+       int set_item_opts(ITEM *item, Item_Options opts);
+       int item_opts_on(ITEM *item, Item_Options opts);
+       int item_opts_off(ITEM *item, Item_Options opts);
+       Item_Options item_opts(const ITEM *item);
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html index 321ccb23..e3d6d08b 100644 --- a/doc/html/man/ncurses.3x.html +++ b/doc/html/man/ncurses.3x.html @@ -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.6 (patch 20061224). + describes ncurses version 5.6 (patch 20070303). The ncurses routines emulate the curses(3x) library of System V Release 4 UNIX, and the XPG4 curses standard (XSI diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html index e2fe2aeb..f6e27505 100644 --- a/doc/html/man/panel.3x.html +++ b/doc/html/man/panel.3x.html @@ -213,7 +213,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 5.6 (patch 20061224).
+       This describes ncurses version 5.6 (patch 20070303).
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html index 9999ef03..50fdc550 100644 --- a/doc/html/man/term.5.html +++ b/doc/html/man/term.5.html @@ -27,7 +27,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: term.5,v 1.18 2006/12/24 15:07:18 tom Exp @ + * @Id: term.5,v 1.19 2006/12/24 18:12:38 tom Exp @ --> @@ -95,7 +95,7 @@ assumptions about byte ordering or sign extension are made. - The compiled file is created with the tic program, and + The compiled file is created with the tic program, and read by the routine setupterm. The file is divided into six parts: the header, terminal names, boolean flags, num- bers, strings, and string table. diff --git a/doc/html/man/term.7.html b/doc/html/man/term.7.html index 1d4d2f49..8d2573df 100644 --- a/doc/html/man/term.7.html +++ b/doc/html/man/term.7.html @@ -27,7 +27,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: term.7,v 1.16 2006/12/24 15:07:18 tom Exp @ + * @Id: term.7,v 1.17 2006/12/24 18:14:09 tom Exp @ --> diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html index 41962a4e..56b6b397 100644 --- a/doc/html/man/terminfo.5.html +++ b/doc/html/man/terminfo.5.html @@ -32,9 +32,9 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: terminfo.head,v 1.14 2006/12/24 15:29:28 tom Exp @ + * @Id: terminfo.head,v 1.15 2006/12/24 18:04:42 tom Exp @ * Head of terminfo man page ends here - * @Id: terminfo.tail,v 1.45 2006/12/24 15:27:57 tom Exp @ + * @Id: terminfo.tail,v 1.47 2006/12/24 18:14:22 tom Exp @ * Beginning of terminfo.tail file * This file is part of ncurses. * See "terminfo.head" for copyright. @@ -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.6 (patch 20061224). + This describes ncurses version 5.6 (patch 20070303). Entries in terminfo consist of a sequence of `,' separated fields (embedded commas may be escaped with a backslash or @@ -95,13 +95,13 @@ Lines beginning with a `#' in the first column are treated as comments. While comment lines are legal at any point, - the output of captoinfo and infotocap (aliases for tic) + the output of captoinfo and infotocap (aliases for tic) will move comments so they occur only between entries. Newlines and leading tabs may be used for formatting entries for readability. These are removed from parsed - entries. The infocmp -f option relies on this to format - if-then-else expressions: the result can be read by tic. + entries. The infocmp -f option relies on this to format + if-then-else expressions: the result can be read by tic. Terminal names (except for the last, verbose entry) should be chosen using the following conventions. The particular @@ -1234,7 +1234,7 @@ Parameterized Strings Cursor addressing and other strings requiring parameters in the terminal are described by a parameterized string - capability, with printf(3S) like escapes %x in it. For + capability, with printf(3) like escapes %x in it. For example, to address the cursor, the cup capability is given, using two parameters: the row and column to address to. (Rows and columns are numbered from zero and refer to @@ -2351,7 +2351,7 @@

SEE ALSO

-       tic(1m), infocmp(1m), curses(3x), printf(3S), term(5).
+       tic(1m), infocmp(1m), curses(3x), printf(3), term(5).
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html index 0432397e..5dd84918 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.43 2006/05/13 15:14:01 tom Exp @ + * @Id: tic.1m,v 1.44 2006/12/24 17:59:11 tom Exp @ --> @@ -309,7 +309,7 @@ infocmp(1m), captoinfo(1m), infotocap(1m), toe(1m), curses(3x), terminfo(5). - This describes ncurses version 5.6 (patch 20061224). + This describes ncurses version 5.6 (patch 20070303). diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html index 83300ce9..278d1248 100644 --- a/doc/html/man/toe.1m.html +++ b/doc/html/man/toe.1m.html @@ -27,7 +27,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: toe.1m,v 1.19 2006/12/24 15:25:19 tom Exp @ + * @Id: toe.1m,v 1.20 2006/12/24 17:20:37 tom Exp @ --> @@ -109,7 +109,7 @@ tic(1m), infocmp(1m), captoinfo(1m), infotocap(1m), curses(3x), terminfo(5). - This describes ncurses version 5.6 (patch 20061224). + This describes ncurses version 5.6 (patch 20070303). diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html index e76f87f2..159df350 100644 --- a/doc/html/man/tput.1.html +++ b/doc/html/man/tput.1.html @@ -28,7 +28,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: tput.1,v 1.26 2006/12/24 15:16:27 tom Exp @ + * @Id: tput.1,v 1.27 2006/12/24 18:11:31 tom Exp @ --> @@ -328,7 +328,7 @@

SEE ALSO

        clear(1), stty(1), tabs(1), terminfo(5).
 
-       This describes ncurses version 5.6 (patch 20061224).
+       This describes ncurses version 5.6 (patch 20070303).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index c8b6a39e..c41e2240 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -318,7 +318,7 @@
        csh(1), sh(1), stty(1),  curs_terminfo(3x),  tty(4),  ter-
        minfo(5), ttys(5), environ(7)
 
-       This describes ncurses version 5.6 (patch 20061224).
+       This describes ncurses version 5.6 (patch 20070303).
 
 
 
diff --git a/doc/html/ncurses-intro.html b/doc/html/ncurses-intro.html
index bf56ddee..451e7ab4 100644
--- a/doc/html/ncurses-intro.html
+++ b/doc/html/ncurses-intro.html
@@ -1,8 +1,8 @@