diff --git a/NEWS b/NEWS
index b348f7e7..4cb156fe 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.2586 2016/03/27 00:19:02 tom Exp $
+-- $Id: NEWS,v 1.2589 2016/04/02 23:49:12 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,11 @@ 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.
+20160402
+ + regenerate HTML manpages.
+ + improve manual pages for utilities with respect to POSIX versus
+ X/Open Curses.
+
20160326
+ regenerate HTML manpages.
+ improve test/demo_menus.c, allowing mouse-click on the menu-headers
diff --git a/VERSION b/VERSION
index 18860146..d3ec3f70 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:9 6.0 20160326
+5:0:9 6.0 20160402
diff --git a/dist.mk b/dist.mk
index 2d2eb3c6..940b77cd 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.1099 2016/03/26 12:23:50 tom Exp $
+# $Id: dist.mk,v 1.1100 2016/04/02 19:01:57 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 = 20160326
+NCURSES_PATCH = 20160402
# 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/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 0bc7f7e9..41199b65 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -198,7 +198,7 @@
infocmp(1m), curses(3x), terminfo(5)
- This describes ncurses version 6.0 (patch 20160326).
+ This describes ncurses version 6.0 (patch 20160402).
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index aa31f125..a35a8ebb 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -67,7 +67,7 @@
tput(1), terminfo(5)
- This describes ncurses version 6.0 (patch 20160326).
+ This describes ncurses version 6.0 (patch 20160402).
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 32a724ae..f157f61c 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -235,7 +235,7 @@
curses(3x) and related pages whose names begin "form_" for
detailed descriptions of the entry points.
- This describes ncurses version 6.0 (patch 20160326).
+ This describes ncurses version 6.0 (patch 20160402).
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index bd0619a7..979e3b4f 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -475,7 +475,7 @@
http://invisible-island.net/ncurses/tctest.html
- This describes ncurses version 6.0 (patch 20160326).
+ This describes ncurses version 6.0 (patch 20160402).
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 5ca10104..2451209a 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -88,7 +88,7 @@
curses(3x), tic(1m), infocmp(1m), terminfo(5)
- This describes ncurses version 6.0 (patch 20160326).
+ This describes ncurses version 6.0 (patch 20160402).
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index bf1fabb6..a0d1e650 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -217,7 +217,7 @@
curses(3x) and related pages whose names begin "menu_" for
detailed descriptions of the entry points.
- This describes ncurses version 6.0 (patch 20160326).
+ This describes ncurses version 6.0 (patch 20160402).
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 7ebff4c3..52c3eac5 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@
sonable optimization. This implementation is "new curses"
(ncurses) and is the approved replacement for 4.4BSD clas-
sic curses, which has been discontinued. This describes
- ncurses version 6.0 (patch 20160326).
+ ncurses version 6.0 (patch 20160402).
The ncurses library emulates the curses library of System
V Release 4 UNIX, and XPG4 (X/Open Portability Guide)
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index dc31c7a9..f69ccea6 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -209,7 +209,7 @@
curses(3x), curs_variables(3x),
- This describes ncurses version 6.0 (patch 20160326).
+ This describes ncurses version 6.0 (patch 20160402).
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 866c4dff..1c34f9d2 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -1,6 +1,6 @@
@@ -140,9 +140,15 @@
- X/Open describes a +m option, to set a terminal's left-
- margin. Very few of the entries in the terminal database
- provide this capability.
+ IEEE Std 1003.1/The Open Group Base Specifications Issue
+ 7 (POSIX.1-2008) describes a tabs utility. However
+
+ o This standard describes a +m option, to set a termi-
+ nal's left-margin. Very few of the entries in the
+ terminal database provide this capability.
+
+ o There is no counterpart in X/Open Curses Issue 7 for
+ this utility, unlike tput(3x).
The -d (debug) and -n (no-op) options are extensions not
provided by other implementations.
@@ -158,7 +164,7 @@
tset(1), infocmp(1m), curses(3x), terminfo(5).
- This describes ncurses version 6.0 (patch 20160326).
+ This describes ncurses version 6.0 (patch 20160402).
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index a769f917..5a6c87f2 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -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 20160326).
+ This describes ncurses version 6.0 (patch 20160402).
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 0eca59df..94dcec03 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -398,7 +398,7 @@
infocmp(1m), captoinfo(1m), infotocap(1m), toe(1m),
curses(3x), term(5). terminfo(5).
- This describes ncurses version 6.0 (patch 20160326).
+ This describes ncurses version 6.0 (patch 20160402).
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 6662f8cd..3c52f4d7 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -117,7 +117,7 @@
tic(1m), infocmp(1m), captoinfo(1m), infotocap(1m),
curses(3x), terminfo(5).
- This describes ncurses version 6.0 (patch 20160326).
+ This describes ncurses version 6.0 (patch 20160402).
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index a9d26bec..3bd8ea6c 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -1,7 +1,7 @@
@@ -52,7 +52,7 @@
- tput [-Ttype] capname [parms ... ]
+ tput [-Ttype] capname [parameters]
tput [-Ttype] init
tput [-Ttype] reset
tput [-Ttype] longname
@@ -68,19 +68,19 @@
terminal type. The result depends upon the capability's
type:
- string
- tput writes the string to the standard output.
- No trailing newline is supplied.
+ string
+ tput writes the string to the standard output. No
+ trailing newline is supplied.
- integer
- tput writes the decimal value to the standard
- output, with a trailing newline.
+ integer
+ tput writes the decimal value to the standard out-
+ put, with a trailing newline.
- boolean
- tput simply sets the exit code (0 for TRUE if
- the terminal has the capability, 1 for FALSE
- if it does not), and writes nothing to the
- standard output.
+ boolean
+ tput simply sets the exit code (0 for TRUE if the
+ terminal has the capability, 1 for FALSE if it
+ does not), and writes nothing to the standard out-
+ put.
Before using a value returned on the standard output, the
application should test the exit code (e.g., $?, see
@@ -88,29 +88,14 @@
NOSTICS sections.) For a complete list of capabilities
and the capname associated with each, see terminfo(5).
+
+
-Ttype indicates the type of terminal. Normally this
option is unnecessary, because the default is taken
from the environment variable TERM. If -T is spec-
ified, then the shell variables LINES and COLUMNS
will also be ignored.
- capname
- indicates the capability from the terminfo data-
- base. When termcap support is compiled in, the
- termcap name for the capability is also accepted.
-
- parms If the capability is a string that takes parame-
- ters, the arguments parms will be instantiated into
- the string.
-
- Most parameters are numbers. Only a few terminfo
- capabilities require string parameters; tput uses a
- table to decide which to pass as strings. Normally
- tput uses tparm (3x) to perform the substitution.
- If no parameters are given for the capability, tput
- writes the string without performing the substitu-
- tion.
-
-S allows more than one capability per invocation of
tput. The capabilities must be passed to tput from
the standard input instead of from the command line
@@ -120,65 +105,107 @@
CODES section).
Again, tput uses a table and the presence of param-
- eters in its input to decide whether to use tparm
- (3x), and how to interpret the parameters.
+ eters in its input to decide whether to use
+ tparm(3x), and how to interpret the parameters.
-V reports the version of ncurses which was used in
this program, and exits.
+
+
+ capname
+ indicates the capability from the terminfo data-
+ base. When termcap support is compiled in, the
+ termcap name for the capability is also accepted.
+
+ If the capability is a string that takes parame-
+ ters, the arguments following the capability will
+ be used as parameters for the string.
+
+ Most parameters are numbers. Only a few terminfo
+ capabilities require string parameters; tput uses a
+ table to decide which to pass as strings. Normally
+ tput uses tparm(3x) to perform the substitution.
+ If no parameters are given for the capability, tput
+ writes the string without performing the substitu-
+ tion.
+
init If the terminfo database is present and an entry
for the user's terminal exists (see -Ttype, above),
the following will occur:
- (1) if present, the terminal's initialization
- strings will be output as detailed in the
- terminfo(5) section on Tabs and Initializa-
- tion,
+ (1) if present, the terminal's initialization
+ strings will be output as detailed in the ter-
+ minfo(5) section on Tabs and Initialization,
- (2) any delays (e.g., newline) specified in the
- entry will be set in the tty driver,
+ (2) any delays (e.g., newline) specified in the
+ entry will be set in the tty driver,
- (3) tabs expansion will be turned on or off
- according to the specification in the entry,
- and
+ (3) tabs expansion will be turned on or off
+ according to the specification in the entry,
+ and
- (4) if tabs are not expanded, standard tabs will
- be set (every 8 spaces).
+ (4) if tabs are not expanded, standard tabs will
+ be set (every 8 spaces).
If an entry does not contain the information needed
- for any of the four above activities, that activity
- will silently be skipped.
+ for any of these activities, that activity will
+ silently be skipped.
- reset Instead of putting out initialization strings, the
- terminal's reset strings will be output if present
- (rs1, rs2, rs3, rf). If the reset strings are not
- present, but initialization strings are, the ini-
- tialization strings will be output. Otherwise,
+ reset Instead of putting out initialization strings, the
+ terminal's reset strings will be output if present
+ (rs1, rs2, rs3, rf). If the reset strings are not
+ present, but initialization strings are, the ini-
+ tialization strings will be output. Otherwise,
reset acts identically to init.
longname
- If the terminfo database is present and an entry
- for the user's terminal exists (see -Ttype above),
+ If the terminfo database is present and an entry
+ for the user's terminal exists (see -Ttype above),
then the long name of the terminal will be put out.
The long name is the last name in the first line of
the terminal's description in the terminfo database
[see term(5)].
- If tput is invoked by a link named reset, this has the
- same effect as tput reset. See tset for comparison, which
- has similar behavior.
+
+
+ tput handles the init and reset commands specially: it
+ allows for the possibility that it is invoked by a link
+ with those names.
+
+ If tput is invoked by a link named reset, this has the
+ same effect as tput reset. The tset(1) utility also
+ treats a link named reset specially:
+
+ o That utility resets the terminal modes and special
+ characters (not done here).
+
+ o On the other hand, tset's repertoire of terminal capa-
+ bilities for resetting the terminal is more limited,
+ i.e., only reset_1string, reset_2string and reset_file
+ in contrast to the tab-stops and margins which are set
+ by this utility.
+
+ o The reset program is usually an alias for tset, due to
+ the resetting of terminal modes and special charac-
+ ters.
+
+ If tput is invoked by a link named init, this has the same
+ effect as tput init. Again, you are less likely to use
+ that link because another program named init has a more
+ well-established use.
tput init
Initialize the terminal according to the type of ter-
- minal in the environmental variable TERM. This com-
- mand should be included in everyone's .profile after
+ minal in the environmental variable TERM. This com-
+ mand should be included in everyone's .profile after
the environmental variable TERM has been exported, as
illustrated on the profile(5) manual page.
tput -T5620 reset
- Reset an AT&T 5620 terminal, overriding the type of
+ Reset an AT&T 5620 terminal, overriding the type of
terminal in the environmental variable TERM.
tput cup 0 0
@@ -199,16 +226,16 @@
bold=`tput smso` offbold=`tput rmso`
Set the shell variables bold, to begin stand-out mode
sequence, and offbold, to end standout mode sequence,
- for the current terminal. This might be followed by
- a prompt: echo "${bold}Please type in your name:
+ for the current terminal. This might be followed by
+ a prompt: echo "${bold}Please type in your name:
${offbold}\c"
tput hc
- Set exit code to indicate if the current terminal is
+ Set exit code to indicate if the current terminal is
a hard copy terminal.
tput cup 23 4
- Send the sequence to move the cursor to row 23, col-
+ Send the sequence to move the cursor to row 23, col-
umn 4.
tput cup
@@ -216,8 +243,8 @@
parameters substituted.
tput longname
- Print the long name from the terminfo database for
- the type of terminal specified in the environmental
+ Print the long name from the terminfo database for
+ the type of terminal specified in the environmental
variable TERM.
tput -S <<!
@@ -226,10 +253,10 @@
> bold
> !
- This example shows tput processing several capabili-
- ties in one invocation. It clears the screen, moves
- the cursor to position 10, 10 and turns on bold
- (extra bright) mode. The list is terminated by an
+ This example shows tput processing several capabili-
+ ties in one invocation. It clears the screen, moves
+ the cursor to position 10, 10 and turns on bold
+ (extra bright) mode. The list is terminated by an
exclamation mark (!) on a line by itself.
@@ -239,46 +266,44 @@
/usr/share/tabset/*
tab settings for some terminals, in a format appro-
- priate to be output to the terminal (escape
- sequences that set margins and tabs); for more
+ priate to be output to the terminal (escape
+ sequences that set margins and tabs); for more
information, see the "Tabs and Initialization" sec-
tion of terminfo(5)
If the -S option is used, tput checks for errors from each
- line, and if any errors are found, will set the exit code
- to 4 plus the number of lines with errors. If no errors
- are found, the exit code is 0. No indication of which
+ line, and if any errors are found, will set the exit code
+ to 4 plus the number of lines with errors. If no errors
+ are found, the exit code is 0. No indication of which
line failed can be given so exit code 1 will never appear.
- Exit codes 2, 3, and 4 retain their usual interpretation.
+ Exit codes 2, 3, and 4 retain their usual interpretation.
If the -S option is not used, the exit code depends on the
type of capname:
- boolean
- a value of 0 is set for TRUE and 1 for FALSE.
+ boolean
+ a value of 0 is set for TRUE and 1 for FALSE.
- string a value of 0 is set if the capname is defined
- for this terminal type (the value of capname
- is returned on standard output); a value of 1
- is set if capname is not defined for this ter-
- minal type (nothing is written to standard
- output).
+ string a value of 0 is set if the capname is defined
+ for this terminal type (the value of capname is
+ returned on standard output); a value of 1 is
+ set if capname is not defined for this terminal
+ type (nothing is written to standard output).
- integer
- a value of 0 is always set, whether or not
- capname is defined for this terminal type. To
- determine if capname is defined for this ter-
- minal type, the user must test the value writ-
- ten to standard output. A value of -1 means
- that capname is not defined for this terminal
- type.
+ integer
+ a value of 0 is always set, whether or not cap-
+ name is defined for this terminal type. To
+ determine if capname is defined for this termi-
+ nal type, the user must test the value written
+ to standard output. A value of -1 means that
+ capname is not defined for this terminal type.
- other reset or init may fail to find their respec-
- tive files. In that case, the exit code is
- set to 4 + errno.
+ other reset or init may fail to find their respective
+ files. In that case, the exit code is set to 4
+ + errno.
- Any other exit code indicates an error; see the DIAGNOS-
+ Any other exit code indicates an error; see the DIAGNOS-
TICS section.
@@ -288,8 +313,8 @@
exit code error message
---------------------------------------------------------------------
- 0 (capname is a numeric variable that is not specified in
- the terminfo(5) database for this terminal type, e.g.
+ 0 (capname is a numeric variable that is not specified in
+ the terminfo(5) database for this terminal type, e.g.
tput -T450 lines and tput -T2621 xmc)
1 no error message is printed, see the EXIT CODES section.
2 usage error
@@ -300,36 +325,65 @@
- The longname and -S options, and the parameter-substitu-
- tion features used in the cup example, are not supported
+ The longname and -S options, and the parameter-substitu-
+ tion features used in the cup example, are not supported
in BSD curses or in AT&T/USL curses before SVr4.
- X/Open documents only the operands for clear, init and
- reset. In this implementation, clear is part of the cap-
- name support. Other implementations of tput on SVr4-based
- systems such as Solaris, IRIX64 and HPUX as well as others
- such as AIX and Tru64 provide support for capname oper-
- ands.
+ IEEE Std 1003.1/The Open Group Base Specifications Issue
+ 7 (POSIX.1-2008) documents only the operands for clear,
+ init and reset. There are a few interesting observations
+ to make regarding that:
- A few platforms such as FreeBSD and NetBSD recognize term-
- cap names rather than terminfo capability names in their
- respective tput commands.
+ o In this implementation, clear is part of the capname
+ support. The others (init and longname) do not corre-
+ spond to terminal capabilities.
+
+ o Other implementations of tput on SVr4-based systems
+ such as Solaris, IRIX64 and HPUX as well as others
+ such as AIX and Tru64 provide support for capname op-
+ erands.
+
+ o A few platforms such as FreeBSD recognize termcap
+ names rather than terminfo capability names in their
+ respective tput commands. Since 2010, NetBSD's tput
+ uses terminfo names. Before that, it (like FreeBSD)
+ recognized termcap names.
+
+ Because (apparently) all of the certified Unix systems
+ support the full set of capability names, the reasoning
+ for documenting only a few may not be apparent.
+
+ o X/Open Curses Issue 7 documents tput differently, with
+ capname and the other features used in this implemen-
+ tation.
+
+ o That is, there are two standards for tput: POSIX (a
+ subset) and X/Open Curses (the full implementation).
+ POSIX documents a subset to avoid the complication of
+ including X/Open Curses and the terminal capabilities
+ database.
+
+ o While it is certainly possible to write a tput program
+ without using curses, none of the systems which have a
+ curses implementation provide a tput utility which
+ does not provide the capname feature.
Most implementations which provide support for capname op-
- erands use the tparm function to expand parameters in it.
- That function expects a mixture of numeric and string
- parameters, requiring tput to know which type to use.
+ erands use the tparm function to expand parameters in it.
+ That function expects a mixture of numeric and string
+ parameters, requiring tput to know which type to use.
This implementation uses a table to determine that for the
- standard capname operands, and an internal library func-
+ standard capname operands, and an internal library func-
tion to analyze nonstandard capname operands. Other
- implementations may simply guess that an operand contain-
+ implementations may simply guess that an operand contain-
ing only digits is intended to be a number.
- clear(1), stty(1), tabs(1), terminfo(5), curs_termcap(3x).
+ clear(1), stty(1), tabs(1), tset(1), terminfo(5),
+ curs_termcap(3x).
- This describes ncurses version 6.0 (patch 20160326).
+ This describes ncurses version 6.0 (patch 20160402).
@@ -339,7 +393,13 @@
- NAME
- SYNOPSIS
-- DESCRIPTION
+- DESCRIPTION
+
+
- EXAMPLES
- FILES
- EXIT CODES
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index e5025198..e68112f8 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -315,7 +315,7 @@
csh(1), sh(1), stty(1), curs_terminfo(3x), tty(4),
terminfo(5), ttys(5), environ(7)
- This describes ncurses version 6.0 (patch 20160326).
+ This describes ncurses version 6.0 (patch 20160402).
diff --git a/man/tabs.1 b/man/tabs.1
index f6b797d7..ead73e5f 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 2008-2011,2013 Free Software Foundation, Inc. *
+.\" Copyright (c) 2008-2013,2016 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 *
@@ -26,9 +26,12 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: tabs.1,v 1.11 2013/06/22 18:11:57 tom Exp $
+.\" $Id: tabs.1,v 1.12 2016/04/02 23:40:46 tom Exp $
.TH @TABS@ 1 ""
.ds n 5
+.de bP
+.IP \(bu 4
+..
.SH NAME
\fB@TABS@\fR \- set tabs on a terminal
.SH SYNOPSIS
@@ -123,8 +126,14 @@ SNOBOL
UNIVAC 1100 Assembler
.SH PORTABILITY
.PP
-X/Open describes a \fB+m\fP option, to set a terminal's left-margin.
+IEEE Std 1003.1/The Open Group Base Specifications Issue 7 (POSIX.1-2008) describes
+a \fBtabs\fP utility. However
+.bP
+This standard describes a \fB+m\fP option, to set a terminal's left-margin.
Very few of the entries in the terminal database provide this capability.
+.bP
+There is no counterpart in X/Open Curses Issue 7 for this utility,
+unlike @TPUT@(3X).
.PP
The \fB\-d\fP (debug) and \fB\-n\fP (no-op) options are extensions not provided
by other implementations.
diff --git a/man/tput.1 b/man/tput.1
index a1b81bcb..750051ba 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
-.\" Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2012,2016 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 *
@@ -27,14 +27,17 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: tput.1,v 1.32 2012/07/14 21:06:45 tom Exp $
+.\" $Id: tput.1,v 1.36 2016/04/02 23:41:08 tom Exp $
.TH @TPUT@ 1 ""
.ds d @TERMINFO@
.ds n 1
+.de bP
+.IP \(bu 4
+..
.SH NAME
\fB@TPUT@\fR, \fBreset\fR \- initialize a terminal or query terminfo database
.SH SYNOPSIS
-\fB@TPUT@\fR [\fB\-T\fR\fItype\fR] \fIcapname\fR [\fIparms\fR ... ]
+\fB@TPUT@\fR [\fB\-T\fR\fItype\fR] \fIcapname\fR [\fIparameters\fR]
.br
\fB@TPUT@\fR [\fB\-T\fR\fItype\fR] \fBinit\fR
.br
@@ -52,7 +55,7 @@ values of terminal-dependent capabilities and information available to
the shell (see \fBsh\fR(1)), to initialize or reset the terminal, or
return the long name of the requested terminal type.
The result depends upon the capability's type:
-.RS
+.RS 3
.TP 5
string
\fB@TPUT@\fR writes the string to the standard output.
@@ -75,6 +78,7 @@ the application should test the exit code
(See the \fBEXIT CODES\fR and \fBDIAGNOSTICS\fR sections.)
For a complete list of capabilities
and the \fIcapname\fR associated with each, see \fBterminfo\fR(5).
+.SS Options
.TP
\fB\-T\fR\fItype\fR
indicates the \fItype\fR of terminal.
@@ -84,22 +88,6 @@ variable \fBTERM\fR.
If \fB\-T\fR is specified, then the shell
variables \fBLINES\fR and \fBCOLUMNS\fR will also be ignored.
.TP
-\fIcapname\fR
-indicates the capability from the \fBterminfo\fR database. When
-\fBtermcap\fR support is compiled in, the \fBtermcap\fR name for
-the capability is also accepted.
-.TP
-\fIparms\fR
-If the capability is a string that takes parameters, the arguments
-\fIparms\fR will be instantiated into the string.
-.IP
-Most parameters are numbers.
-Only a few terminfo capabilities require string parameters;
-\fB@TPUT@\fR uses a table to decide which to pass as strings.
-Normally \fB@TPUT@\fR uses \fBtparm\fR (3X) to perform the substitution.
-If no parameters are given for the capability,
-\fB@TPUT@\fR writes the string without performing the substitution.
-.TP
\fB\-S\fR
allows more than one capability per invocation of \fB@TPUT@\fR. The
capabilities must be passed to \fB@TPUT@\fR from the standard input
@@ -110,18 +98,34 @@ meaning of the \fB0\fR and \fB1\fR boolean and string exit codes (see the
EXIT CODES section).
.IP
Again, \fB@TPUT@\fR uses a table and the presence of parameters in its input
-to decide whether to use \fBtparm\fR (3X),
+to decide whether to use \fBtparm\fR(3X),
and how to interpret the parameters.
.TP
\fB\-V\fR
reports the version of ncurses which was used in this program, and exits.
+.SS Commands
+.TP
+\fIcapname\fR
+indicates the capability from the \fBterminfo\fR database. When
+\fBtermcap\fR support is compiled in, the \fBtermcap\fR name for
+the capability is also accepted.
+.IP
+If the capability is a string that takes parameters, the arguments
+following the capability will be used as parameters for the string.
+.IP
+Most parameters are numbers.
+Only a few terminfo capabilities require string parameters;
+\fB@TPUT@\fR uses a table to decide which to pass as strings.
+Normally \fB@TPUT@\fR uses \fBtparm\fR(3X) to perform the substitution.
+If no parameters are given for the capability,
+\fB@TPUT@\fR writes the string without performing the substitution.
.TP
\fBinit\fR
If the \fBterminfo\fR database is present and an entry for the user's
terminal exists (see \fB\-T\fR\fItype\fR, above), the following will
occur:
.RS
-.TP
+.TP 5
(1)
if present, the terminal's initialization strings will be
output as detailed in the \fBterminfo\fR(5) section on
@@ -141,7 +145,7 @@ standard tabs will be set (every 8 spaces).
.RE
.IP
If an entry does not
-contain the information needed for any of the four above activities,
+contain the information needed for any of these activities,
that activity will silently be skipped.
.TP
\fBreset\fR
@@ -157,10 +161,27 @@ user's terminal exists (see \fB\-T\fR\fItype\fR above), then the long name
of the terminal will be put out. The long name is the last
name in the first line of the terminal's description in the
\fBterminfo\fR database [see \fBterm\fR(5)].
+.SS Aliases
+\fB@TPUT@\fR handles the \fBinit\fP and \fBreset\fP commands specially:
+it allows for the possibility that it is invoked by a link with those names.
.PP
If \fB@TPUT@\fR is invoked by a link named \fBreset\fR, this has the
same effect as \fB@TPUT@ reset\fR.
-See \fB@TSET@\fR for comparison, which has similar behavior.
+The \fB@TSET@\fR(\*n) utility also treats a link named \fBreset\fP specially:
+.bP
+That utility resets the terminal modes and special characters (not done here).
+.bP
+On the other hand, @TSET@'s repertoire of terminal capabilities for
+resetting the terminal is more limited, i.e., only \fBreset_1string\fP, \fBreset_2string\fP and \fBreset_file\fP
+in contrast to the tab-stops and margins which are set by this utility.
+.bP
+The \fBreset\fP program is usually an alias for @TSET@,
+due to the resetting of terminal modes and special characters.
+.PP
+If \fB@TPUT@\fR is invoked by a link named \fBinit\fR, this has the
+same effect as \fB@TPUT@ init\fR.
+Again, you are less likely to use that link because another program
+named \fBinit\fP has a more well-established use.
.SH EXAMPLES
.TP 5
\fB@TPUT@ init\fR
@@ -248,7 +269,7 @@ exit code \fB1\fR will never appear. Exit codes \fB2\fR, \fB3\fR, and
\fB4\fR retain their usual interpretation.
If the \fB\-S\fR option is not used,
the exit code depends on the type of \fIcapname\fR:
-.RS 5
+.RS 3
.TP
.I boolean
a value of \fB0\fR is set for TRUE and \fB1\fR for FALSE.
@@ -302,15 +323,38 @@ The \fBlongname\fR and \fB\-S\fR options, and the parameter-substitution
features used in the \fBcup\fR example, are not supported in BSD curses or in
AT&T/USL curses before SVr4.
.PP
-X/Open documents only the operands for \fBclear\fP, \fBinit\fP and \fBreset\fP.
+IEEE Std 1003.1/The Open Group Base Specifications Issue 7 (POSIX.1-2008)
+documents only the operands for \fBclear\fP, \fBinit\fP and \fBreset\fP.
+There are a few interesting observations to make regarding that:
+.bP
In this implementation, \fBclear\fP is part of the \fIcapname\fR support.
+The others (\fBinit\fP and \fBlongname\fP) do not correspond to terminal
+capabilities.
+.bP
Other implementations of \fB@TPUT@\fP on
SVr4-based systems such as Solaris, IRIX64 and HPUX
as well as others such as AIX and Tru64
provide support for \fIcapname\fR operands.
-.PP
-A few platforms such as FreeBSD and NetBSD recognize termcap names rather
+.bP
+A few platforms such as FreeBSD recognize termcap names rather
than terminfo capability names in their respective \fB@TPUT@\fP commands.
+Since 2010, NetBSD's \fBtput\fP uses terminfo names.
+Before that, it (like FreeBSD) recognized termcap names.
+.PP
+Because (apparently) \fIall\fP of the certified Unix systems
+support the full set of capability names, the reasoning for documenting
+only a few may not be apparent.
+.bP
+X/Open Curses Issue 7 documents \fBtput\fP differently, with \fIcapname\fP
+and the other features used in this implementation.
+.bP
+That is, there are two standards for \fBtput\fP: POSIX (a subset) and X/Open Curses (the full implementation).
+POSIX documents a subset to avoid the complication of including X/Open Curses
+and the terminal capabilities database.
+.bP
+While it is certainly possible to write a \fBtput\fP program without using curses,
+none of the systems which have a curses implementation provide
+a \fBtput\fP utility which does not provide the \fIcapname\fP feature.
.PP
Most implementations which provide support for \fIcapname\fR operands
use the \fItparm\fP function to expand parameters in it.
@@ -322,9 +366,10 @@ function to analyze nonstandard \fIcapname\fR operands.
Other implementations may simply guess that an operand containing only digits
is intended to be a number.
.SH SEE ALSO
-\fB@CLEAR@\fR(1),
+\fB@CLEAR@\fR(\*n),
\fBstty\fR(1),
-\fBtabs\fR(\*n),
+\fB@TABS@\fR(\*n),
+\fB@TSET@\fR(\*n),
\fBterminfo\fR(5),
\fBcurs_termcap\fR(3X).
.PP
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index a02c8aee..6bf76d4a 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160326) unstable; urgency=low
+ncurses6 (6.0+20160402) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey Sat, 26 Mar 2016 08:23:50 -0400
+ -- Thomas E. Dickey Sat, 02 Apr 2016 15:01:57 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index a02c8aee..6bf76d4a 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160326) unstable; urgency=low
+ncurses6 (6.0+20160402) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey Sat, 26 Mar 2016 08:23:50 -0400
+ -- Thomas E. Dickey Sat, 02 Apr 2016 15:01:57 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
diff --git a/package/debian/changelog b/package/debian/changelog
index 3e5b6464..25f48eaf 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160326) unstable; urgency=low
+ncurses6 (6.0+20160402) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey Sat, 26 Mar 2016 08:23:50 -0400
+ -- Thomas E. Dickey Sat, 02 Apr 2016 15:01:57 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index d19162c3..e9b103e6 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.151 2016/03/26 12:23:50 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.152 2016/04/02 19:01:57 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "0"
!define VERSION_YYYY "2016"
-!define VERSION_MMDD "0326"
+!define VERSION_MMDD "0402"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index ef044b98..bf6b0a33 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20160326
+Release: 20160402
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index f4c60119..cc893995 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20160326
+Release: 20160402
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/README b/test/README
index 350c2545..7bab08b2 100644
--- a/test/README
+++ b/test/README
@@ -1,5 +1,5 @@
-------------------------------------------------------------------------------
--- Copyright (c) 1998-2013,2015 Free Software Foundation, Inc. --
+-- Copyright (c) 1998-2015,2016 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 --
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: README,v 1.53 2015/12/06 00:38:26 tom Exp $
+-- $Id: README,v 1.55 2016/04/02 23:57:07 tom Exp $
-------------------------------------------------------------------------------
The programs in this directory are used to test and demonstrate ncurses.
@@ -233,7 +233,7 @@ BC test: demo_termcap
COLORS test: dots_curses echochar ncurses savescreen xmas
COLOR_PAIR test: background blue bs cardfile clip_printw demo_forms demo_menus demo_panels dots_curses 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
COLOR_PAIRS test: dots_curses echochar ncurses newdemo savescreen
-COLS test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_curses echochar edit_field firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain 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
+COLS test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_curses echochar edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain 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
ESCDELAY test: test_opaque
LINES test: cardfile demo_defkey demo_keyok demo_menus demo_panels ditto dots_curses echochar edit_field firework hanoi hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain 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
PAIR_NUMBER test: ncurses
@@ -250,7 +250,7 @@ addchnstr test: test_addchstr
addchstr test: test_addchstr
addnstr test: test_addstr
addnwstr test: ncurses test_addwstr
-addstr test: blue bs cardfile gdc hanoi lrtest ncurses test_addstr
+addstr test: blue bs cardfile filter gdc hanoi lrtest ncurses test_addstr
addwstr test: test_addwstr
assume_default_colors test: background ncurses
assume_default_colors_sp -
@@ -260,7 +260,7 @@ attr_on test: ncurses
attr_set test: ncurses
attroff test: dots_curses echochar filter gdc ncurses tclock
attron test: bs dots_curses echochar filter gdc ncurses
-attrset test: bs firework gdc hanoi insdelln ncurses rain tclock testaddch testcurs
+attrset test: bs filter 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
@@ -284,7 +284,7 @@ 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 foldkeys form_driver_w hanoi hashtest movewindow ncurses view
+clrtoeol test: blue bs demo_altkeys filter foldkeys form_driver_w hanoi hashtest movewindow ncurses view
color_content test: ncurses
color_content_sp -
color_set test: color_set ncurses
@@ -324,7 +324,7 @@ erasechar_sp lib: ncurses
erasewchar -
filter test: filter
filter_sp -
-flash test: cardfile lrtest movewindow ncurses tclock testcurs
+flash test: cardfile filter lrtest movewindow ncurses tclock testcurs
flash_sp -
flushinp test: ncurses newdemo testcurs
flushinp_sp lib: ncurses
@@ -339,11 +339,11 @@ getbkgd test: ncurses
getbkgrnd test: ncurses
getcchar test: ncurses view
getch test: background blue bs chgat color_set demo_altkeys filter firework firstlast foldkeys hanoi hashtest insdelln lrtest savescreen tclock test_opaque testaddch testcurs view xmas
-getcurx test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels firstlast foldkeys insdelln movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs
-getcury test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels edit_field firstlast foldkeys insdelln movewindow ncurses redraw savescreen test_opaque testcurs
+getcurx test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels filter firstlast foldkeys insdelln movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs
+getcury test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels edit_field filter firstlast foldkeys insdelln movewindow ncurses redraw savescreen test_opaque testcurs
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 testcurs
+getmouse test: bs demo_menus knight movewindow ncurses testcurs
getmouse_sp -
getn_wstr test: test_get_wstr
getnstr test: filter ncurses test_getstr
@@ -431,12 +431,12 @@ longname_sp -
mcprint -
mcprint_sp -
meta test: key_names keynames ncurses
-mouse_trafo -
+mouse_trafo lib: form
mouseinterval -
mouseinterval_sp -
mousemask test: bs demo_forms demo_menus knight movewindow ncurses testcurs
mousemask_sp -
-move test: blue bs cardfile chgat demo_altkeys demo_menus dots_curses 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
+move test: blue bs cardfile chgat demo_altkeys demo_menus dots_curses echochar filter 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
mvadd_wchstr test: test_add_wchstr
@@ -662,14 +662,14 @@ tgetnum test: demo_termcap dots_termcap railroad
tgetnum_sp -
tgetstr test: demo_termcap dots_termcap railroad
tgetstr_sp -
-tgoto test: dots_termcap railroad
+tgoto test: dots_termcap railroad progs: tic
tigetflag test: demo_terminfo progs: tic tput
tigetflag_sp -
tigetnum test: demo_terminfo ncurses progs: tput
tigetnum_sp -
tigetstr test: demo_defkey demo_terminfo foldkeys test_sgr testcurs progs: clear tput
tigetstr_sp -
-timeout test: rain savescreen
+timeout test: filter 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 savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
@@ -686,7 +686,7 @@ unget_wch -
unget_wch_sp -
ungetch test: bs knight
ungetch_sp lib: ncurses
-ungetmouse -
+ungetmouse lib: menu
ungetmouse_sp -
untouchwin lib: form
use_default_colors test: background filter firework gdc hanoi knight ncurses rain tclock worm xmas
@@ -785,7 +785,7 @@ wnoutrefresh test: demo_menus ditto edit_field inch_wide inchs ins_wide insert
wprintw test: chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
wredrawln test: redraw
wrefresh test: chgat clip_printw demo_forms demo_keyok demo_menus demo_panels edit_field firstlast ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testcurs view worm xmas
-wresize test: cardfile ncurses
+wresize test: cardfile demo_menus ncurses
wscanw test: testcurs
wscrl test: ncurses testcurs
wsetscrreg test: ncurses testcurs