diff --git a/MANIFEST b/MANIFEST
index bc547fac..bcc0bcf1 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -464,6 +464,7 @@
./doc/html/man/mitem_visible.3x.html
./doc/html/man/ncurses.3x.html
./doc/html/man/ncurses6-config.1.html
+./doc/html/man/new_pair.3x.html
./doc/html/man/panel.3x.html
./doc/html/man/resizeterm.3x.html
./doc/html/man/tabs.1.html
diff --git a/NEWS b/NEWS
index dba8fd13..ef4cabd2 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.2772 2017/03/11 23:29:01 tom Exp $
+-- $Id: NEWS,v 1.2779 2017/03/18 19:17:44 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,19 @@ 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.
+20170318
+ + change TERMINAL structure in term.h to make it opaque. Some
+ applications misuse its members, e.g., directly modifying it
+ rather than using def_prog_mode().
+ + modify utility headers such as tic.h to make it clearer which are
+ externals that are used by tack.
+ + improve curs_slk.3x in particular its discussion of portability.
+ + fix cut/paste in legacy_encoding.3x
+ + add prototype for find_pair() to new_pair.3x (report by Branden
+ Robinson).
+ + fix a couple of broken links in generated man-html documentation.
+ + regenerate man-html documentation.
+
20170311
+ modify vt100 rs2 string to reset vt52 mode and scrolling regions
(report/analysis by Robert King) -TD
diff --git a/VERSION b/VERSION
index a1d35f56..977c7749 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:9 6.0 20170311
+5:0:9 6.0 20170318
diff --git a/dist.mk b/dist.mk
index 64022e85..cbf01923 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.1151 2017/03/05 19:24:08 tom Exp $
+# $Id: dist.mk,v 1.1152 2017/03/12 09:25:40 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 = 6
NCURSES_MINOR = 0
-NCURSES_PATCH = 20170311
+NCURSES_PATCH = 20170318
# 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/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index e92fba9a..89ef2934 100644
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -40,7 +40,7 @@
ADACURSES 1 User Commands
-ADACURSES(1) User Commands ADACURSES(1)
+ADACURSES(1) User Commands ADACURSES(1)
@@ -131,11 +131,11 @@
@@ -85,50 +91,54 @@
eight characters each. In addition to this, the ncurses
implementation supports a mode where it simulates 12 la-
bels of up to five characters each. This is useful for
- today's PC-like enduser devices. ncurses simulates this
- mode by taking over up to two lines at the bottom of the
- screen; it does not try to use any hardware support for
- this mode.
+ PC-like enduser devices. ncurses simulates this mode by
+ taking over up to two lines at the bottom of the screen;
+ it does not try to use any hardware support for this mode.
- The slk_init routine must be called before initscr or
+
+
+ The slk_init routine must be called before initscr or
newterm is called. If initscr eventually uses a line from
stdscr to emulate the soft labels, then fmt determines how
the labels are arranged on the screen:
- 0 indicates a 3-2-3 arrangement of the labels.
+ 0 indicates a 3-2-3 arrangement of the labels.
- 1 indicates a 4-4 arrangement
+ 1 indicates a 4-4 arrangement
- 2 indicates the PC-like 4-4-4 mode.
+ 2 indicates the PC-like 4-4-4 mode.
- 3 is again the PC-like 4-4-4 mode, but in addition
- an index line is generated, helping the user to
- identify the key numbers easily.
+ 3 is again the PC-like 4-4-4 mode, but in addition an
+ index line is generated, helping the user to identi-
+ fy the key numbers easily.
- The slk_set routine (and the slk_wset routine for the
+
+
+ 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
- in slk_init is 2 or 3);
+ labnum
+ 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)
- characters in length. A null string or a null
- pointer sets up a blank label.
+ label
+ 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-
- bel.
+ fmt is either 0, 1, or 2, indicating whether the label
+ is to be left-justified, centered, or right-justi-
+ fied, respectively, within the label.
+ The slk_label routine returns the current label for label
+ number labnum, with leading and trailing blanks stripped.
+
+
+
The slk_refresh and slk_noutrefresh routines correspond to
the wrefresh and wnoutrefresh routines.
- 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
screen.
@@ -138,6 +148,8 @@
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
@@ -145,6 +157,8 @@
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
line of the screen.
@@ -158,43 +172,41 @@
X/Open defines no error conditions. In this implementa-
tion
- slk_attr
- returns the attribute used for the soft keys.
+ slk_attr
+ returns the attribute used for the soft keys.
- slk_attroff, slk_attron, slk_clear,
- slk_noutrefresh, slk_refresh, slk_touch
- return an error if the terminal or the soft-
- keys were not initialized.
+ slk_attroff, slk_attron, slk_clear, slk_noutrefresh,
+ slk_refresh, slk_touch
+ return an error if the terminal or the softkeys
+ were not initialized.
- slk_attrset
- returns an error if the terminal or the soft-
- keys were not initialized.
+ slk_attrset
+ returns an error if the terminal or the softkeys
+ were not initialized.
- slk_attr_set
- 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_attr_set
+ returns an error if the terminal or the softkeys
+ 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
- is outside the range 0..COLOR_PAIRS-1.
+ slk_color
+ returns an error if the terminal or the softkeys
+ 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
- outside the range 0..3.
+ slk_init
+ returns an error if the format parameter is out-
+ side the range 0..3.
- slk_label
- returns NULL on error.
+ 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
- range 0..2, or if memory for the labels cannot
- be allocated.
+ slk_set
+ returns an error if the terminal or the softkeys
+ were not initialized, or the labnum parameter is
+ outside the range of label counts, or if the for-
+ mat parameter is outside the range 0..2, or if
+ memory for the labels cannot be allocated.
- 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 specif-
- ic to ncurses.
+ The XSI Curses standard, Issue 4, described the soft-key
+ functions, with some differences from SVr4 curses:
+
+ o It added functions like the SVr4 the attribute-manipu-
+ lation functions slk_attron, slk_attroff, slk_attrset
+ which use attr_t parameters, along with a reserved
+ opts parameter.
+
+ One of these new functions (slk_attr_set) also has a
+ color-pair parameter.
+
+ o It added const qualifiers to parameters (unnecessari-
+ ly), and
+
+ o It added slk_color.
+
+ The format codes 2 and 3 for slk_init and the function
+ slk_attr are specific to ncurses.
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index c4942bfe..c61b68bb 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -239,7 +239,7 @@
curses(3x) and related pages whose names begin "form_" for
detailed descriptions of the entry points.
- This describes ncurses version 6.0 (patch 20170304).
+ This describes ncurses version 6.0 (patch 20170318).
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 6442c1a6..b56caa00 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -514,7 +514,7 @@
http://invisible-island.net/ncurses/tctest.html
- This describes ncurses version 6.0 (patch 20170304).
+ This describes ncurses version 6.0 (patch 20170318).
+ These functions are an extension to the curses library.
+ They permit an application to dynamically allocate a color
+ pair using the foreground/background colors rather than
+ assign a fixed color pair number, and return an unused
+ pair to the pool.
+
+ The number of colors may be related to the number of pos-
+ sible color pairs for a given terminal, or it may not:
+
+ o While almost all terminals allow setting the color
+ attributes independently, it is unlikely that your
+ terminal allows you to modify the attributes of a
+ given character cell without rewriting it. That is,
+ the foreground and background colors are applied as a
+ pair.
+
+ o Color pairs are the curses library's way of managing a
+ color palette on a terminal. If the library does not
+ keep track of the combinations of colors which are
+ displayed, it will be inefficient.
+
+ o For simple terminal emulators with only a few dozen
+ color combinations, it is convenient to use the maxi-
+ mum number of combinations as the limit on color
+ pairs:
+
+ COLORS*COLORS
+
+ o Terminals which support defaultcolors distinct from
+ "ANSI colors" add to the possible combinations, pro-
+ ducing this total:
+
+ (COLORS+1)*(COLORS+1)
+
+ o An application might use up to a few dozen color pairs
+ to implement a predefined color scheme.
+
+ Beyond that lies in the realm of programs using the
+ foreground and background colors for "ASCII art" (or
+ some other non-textual application).
+
+ Also beyond those few dozen pairs, the required size
+ for a table to represent the combinations grows
+ rapidly with an increasing number of colors.
+
+ These functions allow a developer to let the screen
+ library manage color pairs.
+
+
+
+ The alloc_pair function accepts parameters for foreground
+ and background color, and checks if that color combination
+ is already associated with a color pair.
+
+ o If the combination already exists, alloc_pair returns
+ the existing pair.
+
+ o If the combination does not exist, alloc_pair allo-
+ cates a new color pair and returns that.
+
+ o If the table fills up, alloc_pair discards the least-
+ recently allocated entry using free_pair and allocates
+ a new color pair.
+
+ All of the color pairs are allocated from a table of pos-
+ sible color pairs. The size of the table is determined by
+ the terminfo pairs capability. The table is shared with
+ init_pair; in fact alloc_pair calls init_pair after updat-
+ ing the ncurses library's fast index to the colors versus
+ color pairs.
+
+
+
+ The find_pair function accepts parameters for foreground
+ and background color, and checks if that color combination
+ is already associated with a color pair, returning the
+ pair number if it has been allocated. Otherwise it
+ returns -1.
+
+
+
+ The alloc_pair function returns a color pair number in the
+ range 1 through COLOR_PAIRS-1, unless it encounters an
+ error updating its fast index to the color pair values,
+ preventing it from allocating a color pair. In that case,
+ it returns -1.
+
+ The find_pair function returns a color pair number if the
+ given color combination has been associated with a color
+ pair, or -1 if not.
+
+ Likewise, free_pair returns OK unless it encounters an
+ error updating the fast index or if no such color pair is
+ in use.
+
+
+
+ These routines are specific to ncurses. They were not
+ supported on Version 7, BSD or System V implementations.
+ It is recommended that any code depending on them be con-
+ ditioned using NCURSES_VERSION.
+
+
+
tset(1), infocmp(1m), curses(3x), terminfo(5).
- This describes ncurses version 6.0 (patch 20170304).
+ This describes ncurses version 6.0 (patch 20170318).
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 7ce1a222..a5f900a1 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -31,7 +31,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: terminfo.head,v 1.30 2017/03/05 00:24:35 tom Exp @
+ * @Id: terminfo.head,v 1.31 2017/03/06 09:58:14 tom Exp @
* Head of terminfo man page ends here
* @Id: terminfo.tail,v 1.78 2017/03/04 23:52:35 tom Exp @
* Beginning of terminfo.tail file
@@ -75,7 +75,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 6.0 (patch 20170304).
+ This describes ncurses version 6.0 (patch 20170318).
@@ -93,7 +93,7 @@
be used for formatting entries for readability. These
are removed from parsed entries.
- The infocmp-f and -W options relies on this to format
+ The infocmp-f and -W options rely on this to format
if-then-else expressions, or to enforce maximum line-
width. The resulting formatted terminal description
can be read by tic.
@@ -105,7 +105,7 @@
The first name given is the most common abbreviation
for the terminal (its primary name), the last name
given should be a long name fully identifying the ter-
- minal (see longname(3x)), and all others are treated
+ minal (see longname(3x)), and all others are treated
as synonyms (aliases) for the primary terminal name.
X/Open Curses advises that all names but the last
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 03f4c6e6..f25e2442 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -403,7 +403,7 @@
infocmp(1m), captoinfo(1m), infotocap(1m), toe(1m),
curses(3x), term(5). terminfo(5).
- This describes ncurses version 6.0 (patch 20170304).
+ This describes ncurses version 6.0 (patch 20170318).