Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2018-02-15 13:18:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses" Thu Feb 15 13:18:53 2018 rev:142 rq:575524 version:6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2018-02-03 15:37:50.318441488 +0100 +++ /work/SRC/openSUSE:Factory/.ncurses.new/ncurses.changes 2018-02-15 13:18:55.050325485 +0100 @@ -1,0 +2,16 @@ +Mon Feb 5 08:15:58 UTC 2018 - [email protected] + +- Add ncurses patch 6.1-20180203 + + minor fixes to test/*.h to make them idempotent. + + add/use test/parse_rgb.h to show how the "RGB" capability works. + + add a clarification in user_caps.5 regarding "RGB" capability. + + add extended_slk_color{,_sp} symbols to the appropriate + package/*.{map,sym} files (report by Sven Joachim, cf: 20170401). + +------------------------------------------------------------------- +Tue Jan 30 08:53:57 UTC 2018 - [email protected] + +- Add ncurses patch 6.1-20180129 + + update "VERSION" file, used in shared-library naming. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses-6.1-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-6.1-20180129.patch new/patches/ncurses-6.1-20180129.patch --- old/patches/ncurses-6.1-20180129.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-6.1-20180129.patch 2018-01-30 09:51:27.563124043 +0100 @@ -0,0 +1,165 @@ +# ncurses 6.1 - patch 20180129 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.1 is at +# ftp.gnu.org:/pub/gnu +# +# Patches for ncurses 6.1 can be found at +# ftp://ftp.invisible-island.net/ncurses/6.0 +# http://invisible-mirror.net/archives/ncurses/6.1 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.0/ncurses-6.1-20180129.patch.gz +# patch by Thomas E. Dickey <[email protected]> +# created Tue Jan 30 01:18:41 UTC 2018 +# ------------------------------------------------------------------------------ +# NEWS | 7 ++++++- +# VERSION | 2 +- +# dist.mk | 4 ++-- +# package/debian-mingw/changelog | 4 ++-- +# package/debian-mingw64/changelog | 4 ++-- +# package/debian/changelog | 4 ++-- +# package/mingw-ncurses.nsi | 4 ++-- +# package/mingw-ncurses.spec | 2 +- +# package/ncurses.spec | 2 +- +# 9 files changed, 19 insertions(+), 14 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3069 +--- ncurses-6.1-20180127+/NEWS 2018-01-27 15:28:53.000000000 +0000 ++++ ncurses-6.1-20180129/NEWS 2018-01-30 00:35:11.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3069 2018/01/27 15:28:53 tom Exp $ ++-- $Id: NEWS,v 1.3071 2018/01/30 00:35:11 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,11 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20180129 ++ + update "VERSION" file, used in shared-library naming. ++ ++20180127 6.1 release for upload to ftp.gnu.org ++ + 20180127 + + updated release notes + + amend a warning message from tic which should have flagged misuse +Index: VERSION +--- ncurses-6.1-20180127+/VERSION 2018-01-22 11:40:27.000000000 +0000 ++++ ncurses-6.1-20180129/VERSION 2018-01-30 00:32:36.000000000 +0000 +@@ -1 +1 @@ +-5:0:9 6.0 20180127 ++5:0:10 6.1 20180129 +Index: dist.mk +Prereq: 1.1207 +--- ncurses-6.1-20180127+/dist.mk 2018-01-22 11:42:46.000000000 +0000 ++++ ncurses-6.1-20180129/dist.mk 2018-01-30 00:32:36.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1207 2018/01/22 11:42:46 tom Exp $ ++# $Id: dist.mk,v 1.1208 2018/01/30 00:32:36 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -37,7 +37,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 1 +-NCURSES_PATCH = 20180127 ++NCURSES_PATCH = 20180129 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: package/debian-mingw/changelog +--- ncurses-6.1-20180127+/package/debian-mingw/changelog 2018-01-23 01:01:38.000000000 +0000 ++++ ncurses-6.1-20180129/package/debian-mingw/changelog 2018-01-30 00:32:37.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20180127) unstable; urgency=low ++ncurses6 (6.1+20180129) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Mon, 22 Jan 2018 20:01:38 -0500 ++ -- Thomas E. Dickey <[email protected]> Mon, 29 Jan 2018 19:32:37 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.1-20180127+/package/debian-mingw64/changelog 2018-01-23 01:01:38.000000000 +0000 ++++ ncurses-6.1-20180129/package/debian-mingw64/changelog 2018-01-30 00:32:37.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20180127) unstable; urgency=low ++ncurses6 (6.1+20180129) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Mon, 22 Jan 2018 20:01:38 -0500 ++ -- Thomas E. Dickey <[email protected]> Mon, 29 Jan 2018 19:32:37 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.1-20180127+/package/debian/changelog 2018-01-23 01:01:38.000000000 +0000 ++++ ncurses-6.1-20180129/package/debian/changelog 2018-01-30 00:32:37.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20180127) unstable; urgency=low ++ncurses6 (6.1+20180129) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Mon, 22 Jan 2018 20:01:38 -0500 ++ -- Thomas E. Dickey <[email protected]> Mon, 29 Jan 2018 19:32:37 -0500 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.254 +--- ncurses-6.1-20180127+/package/mingw-ncurses.nsi 2018-01-23 01:01:38.000000000 +0000 ++++ ncurses-6.1-20180129/package/mingw-ncurses.nsi 2018-01-30 00:32:37.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.254 2018/01/23 01:01:38 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.255 2018/01/30 00:32:37 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "1" + !define VERSION_YYYY "2018" +-!define VERSION_MMDD "0127" ++!define VERSION_MMDD "0129" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.1-20180127+/package/mingw-ncurses.spec 2018-01-23 01:01:38.000000000 +0000 ++++ ncurses-6.1-20180129/package/mingw-ncurses.spec 2018-01-30 00:32:37.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.1 +-Release: 20180127 ++Release: 20180129 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.1-20180127+/package/ncurses.spec 2018-01-23 01:01:38.000000000 +0000 ++++ ncurses-6.1-20180129/package/ncurses.spec 2018-01-30 00:32:37.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.1 +-Release: 20180127 ++Release: 20180129 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-6.1-20180203.patch new/patches/ncurses-6.1-20180203.patch --- old/patches/ncurses-6.1-20180203.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-6.1-20180203.patch 2018-02-05 09:14:41.516793128 +0100 @@ -0,0 +1,821 @@ +# ncurses 6.1 - patch 20180203 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.1 is at +# ftp.gnu.org:/pub/gnu +# +# Patches for ncurses 6.1 can be found at +# ftp://ftp.invisible-island.net/ncurses/6.1 +# http://invisible-mirror.net/archives/ncurses/6.1 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20180203.patch.gz +# patch by Thomas E. Dickey <[email protected]> +# created Sun Feb 4 02:13:47 UTC 2018 +# ------------------------------------------------------------------------------ +# MANIFEST | 1 +# NEWS | 9 ++ +# VERSION | 2 +# dist.mk | 4 - +# doc/html/man/adacurses6-config.1.html | 2 +# doc/html/man/captoinfo.1m.html | 2 +# doc/html/man/clear.1.html | 2 +# doc/html/man/form.3x.html | 2 +# doc/html/man/infocmp.1m.html | 2 +# doc/html/man/infotocap.1m.html | 2 +# doc/html/man/menu.3x.html | 2 +# doc/html/man/ncurses.3x.html | 2 +# doc/html/man/ncurses6-config.1.html | 2 +# doc/html/man/panel.3x.html | 2 +# doc/html/man/tabs.1.html | 2 +# doc/html/man/terminfo.5.html | 2 +# doc/html/man/tic.1m.html | 2 +# doc/html/man/toe.1m.html | 2 +# doc/html/man/tput.1.html | 2 +# doc/html/man/tset.1.html | 2 +# doc/html/man/user_caps.5.html | 12 ++- +# man/user_caps.5 | 10 ++- +# ncurses-6.1-20180203/test/parse_rgb.h | 98 ++++++++++++++++++++++++++++++++ +# package/debian-mingw/changelog | 4 - +# package/debian-mingw64/changelog | 4 - +# package/debian/changelog | 4 - +# package/mingw-ncurses.nsi | 4 - +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# package/ncursestw.map | 4 - +# package/ncursestw.sym | 4 - +# package/ncursesw.map | 4 - +# package/ncursesw.sym | 4 - +# test/linedata.h | 14 ++++ +# test/modules | 6 - +# test/popup_msg.h | 6 - +# test/savescreen.c | 57 +++++++++--------- +# 37 files changed, 213 insertions(+), 74 deletions(-) +# ------------------------------------------------------------------------------ +Index: MANIFEST +--- ncurses-6.1-20180129+/MANIFEST 2017-11-14 09:13:28.000000000 +0000 ++++ ncurses-6.1-20180203/MANIFEST 2018-02-03 23:46:13.000000000 +0000 +@@ -1172,6 +1172,7 @@ + ./test/package/mingw-ncurses-examples.spec + ./test/package/ncurses-examples.spec + ./test/padview.c ++./test/parse_rgb.h + ./test/picsmap.c + ./test/picsmap.h + ./test/popup_msg.c +Index: NEWS +Prereq: 1.3071 +--- ncurses-6.1-20180129+/NEWS 2018-01-30 00:35:11.000000000 +0000 ++++ ncurses-6.1-20180203/NEWS 2018-02-04 01:14:28.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3071 2018/01/30 00:35:11 tom Exp $ ++-- $Id: NEWS,v 1.3076 2018/02/04 01:14:28 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,13 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20180203 ++ + minor fixes to test/*.h to make them idempotent. ++ + add/use test/parse_rgb.h to show how the "RGB" capability works. ++ + add a clarification in user_caps.5 regarding "RGB" capability. ++ + add extended_slk_color{,_sp} symbols to the appropriate ++ package/*.{map,sym} files (report by Sven Joachim, cf: 20170401). ++ + 20180129 + + update "VERSION" file, used in shared-library naming. + +Index: VERSION +--- ncurses-6.1-20180129+/VERSION 2018-01-30 00:32:36.000000000 +0000 ++++ ncurses-6.1-20180203/VERSION 2018-01-31 20:55:08.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.1 20180129 ++5:0:10 6.1 20180203 +Index: dist.mk +Prereq: 1.1208 +--- ncurses-6.1-20180129+/dist.mk 2018-01-30 00:32:36.000000000 +0000 ++++ ncurses-6.1-20180203/dist.mk 2018-01-31 20:55:08.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1208 2018/01/30 00:32:36 tom Exp $ ++# $Id: dist.mk,v 1.1209 2018/01/31 20:55:08 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -37,7 +37,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 1 +-NCURSES_PATCH = 20180129 ++NCURSES_PATCH = 20180203 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: doc/html/man/adacurses6-config.1.html +--- ncurses-6.1-20180129+/doc/html/man/adacurses6-config.1.html 2018-01-23 10:23:17.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/adacurses6-config.1.html 2018-02-04 00:43:10.000000000 +0000 +@@ -125,7 +125,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + +Index: doc/html/man/captoinfo.1m.html +--- ncurses-6.1-20180129+/doc/html/man/captoinfo.1m.html 2018-01-23 10:23:17.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/captoinfo.1m.html 2018-02-04 00:43:10.000000000 +0000 +@@ -190,7 +190,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/clear.1.html +--- ncurses-6.1-20180129+/doc/html/man/clear.1.html 2018-01-23 10:23:17.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/clear.1.html 2018-02-04 00:43:10.000000000 +0000 +@@ -148,7 +148,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + +Index: doc/html/man/form.3x.html +--- ncurses-6.1-20180129+/doc/html/man/form.3x.html 2018-01-23 10:23:19.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/form.3x.html 2018-02-04 00:43:12.000000000 +0000 +@@ -246,7 +246,7 @@ + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for detailed + descriptions of the entry points. + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + +Index: doc/html/man/infocmp.1m.html +--- ncurses-6.1-20180129+/doc/html/man/infocmp.1m.html 2018-01-23 10:23:20.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/infocmp.1m.html 2018-02-04 00:43:13.000000000 +0000 +@@ -481,7 +481,7 @@ + + https://invisible-island.net/ncurses/tctest.html + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/infotocap.1m.html +--- ncurses-6.1-20180129+/doc/html/man/infotocap.1m.html 2018-01-23 10:23:20.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/infotocap.1m.html 2018-02-04 00:43:13.000000000 +0000 +@@ -85,7 +85,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/menu.3x.html +--- ncurses-6.1-20180129+/doc/html/man/menu.3x.html 2018-01-23 10:23:20.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/menu.3x.html 2018-02-04 00:43:13.000000000 +0000 +@@ -221,7 +221,7 @@ + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for detailed + descriptions of the entry points. + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + +Index: doc/html/man/ncurses.3x.html +--- ncurses-6.1-20180129+/doc/html/man/ncurses.3x.html 2018-01-23 10:23:21.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/ncurses.3x.html 2018-02-04 00:43:14.000000000 +0000 +@@ -59,7 +59,7 @@ + method of updating character screens with reasonable optimization. + This implementation is "new curses" (ncurses) and is the approved + replacement for 4.4BSD classic curses, which has been discontinued. +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + The <STRONG>ncurses</STRONG> library emulates the curses library of System V Release 4 + UNIX, and XPG4 (X/Open Portability Guide) curses (also known as XSI +Index: doc/html/man/ncurses6-config.1.html +--- ncurses-6.1-20180129+/doc/html/man/ncurses6-config.1.html 2018-01-23 10:23:21.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/ncurses6-config.1.html 2018-02-04 00:43:14.000000000 +0000 +@@ -112,7 +112,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + +Index: doc/html/man/panel.3x.html +--- ncurses-6.1-20180129+/doc/html/man/panel.3x.html 2018-01-23 10:23:21.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/panel.3x.html 2018-02-04 00:43:14.000000000 +0000 +@@ -204,7 +204,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/tabs.1.html +--- ncurses-6.1-20180129+/doc/html/man/tabs.1.html 2018-01-23 10:23:21.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/tabs.1.html 2018-02-04 00:43:14.000000000 +0000 +@@ -164,7 +164,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + +Index: doc/html/man/terminfo.5.html +--- ncurses-6.1-20180129+/doc/html/man/terminfo.5.html 2018-01-23 10:23:21.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/terminfo.5.html 2018-02-04 00:43:15.000000000 +0000 +@@ -74,7 +74,7 @@ + <EM>Terminfo</EM> describes terminals by giving a set of capabilities which they + have, by specifying how to perform screen operations, and by specifying + padding requirements and initialization sequences. This describes +- <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE> +Index: doc/html/man/tic.1m.html +--- ncurses-6.1-20180129+/doc/html/man/tic.1m.html 2018-01-23 10:23:21.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/tic.1m.html 2018-02-04 00:43:15.000000000 +0000 +@@ -364,7 +364,7 @@ + <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, + <STRONG><A HREF="term.5.html">term(5)</A></STRONG>. <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> +Index: doc/html/man/toe.1m.html +--- ncurses-6.1-20180129+/doc/html/man/toe.1m.html 2018-01-23 10:23:21.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/toe.1m.html 2018-02-04 00:43:15.000000000 +0000 +@@ -113,7 +113,7 @@ + <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG>ter-</STRONG> + <STRONG><A HREF="terminfo.5.html">minfo(5)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + +Index: doc/html/man/tput.1.html +--- ncurses-6.1-20180129+/doc/html/man/tput.1.html 2018-01-23 10:23:21.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/tput.1.html 2018-02-04 00:43:15.000000000 +0000 +@@ -482,7 +482,7 @@ + </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> + <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + +Index: doc/html/man/tset.1.html +--- ncurses-6.1-20180129+/doc/html/man/tset.1.html 2018-01-23 10:23:21.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/tset.1.html 2018-02-04 00:43:15.000000000 +0000 +@@ -389,7 +389,7 @@ + <STRONG>csh(1)</STRONG>, <STRONG>sh(1)</STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>tty(4)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, + <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG> + +- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180127). ++ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20180203). + + + +Index: doc/html/man/user_caps.5.html +--- ncurses-6.1-20180129+/doc/html/man/user_caps.5.html 2018-01-01 14:19:36.000000000 +0000 ++++ ncurses-6.1-20180203/doc/html/man/user_caps.5.html 2018-02-04 00:43:15.000000000 +0000 +@@ -1,6 +1,6 @@ + <!-- + **************************************************************************** +- * Copyright (c) 2017 Free Software Foundation, Inc. * ++ * Copyright (c) 2017,2018 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,7 +26,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: user_caps.5,v 1.4 2017/11/25 20:13:12 tom Exp @ ++ * @Id: user_caps.5,v 1.6 2018/02/03 22:38:17 tom Exp @ + --> + <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> + <HTML> +@@ -194,6 +194,12 @@ + explicitly list the number of bits used for red, green and + blue components as a slash-separated list of decimal integers. + ++ Because there are several RGB encodings in use, applications ++ which make assumptions about the number of bits per color are ++ unlikely to work reliably. As a trivial case, for example, one ++ could define <STRONG>RGB#1</STRONG> to represent the standard eight ANSI colors, ++ i.e., one bit per color. ++ + U8 <EM>boolean</EM>, asserts that ncurses must use Unicode values for line- + drawing characters, and that it should ignore the alternate char- + acter set capabilities when the locale uses UTF-8 encoding. For +@@ -239,13 +245,13 @@ + ---------------------------------- + 2 Shift + 3 Alt ++ + 4 Shift + Alt + 5 Control + 6 Shift + Control + 7 Alt + Control + 8 Shift + Alt + Control + 9 Meta +- + 10 Meta + Shift + 11 Meta + Alt + 12 Meta + Alt + Shift +Index: man/user_caps.5 +Prereq: 1.4 +--- ncurses-6.1-20180129+/man/user_caps.5 2017-11-25 20:13:12.000000000 +0000 ++++ ncurses-6.1-20180203/man/user_caps.5 2018-02-03 22:38:17.000000000 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 2017 Free Software Foundation, Inc. * ++.\" Copyright (c) 2017,2018 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,7 +26,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: user_caps.5,v 1.4 2017/11/25 20:13:12 tom Exp $ ++.\" $Id: user_caps.5,v 1.6 2018/02/03 22:38:17 tom Exp $ + .TH user_caps 5 + .ie \n(.g .ds `` \(lq + .el .ds `` `` +@@ -203,6 +203,12 @@ + explicitly list the number of bits used for red, green and blue components + as a slash-separated list of decimal integers. + .RE ++.IP ++Because there are several RGB encodings in use, ++applications which make assumptions about the number of bits per color ++are unlikely to work reliably. ++As a trivial case, for example, one could define \fBRGB#1\fP ++to represent the standard eight ANSI colors, i.e., one bit per color. + .TP 3 + U8 + \fIboolean\fP, +Index: package/debian-mingw/changelog +--- ncurses-6.1-20180129+/package/debian-mingw/changelog 2018-01-30 00:32:37.000000000 +0000 ++++ ncurses-6.1-20180203/package/debian-mingw/changelog 2018-01-31 20:55:08.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20180129) unstable; urgency=low ++ncurses6 (6.1+20180203) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Mon, 29 Jan 2018 19:32:37 -0500 ++ -- Thomas E. Dickey <[email protected]> Wed, 31 Jan 2018 15:55:08 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.1-20180129+/package/debian-mingw64/changelog 2018-01-30 00:32:37.000000000 +0000 ++++ ncurses-6.1-20180203/package/debian-mingw64/changelog 2018-01-31 20:55:08.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20180129) unstable; urgency=low ++ncurses6 (6.1+20180203) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Mon, 29 Jan 2018 19:32:37 -0500 ++ -- Thomas E. Dickey <[email protected]> Wed, 31 Jan 2018 15:55:08 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.1-20180129+/package/debian/changelog 2018-01-30 00:32:37.000000000 +0000 ++++ ncurses-6.1-20180203/package/debian/changelog 2018-01-31 20:55:08.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20180129) unstable; urgency=low ++ncurses6 (6.1+20180203) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Mon, 29 Jan 2018 19:32:37 -0500 ++ -- Thomas E. Dickey <[email protected]> Wed, 31 Jan 2018 15:55:08 -0500 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.255 +--- ncurses-6.1-20180129+/package/mingw-ncurses.nsi 2018-01-30 00:32:37.000000000 +0000 ++++ ncurses-6.1-20180203/package/mingw-ncurses.nsi 2018-01-31 20:55:08.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.255 2018/01/30 00:32:37 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.256 2018/01/31 20:55:08 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "1" + !define VERSION_YYYY "2018" +-!define VERSION_MMDD "0129" ++!define VERSION_MMDD "0203" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.1-20180129+/package/mingw-ncurses.spec 2018-01-30 00:32:37.000000000 +0000 ++++ ncurses-6.1-20180203/package/mingw-ncurses.spec 2018-01-31 20:55:08.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.1 +-Release: 20180129 ++Release: 20180203 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.1-20180129+/package/ncurses.spec 2018-01-30 00:32:37.000000000 +0000 ++++ ncurses-6.1-20180203/package/ncurses.spec 2018-01-31 20:55:08.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.1 +-Release: 20180129 ++Release: 20180203 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursestw.map +Prereq: 1.42 +--- ncurses-6.1-20180129+/package/ncursestw.map 2017-12-30 20:51:38.000000000 +0000 ++++ ncurses-6.1-20180203/package/ncursestw.map 2018-01-31 23:58:06.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: ncursestw.map,v 1.42 2017/12/30 20:51:38 tom Exp $ ++# $Id: ncursestw.map,v 1.43 2018/01/31 23:58:06 tom Exp $ + # script for shared library symbol-versioning using ld + # + # This file was generated by ncu-mapsyms +@@ -1255,6 +1255,8 @@ + extended_color_content_sp; + extended_pair_content; + extended_pair_content_sp; ++ extended_slk_color; ++ extended_slk_color_sp; + find_pair; + find_pair_sp; + free_pair; +Index: package/ncursestw.sym +Prereq: 1.32 +--- ncurses-6.1-20180129+/package/ncursestw.sym 2017-08-11 17:33:23.000000000 +0000 ++++ ncurses-6.1-20180203/package/ncursestw.sym 2018-01-31 23:58:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: ncursestw.sym,v 1.32 2017/08/11 17:33:23 tom Exp $ ++# $Id: ncursestw.sym,v 1.33 2018/01/31 23:58:56 tom Exp $ + # script for shared library symbol-visibility using libtool + # + # This file was generated by ncu-mapsyms +@@ -343,6 +343,8 @@ + extended_color_content_sp + extended_pair_content + extended_pair_content_sp ++extended_slk_color ++extended_slk_color_sp + field_arg + field_back + field_buffer +Index: package/ncursesw.map +Prereq: 1.46 +--- ncurses-6.1-20180129+/package/ncursesw.map 2017-12-30 20:51:38.000000000 +0000 ++++ ncurses-6.1-20180203/package/ncursesw.map 2018-01-31 23:58:25.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: ncursesw.map,v 1.46 2017/12/30 20:51:38 tom Exp $ ++# $Id: ncursesw.map,v 1.47 2018/01/31 23:58:25 tom Exp $ + # script for shared library symbol-versioning using ld + # + # This file was generated by ncu-mapsyms +@@ -1278,6 +1278,8 @@ + extended_color_content_sp; + extended_pair_content; + extended_pair_content_sp; ++ extended_slk_color; ++ extended_slk_color_sp; + find_pair; + find_pair_sp; + free_pair; +Index: package/ncursesw.sym +Prereq: 1.32 +--- ncurses-6.1-20180129+/package/ncursesw.sym 2017-08-12 21:34:38.000000000 +0000 ++++ ncurses-6.1-20180203/package/ncursesw.sym 2018-01-31 23:58:44.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: ncursesw.sym,v 1.32 2017/08/12 21:34:38 tom Exp $ ++# $Id: ncursesw.sym,v 1.33 2018/01/31 23:58:44 tom Exp $ + # script for shared library symbol-visibility using libtool + # + # This file was generated by ncu-mapsyms +@@ -343,6 +343,8 @@ + extended_color_content_sp + extended_pair_content + extended_pair_content_sp ++extended_slk_color ++extended_slk_color_sp + field_arg + field_back + field_buffer +Index: test/linedata.h +--- ncurses-6.1-20180129+/test/linedata.h 2012-12-15 22:57:19.000000000 +0000 ++++ ncurses-6.1-20180203/test/linedata.h 2018-02-03 22:51:43.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2009-2010,2012 Free Software Foundation, Inc. * ++ * Copyright (c) 2009-2012,2018 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,6 +26,16 @@ + * authorization. * + ****************************************************************************/ + ++/* ++ * $Id: linedata.h,v 1.7 2018/02/03 22:51:43 tom Exp $ ++ * ++ * Utility functions for reading a line of text from a file. ++ */ ++#ifndef LINEDATA_H_incl ++#define LINEDATA_H_incl 1 ++ ++#include <test.priv.h> ++ + #define isQUIT(c) ((c) == QUIT || (c) == ESCAPE) + + #define key_RECUR CTRL('W') +@@ -96,3 +106,5 @@ + } + return result; + } ++ ++#endif /* LINEDATA_H_incl */ +Index: test/modules +Prereq: 1.66 +--- ncurses-6.1-20180129+/test/modules 2017-10-22 16:06:33.000000000 +0000 ++++ ncurses-6.1-20180203/test/modules 2018-02-03 23:45:16.000000000 +0000 +@@ -1,6 +1,6 @@ +-# $Id: modules,v 1.66 2017/10/22 16:06:33 tom Exp $ ++# $Id: modules,v 1.67 2018/02/03 23:45:16 tom Exp $ + ############################################################################## +-# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -84,7 +84,7 @@ + railroad progs $(srcdir) $(HEADER_DEPS) + rain progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h + redraw progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h +-savescreen progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h ++savescreen progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h $(srcdir)/parse_rgb.h + sp_tinfo progs $(srcdir) $(HEADER_DEPS) + tclock progs $(srcdir) $(HEADER_DEPS) + test_add_wchstr progs $(srcdir) $(HEADER_DEPS) $(srcdir)/linedata.h +Index: test/parse_rgb.h +--- /dev/null 2018-02-03 13:04:06.452000000 +0000 ++++ ncurses-6.1-20180203/test/parse_rgb.h 2018-02-03 23:40:53.000000000 +0000 +@@ -0,0 +1,98 @@ ++/**************************************************************************** ++ * Copyright (c) 2018 Free Software Foundation, Inc. * ++ * * ++ * Permission is hereby granted, free of charge, to any person obtaining a * ++ * copy of this software and associated documentation files (the * ++ * "Software"), to deal in the Software without restriction, including * ++ * without limitation the rights to use, copy, modify, merge, publish, * ++ * distribute, distribute with modifications, sublicense, and/or sell * ++ * copies of the Software, and to permit persons to whom the Software is * ++ * furnished to do so, subject to the following conditions: * ++ * * ++ * The above copyright notice and this permission notice shall be included * ++ * in all copies or substantial portions of the Software. * ++ * * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * ++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * ++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * ++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * ++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * ++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ++ * * ++ * Except as contained in this notice, the name(s) of the above copyright * ++ * holders shall not be used in advertising or otherwise to promote the * ++ * sale, use or other dealings in this Software without prior written * ++ * authorization. * ++ ****************************************************************************/ ++/* ++ * $Id: parse_rgb.h,v 1.4 2018/02/03 23:40:53 tom Exp $ ++ * ++ * Sample implementation of ncurses RGB extension from user_caps(5). ++ */ ++#ifndef PARSE_RBG_H_incl ++#define PARSE_RBG_H_incl 1 ++ ++#include <test.priv.h> ++ ++#if HAVE_TIGETSTR && USE_WIDEC_SUPPORT ++static int ++parse_rgb(int *r_max, int *g_max, int *b_max) ++{ ++ int colors = tigetnum("colors"); ++ int result = ERR; ++ ++ *r_max = *g_max = *b_max = 0; ++ ++ if (colors > 0) { ++ int max_bits; ++ int bits; ++ int pwr2; ++ int r = 0, g = 0, b = 0; ++ char *data; ++ char ch; ++ ++ for (max_bits = 0, pwr2 = 1; ++ pwr2 < colors; ++ ++max_bits, pwr2 <<= 1) { ++ ; ++ } ++ ++ if (tigetflag("RGB") > 0) { ++ result = OK; ++ r = g = b = (max_bits + 2) / 3; ++ } else if ((bits = tigetnum("RGB")) > 0) { ++ result = OK; ++ r = g = b = bits; ++ } else if ((data = tigetstr("RGB")) != ABSENT_STRING ++ && data != CANCELLED_STRING ++ && sscanf(data, "%d/%d/%d%c", &r, &g, &b, &ch) == 3) { ++ result = OK; ++ } ++ ++ if ((r + g + b) < max_bits) { ++ result = ERR; ++ } else if (result == 0) { ++ if (r > max_bits) { ++ r = max_bits; ++ g = b = 0; ++ } ++ *r_max = r; ++ if (g > (max_bits -= r)) { ++ g = max_bits; ++ b = 0; ++ } ++ *g_max = g; ++ if (b > (max_bits -= g)) { ++ b = max_bits; ++ } ++ *b_max = b; ++ } ++ } ++ return result; ++} ++#else ++#define parse_rgb(r,g,b) (ERR) ++#endif ++ ++#endif /* PARSE_RBG_H_incl */ +Index: test/popup_msg.h +Prereq: 1.3 +--- ncurses-6.1-20180129+/test/popup_msg.h 2017-04-15 19:16:35.000000000 +0000 ++++ ncurses-6.1-20180203/test/popup_msg.h 2018-02-03 21:07:55.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2003-2013,2017 Free Software Foundation, Inc. * ++ * Copyright (c) 2003-2017,2018 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,9 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: popup_msg.h,v 1.3 2017/04/15 19:16:35 tom Exp $ ++ * $Id: popup_msg.h,v 1.4 2018/02/03 21:07:55 tom Exp $ + * +- * Interface of edit_field.c ++ * Utility functions for a popup-message or help-screen. + */ + + #ifndef POPUP_MSG_H_incl +Index: test/savescreen.c +Prereq: 1.51 +--- ncurses-6.1-20180129+/test/savescreen.c 2018-01-14 17:39:47.000000000 +0000 ++++ ncurses-6.1-20180203/test/savescreen.c 2018-02-03 23:18:50.000000000 +0000 +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: savescreen.c,v 1.51 2018/01/14 17:39:47 tom Exp $ ++ * $Id: savescreen.c,v 1.52 2018/02/03 23:18:50 tom Exp $ + * + * Demonstrate save/restore functions from the curses library. + * Thomas Dickey - 2007/7/14 +@@ -34,6 +34,7 @@ + + #include <test.priv.h> + #include <popup_msg.h> ++#include <parse_rgb.h> + + #if HAVE_SCR_DUMP + +@@ -374,37 +375,37 @@ + init_pair((short) (n + MAX_ANSI), (short) n, (short) n); + } + #if HAVE_TIGETSTR && USE_WIDEC_SUPPORT +- else if (tigetflag("RGB") > 0) { +- int rows = LINES - 1; +- int cols = COLS - 1; +- /* FIXME: test all 3 types of capability */ +- int b_max = 255; +- int r_max = 255; +- int g_max = 255; +- int b_delta = (b_max / rows); +- int r_delta = (r_max / cols); +- int g_delta = (g_max / cols); +- int row = 0; +- +- b = 0; +- using_rgb = TRUE; +- while (row++ < rows) { +- int col = 0; +- r = 0; +- g = g_max; +- while (col++ < cols) { +- int color = (((r * (g_max + 1)) + g) * (b_max + 1) +- + b + MAX_ANSI); ++ else { ++ int r_max, g_max, b_max; ++ ++ if (parse_rgb(&r_max, &g_max, &b_max) > 0) { ++ int rows = LINES - 1; ++ int cols = COLS - 1; ++ int b_delta = (b_max / rows); ++ int r_delta = (r_max / cols); ++ int g_delta = (g_max / cols); ++ int row = 0; ++ ++ b = 0; ++ using_rgb = TRUE; ++ while (row++ < rows) { ++ int col = 0; ++ r = 0; ++ g = g_max; ++ while (col++ < cols) { ++ int color = (((r * (g_max + 1)) + g) * (b_max + 1) ++ + b + MAX_ANSI); + #if HAVE_INIT_EXTENDED_COLOR +- init_extended_pair(pair, color, color); ++ init_extended_pair(pair, color, color); + #else +- init_pair(pair, color, color); ++ init_pair(pair, color, color); + #endif +- pair++; +- r += r_delta; +- g -= g_delta; ++ pair++; ++ r += r_delta; ++ g -= g_delta; ++ } ++ b += b_delta; + } +- b += b_delta; + } + } + #endif
