From 0948e2c7ac34642a1f8a3a85000933bcbb258cff Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 17 Aug 2014 01:15:55 +0000 Subject: [PATCH] ncurses 5.9 - patch 20140816 + fix colors in ncurses 'b' test which did not work after changing it to put the test-strings in subwindows (cf: 20140705). + merge redundant SEE-ALSO sections in form and menu manpages. --- NEWS | 7 ++++++- dist.mk | 4 ++-- doc/html/man/adacurses-config.1.html | 2 +- doc/html/man/captoinfo.1m.html | 2 +- doc/html/man/clear.1.html | 2 +- doc/html/man/form.3x.html | 23 ++++++++++------------- doc/html/man/infocmp.1m.html | 2 +- doc/html/man/infotocap.1m.html | 2 +- doc/html/man/menu.3x.html | 23 ++++++++++------------- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/ncurses5-config.1.html | 2 +- doc/html/man/panel.3x.html | 2 +- doc/html/man/tabs.1.html | 2 +- doc/html/man/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 +- man/form.3x | 10 +++++----- man/menu.3x | 10 +++++----- ncurses/base/lib_addch.c | 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 +- test/ncurses.c | 4 +++- 28 files changed, 67 insertions(+), 66 deletions(-) diff --git a/NEWS b/NEWS index bdd262a0..0d7b26fd 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.2257 2014/08/09 22:05:47 tom Exp $ +-- $Id: NEWS,v 1.2260 2014/08/16 23:28:26 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. +20140816 + + fix colors in ncurses 'b' test which did not work after changing + it to put the test-strings in subwindows (cf: 20140705). + + merge redundant SEE-ALSO sections in form and menu manpages. + 20140809 + modify declarations for user-data pointers in C++ binding to use reinterpret_cast to facilitate converting typed pointers to void* diff --git a/dist.mk b/dist.mk index 9ace8158..1eecf461 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.1000 2014/08/09 00:33:11 tom Exp $ +# $Id: dist.mk,v 1.1001 2014/08/14 07:59:48 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 5 NCURSES_MINOR = 9 -NCURSES_PATCH = 20140809 +NCURSES_PATCH = 20140816 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/man/adacurses-config.1.html b/doc/html/man/adacurses-config.1.html index 72399e26..ec212b78 100644 --- a/doc/html/man/adacurses-config.1.html +++ b/doc/html/man/adacurses-config.1.html @@ -137,7 +137,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 5.9 (patch 20140809).
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index eec8372f..501004a1 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -205,7 +205,7 @@
 
SEE ALSO
        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 5.9 (patch 20140809).
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 4eb0ef63..175ee54d 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -71,7 +71,7 @@
 
SEE ALSO
        tput(1), terminfo(5)
 
-       This describes ncurses version 5.9 (patch 20140809).
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index c95854dd..e0f8bb2d 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -2,7 +2,7 @@
 
 
 
@@ -212,38 +212,35 @@
             The form driver code saw an unknown request code.
 
 
-

-
SEE ALSO
-       curses(3x) and related pages whose names begin "form_" for
-       detailed descriptions of the entry points.
-
-
 

 
NOTES
        The header file <form.h> automatically includes the header
        files <curses.h> and <eti.h>.
 
-       In  your  library  list,  libform.a should be before libn-
+       In your library list, libform.a  should  be  before  libn-
        curses.a; that is, you want to say `-lform -lncurses', not
-       the  other  way  around (which would give you a link error
+       the other way around (which would give you  a  link  error
        using most linkers).
 
 
 

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

 
AUTHORS
-       Juergen  Pfeifer.  Manual pages and adaptation for ncurses
+       Juergen Pfeifer.  Manual pages and adaptation for  ncurses
        by Eric S. Raymond.
 
 
 

 
SEE ALSO
-       This describes ncurses version 5.9 (patch 20140809).
+       curses(3x) and related pages whose names begin "form_" for
+       detailed descriptions of the entry points.
+
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 9bb33e91..47985108 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -455,7 +455,7 @@
 
        http://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 5.9 (patch 20140809).
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 

diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index a22c12f8..a3d9e40f 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -94,7 +94,7 @@
 
SEE ALSO
        curses(3x), tic(1m), infocmp(1m), terminfo(5)
 
-       This describes ncurses version 5.9 (patch 20140809).
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 

diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 5511ecd2..aa7183e6 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -2,7 +2,7 @@
 
 
 
@@ -195,38 +195,35 @@
             The menu driver code saw an unknown request code.
 
 
-
-

SEE ALSO

-       curses(3x) and related pages whose names begin "menu_" for
-       detailed descriptions of the entry points.
-
-

NOTES

        The header file <menu.h> automatically includes the header
        files <curses.h> and <eti.h>.
 
-       In  your  library  list,  libmenu.a should be before libn-
+       In your library list, libmenu.a  should  be  before  libn-
        curses.a; that is, you want to say `-lmenu -lncurses', not
-       the  other  way  around  (which would usually give a link-
+       the other way around (which would  usually  give  a  link-
        error).

PORTABILITY

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

AUTHORS

-       Juergen  Pfeifer.  Manual pages and adaptation for ncurses
+       Juergen Pfeifer.  Manual pages and adaptation for  ncurses
        by Eric S. Raymond.

SEE ALSO

-       This describes ncurses version 5.9 (patch 20140809).
+       curses(3x) and related pages whose names begin "menu_" for
+       detailed descriptions of the entry points.
+
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index ec387334..e7374652 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -63,7 +63,7 @@
        sonable optimization.  This implementation is "new curses"
        (ncurses) and is the approved replacement for 4.4BSD clas-
        sic  curses,  which has been discontinued.  This describes
-       ncurses version 5.9 (patch 20140809).
+       ncurses version 5.9 (patch 20140816).
 
        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/ncurses5-config.1.html b/doc/html/man/ncurses5-config.1.html
index 22c23995..443a751e 100644
--- a/doc/html/man/ncurses5-config.1.html
+++ b/doc/html/man/ncurses5-config.1.html
@@ -119,7 +119,7 @@
 
SEE ALSO
        curses(3x)
 
-       This describes ncurses version 5.9 (patch 20140809).
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 7ffd60c3..7acfd1f9 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -218,7 +218,7 @@
 
SEE ALSO
        curses(3x), curs_variables(3x),
 
-       This describes ncurses version 5.9 (patch 20140809).
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 

diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 028a9533..7d95fc7c 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -160,7 +160,7 @@
 
SEE ALSO
        tset(1), infocmp(1m), curses(3x), terminfo(5).
 
-       This describes ncurses version 5.9 (patch 20140809).
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index be06a704..850775ea 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -78,7 +78,7 @@
        nals by giving a set of capabilities which they  have,  by
        specifying how to perform screen operations, and by speci-
        fying padding requirements and  initialization  sequences.
-       This describes ncurses version 5.9 (patch 20140809).
+       This describes ncurses version 5.9 (patch 20140816).
 
        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 ea620b21..6c02845a 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -389,7 +389,7 @@
        infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
        curses(3x), term(5).  terminfo(5).
 
-       This describes ncurses version 5.9 (patch 20140809).
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 

diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 6d0700f5..261ab093 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -119,7 +119,7 @@
        tic(1m),    infocmp(1m),   captoinfo(1m),   infotocap(1m),
        curses(3x), terminfo(5).
 
-       This describes ncurses version 5.9 (patch 20140809).
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index e77d38a4..04861fe4 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -338,7 +338,7 @@
 
SEE ALSO
        clear(1), stty(1), tabs(1), terminfo(5), curs_termcap(3x).
 
-       This describes ncurses version 5.9 (patch 20140809).
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 821e13c0..24b0643f 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -319,7 +319,7 @@
        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
        terminfo(5), ttys(5), environ(7)
 
-       This describes ncurses version 5.9 (patch 20140809).
+       This describes ncurses version 5.9 (patch 20140816).
 
 
 
diff --git a/man/form.3x b/man/form.3x
index 775c8331..662b848f 100644
--- a/man/form.3x
+++ b/man/form.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2014 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,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form.3x,v 1.24 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form.3x,v 1.25 2014/08/16 20:31:45 tom Exp $
 .TH form 3X ""
 .SH NAME
 \fBform\fR \- curses extension for programming forms
@@ -189,9 +189,6 @@ System error occurred (see \fBerrno\fR).
 .TP 5
 .B E_UNKNOWN_COMMAND
 The form driver code saw an unknown request code.
-.SH SEE ALSO
-\fBcurses\fR(3X) and related pages whose names begin "form_" for detailed
-descriptions of the entry points.
 .SH NOTES
 The header file \fB\fR automatically includes the header files
 \fB\fR and \fB\fR.
@@ -206,5 +203,8 @@ Version 7 or BSD versions.
 Juergen Pfeifer.  Manual pages and adaptation for ncurses by Eric
 S. Raymond.
 .SH SEE ALSO
+\fBcurses\fR(3X) and related pages whose names begin "form_" for detailed
+descriptions of the entry points.
+.PP
 This describes \fBncurses\fR
 version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
diff --git a/man/menu.3x b/man/menu.3x
index ff3a19c0..c0be4695 100644
--- a/man/menu.3x
+++ b/man/menu.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2014 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,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu.3x,v 1.21 2010/12/04 18:40:45 tom Exp $
+.\" $Id: menu.3x,v 1.22 2014/08/16 20:32:08 tom Exp $
 .TH menu 3X ""
 .SH NAME
 \fBmenu\fR \- curses extension for programming menus
@@ -166,9 +166,6 @@ System error occurred (see \fBerrno\fR).
 .TP 5
 .B E_UNKNOWN_COMMAND
 The menu driver code saw an unknown request code.
-.SH SEE ALSO
-\fBcurses\fR(3X) and related pages whose names begin "menu_" for detailed
-descriptions of the entry points.
 .SH NOTES
 The header file \fB\fR automatically includes the header files
 \fB\fR and \fB\fR.
@@ -183,5 +180,8 @@ Version 7 or BSD versions.
 Juergen Pfeifer.  Manual pages and adaptation for ncurses by Eric
 S. Raymond.
 .SH SEE ALSO
+\fBcurses\fR(3X) and related pages whose names begin "menu_" for detailed
+descriptions of the entry points.
+.PP
 This describes \fBncurses\fR
 version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index a7d498b4..4b16a476 100644
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -36,7 +36,7 @@
 #include 
 #include 
 
-MODULE_ID("$Id: lib_addch.c,v 1.128 2014/02/23 01:21:08 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.129 2014/08/16 20:41:04 tom Exp $")
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
@@ -501,7 +501,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
     default:
 	while (*s) {
 	    NCURSES_CH_T sch;
-	    SetChar(sch, *s++, AttrOf(ch));
+	    SetChar(sch, UChar(*s++), AttrOf(ch));
 	    if_EXT_COLORS(SetPair(sch, GetPair(ch)));
 	    if (waddch_literal(win, sch) == ERR)
 		return ERR;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index ba55c0a3..1ef5f486 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (5.9-20140809) unstable; urgency=low
+ncurses6 (5.9-20140816) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Fri, 08 Aug 2014 20:33:11 -0400
+ -- Thomas E. Dickey   Thu, 14 Aug 2014 03:59:48 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index ba55c0a3..1ef5f486 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (5.9-20140809) unstable; urgency=low
+ncurses6 (5.9-20140816) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Fri, 08 Aug 2014 20:33:11 -0400
+ -- Thomas E. Dickey   Thu, 14 Aug 2014 03:59:48 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 90472eb2..dcbae98b 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (5.9-20140809) unstable; urgency=low
+ncurses6 (5.9-20140816) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Fri, 08 Aug 2014 20:33:11 -0400
+ -- Thomas E. Dickey   Thu, 14 Aug 2014 03:59:48 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 57ff6be0..58c34aa8 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.55 2014/08/09 00:33:11 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.56 2014/08/14 07:59:48 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "5"
 !define VERSION_MINOR "9"
 !define VERSION_YYYY  "2014"
-!define VERSION_MMDD  "0809"
+!define VERSION_MMDD  "0816"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index fbfee71a..620fa4bb 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: 5.9
-Release: 20140809
+Release: 20140816
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 44df9a70..b2da2b16 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 5.9
-Release: 20140809
+Release: 20140816
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/ncurses.c b/test/ncurses.c
index 345eadeb..ef75b425 100644
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -40,7 +40,7 @@ AUTHOR
    Author: Eric S. Raymond  1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.415 2014/08/09 22:28:42 tom Exp $
+$Id: ncurses.c,v 1.416 2014/08/16 23:30:20 tom Exp $
 
 ***************************************************************************/
 
@@ -1640,6 +1640,7 @@ attr_test(void)
 			beep();
 		    } else {
 			extras |= (chtype) COLOR_PAIR(pair);
+			normal &= ~A_COLOR;
 		    }
 		}
 	    }
@@ -1653,6 +1654,7 @@ attr_test(void)
 	    for (j = 0; j < my_size; ++j) {
 		bool arrow = (j == k);
 		row = show_attr(my_wins[j], row, n, arrow,
+				normal |
 				extras |
 				my_list[j].attr |
 				my_list[k].attr,
-- 
2.44.0