From 989279b4d718c26ccc7bad2dfba099e4788f5da3 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 17 Sep 2017 00:11:40 +0000 Subject: [PATCH] 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. --- NEWS | 6 +++++- VERSION | 2 +- dist.mk | 4 ++-- man/curs_util.3x | 23 ++++++++++++++++++----- ncurses/base/lib_set_term.c | 20 +++++++++++++------- ncurses/tinfo/tinfo_driver.c | 22 ++++++++++++++-------- 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/filter.c | 4 ++-- 13 files changed, 65 insertions(+), 36 deletions(-) diff --git a/NEWS b/NEWS index 6254ce4a..8a7e699b 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.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 5ea0db9f..9ce5da45 100644 --- 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 78f18a66..ad01240f 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.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 719beabd..8833612b 100644 --- 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 05fb445f..7ba58599 100644 --- 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 605f2d3d..f1c98ddf 100644 --- 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 6f6f983a..bf7a3b09 100644 --- 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 Sun, 03 Sep 2017 16:54:16 -0400 + -- Thomas E. Dickey 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 6f6f983a..bf7a3b09 100644 --- 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 Sun, 03 Sep 2017 16:54:16 -0400 + -- Thomas E. Dickey 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 396da58c..646b60d6 100644 --- 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 Sun, 03 Sep 2017 16:54:16 -0400 + -- Thomas E. Dickey 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 1d74f2db..9a0c1d14 100644 --- 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 $ +; $Id: mingw-ncurses.nsi,v 1.231 2017/09/10 17:21:32 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 "2017" -!define VERSION_MMDD "0909" +!define VERSION_MMDD "0916" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index f1f28603..a2962184 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: 20170909 +Release: 20170916 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 4cf67561..d67e1dbd 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: 20170909 +Release: 20170916 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/test/filter.c b/test/filter.c index 890adda3..2bd9b20f 100644 --- 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; } -- 2.44.0