ncurses 6.0 - patch 20170916

+ minor fix to test/filter.c to avoid clearing the command in one case.
+ modify filter() to discard clr_eos if back_color_erase is set.

diff --git a/NEWS b/NEWS
index 6254ce4a091c3c97b720a2bfc381c8255e8c9e44..8a7e699b0c0dc28d23a52be6cc71277d29f8b9d5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2949 2017/09/09 22:32:34 tom Exp $
+-- $Id: NEWS,v 1.2951 2017/09/11 21:43:24 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,10 @@ 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.
 
+20170916
+       + minor fix to test/filter.c to avoid clearing the command in one case.
+       + modify filter() to discard clr_eos if back_color_erase is set.
+
 20170909
        + improve wide-character implementation of myADDNSTR() in frm_driver.c,
          which was inconsistent with the normal implementation.

diff --git a/VERSION b/VERSION
index 5ea0db9fc21c7fcc59ee3fd502870577ed6f6fd1..9ce5da459b2aa73e5b33f4ddaca1b57e46052082 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:9  6.0     20170909
+5:0:9  6.0     20170916

diff --git a/dist.mk b/dist.mk
index 78f18a66d0571b2b9b17205ef4f8a10eac7364c1..ad01240fc3d7dccb90d5a31eb8151fd132c90bbc 100644 (file)
--- 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.1182 2017/09/03 20:54:16 tom Exp $
+# $Id: dist.mk,v 1.1183 2017/09/10 17:21:32 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 = 20170909
+NCURSES_PATCH = 20170916
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/man/curs_util.3x b/man/curs_util.3x
index 719beabd6d06f01a12b9c4ecbbcbefa721639ba8..8833612bfba8ff673cd8db3f9d64c9253f84caa6 100644 (file)
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.49 2017/05/30 21:09:21 tom Exp $
+.\" $Id: curs_util.3x,v 1.50 2017/09/10 21:20:35 tom Exp $
 .TH curs_util 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -124,10 +124,23 @@ the latter returns null where the former would display a meta character.
 .PP
 The \fBfilter\fR routine, if used, must be called before \fBinitscr\fR or
 \fBnewterm\fR are called.
-The effect is that, during those calls, \fBLINES\fR
-is set to 1; the capabilities \fBclear\fR, \fBcup\fR, \fBcud\fR, \fBcud1\fR,
-\fBcuu1\fR, \fBcuu\fR, \fBvpa\fR are disabled; and the \fBhome\fR string is
-set to the value of \fBcr\fR.
+Calling \fBfilter\fP causes these changes in initialization:
+.bP
+\fBLINES\fR is set to 1;
+.bP
+the capabilities
+\fBclear\fR,
+\fBcud1\fR,
+\fBcud\fR,
+\fBcup\fR,
+\fBcuu1\fR,
+\fBcuu\fR,
+\fBvpa\fR
+are disabled;
+.bP
+the capability \fBed\fP is disabled if \fBbce\fP is set;
+.bP
+and the \fBhome\fR string is set to the value of \fBcr\fR.
 .PP
 The \fBnofilter\fP routine cancels the effect of a preceding \fBfilter\fP
 call.

diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 05fb445fd52e15226c0c5f6138b1cde6197c45c8..7ba5859960f75aa4348e0d2662eee29be1d61c1d 100644 (file)
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -46,7 +46,7 @@
 #undef CUR
 #define CUR SP_TERMTYPE
 
-MODULE_ID("$Id: lib_set_term.c,v 1.166 2017/07/01 16:37:24 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.167 2017/09/10 21:09:16 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
@@ -369,13 +369,19 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 #ifdef USE_TERM_DRIVER
        CallDriver(sp, td_setfilter);
 #else
-       clear_screen = 0;
-       cursor_down = parm_down_cursor = 0;
-       cursor_address = 0;
-       cursor_up = parm_up_cursor = 0;
-       row_address = 0;
+       /* *INDENT-EQLS* */
+       clear_screen     = ABSENT_STRING;
+       cursor_address   = ABSENT_STRING;
+       cursor_down      = ABSENT_STRING;
+       cursor_up        = ABSENT_STRING;
+       parm_down_cursor = ABSENT_STRING;
+       parm_up_cursor   = ABSENT_STRING;
+       row_address      = ABSENT_STRING;
+       cursor_home      = carriage_return;
+
+       if (back_color_erase)
+           clr_eos = ABSENT_STRING;
 
-       cursor_home = carriage_return;
 #endif
        T(("filter screensize %dx%d", slines, scolumns));
     }

diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c
index 605f2d3db3a2053279016683c7fc0492539dd933..f1c98ddf72c96c0fc01e08d16a83935308bcab67 100644 (file)
--- a/ncurses/tinfo/tinfo_driver.c
+++ b/ncurses/tinfo/tinfo_driver.c
@@ -51,7 +51,7 @@
 # endif
 #endif
 
-MODULE_ID("$Id: tinfo_driver.c,v 1.58 2017/06/26 00:43:07 tom Exp $")
+MODULE_ID("$Id: tinfo_driver.c,v 1.59 2017/09/10 21:08:46 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -213,7 +213,7 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret)
     _nc_free_termtype2(&TerminalType(termp))
 #endif
 
-       if (generic_type) {
+    if (generic_type) {
        /*
         * BSD 4.3's termcap contains mis-typed "gn" for wy99.  Do a sanity
         * check before giving up.
@@ -1024,12 +1024,18 @@ drv_setfilter(TERMINAL_CONTROL_BLOCK * TCB)
 {
     AssertTCB();
 
-    clear_screen = 0;
-    cursor_down = parm_down_cursor = 0;
-    cursor_address = 0;
-    cursor_up = parm_up_cursor = 0;
-    row_address = 0;
-    cursor_home = carriage_return;
+    /* *INDENT-EQLS* */
+    clear_screen     = ABSENT_STRING;
+    cursor_address   = ABSENT_STRING;
+    cursor_down      = ABSENT_STRING;
+    cursor_up        = ABSENT_STRING;
+    parm_down_cursor = ABSENT_STRING;
+    parm_up_cursor   = ABSENT_STRING;
+    row_address      = ABSENT_STRING;
+    cursor_home      = carriage_return;
+
+    if (back_color_erase)
+       clr_eos = ABSENT_STRING;
 }
 
 static void

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 6f6f983a7c58394f553a9cd6418e70337022e8ce..bf7a3b09510454981d639eb064b77b2ab711273b 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170909) unstable; urgency=low
+ncurses6 (6.0+20170916) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 03 Sep 2017 16:54:16 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 10 Sep 2017 13:21:32 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 6f6f983a7c58394f553a9cd6418e70337022e8ce..bf7a3b09510454981d639eb064b77b2ab711273b 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170909) unstable; urgency=low
+ncurses6 (6.0+20170916) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 03 Sep 2017 16:54:16 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 10 Sep 2017 13:21:32 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index 396da58c5ec5a083c902cbfc5bae7b456bda1988..646b60d601fc5e5b66d1bd16a4b6ec20bc0062bc 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170909) unstable; urgency=low
+ncurses6 (6.0+20170916) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 03 Sep 2017 16:54:16 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 10 Sep 2017 13:21:32 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 1d74f2db539b7e2c7d6a246a72deece5ed5cc93a..9a0c1d14d2c5fc668dd8f84e8a91567c33600ebf 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.230 2017/09/03 20:54:16 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.231 2017/09/10 17:21:32 tom Exp $\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2017"\r
-!define VERSION_MMDD  "0909"\r
+!define VERSION_MMDD  "0916"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index f1f28603637b91dc85d06d0f14523e0c135aa49d..a29621849264fa1a0774d7b06d44d9a0dc8e3d52 100644 (file)
--- 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: 20170909
+Release: 20170916
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 4cf67561df7907ae65f982b7400799da2d7e9e52..d67e1dbdf58391beabaade51703637a6d3d9a19c 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0
-Release: 20170909
+Release: 20170916
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/test/filter.c b/test/filter.c
index 890adda3fbe23caf416a7225e6015e58e3ba3851..2bd9b20f881d4a1651b48d3035c259c70bc8c7da 100644 (file)
--- a/test/filter.c
+++ b/test/filter.c
@@ -29,7 +29,7 @@
 /*
  * Author:  Thomas E. Dickey 1998
  *
- * $Id: filter.c,v 1.30 2017/09/08 22:34:05 tom Exp $
+ * $Id: filter.c,v 1.31 2017/09/10 19:49:55 tom Exp $
  *
  * An example of the 'filter()' function in ncurses, this program prompts
  * for commands and executes them (like a command shell).  It illustrates
@@ -253,7 +253,7 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled)
     }
     attroff(underline);
     attroff(A_BOLD);
-    printw("\n");
+    refresh();
 
     return code;
 }