update to 6.1.20190728 [release 6.1.20190728-1mamba;Fri Aug 02 2019]

This commit is contained in:
Silvan Calarco 2024-01-06 07:33:57 +01:00
parent 9b69507f87
commit a6ecbc958d
30 changed files with 35249 additions and 96864 deletions

View File

@ -1,481 +0,0 @@
# ncurses 6.0 - patch 20160917 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160917.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Sep 18 02:03:51 UTC 2016
# ------------------------------------------------------------------------------
# Ada95/src/Makefile.in | 8 ++-
# Ada95/src/library.gpr | 7 +--
# MANIFEST | 1
# NEWS | 6 ++
# VERSION | 2
# dist.mk | 4 -
# ncurses-6.0-20160917/Ada95/src/library-cfg.sh | 50 ++++++++++++++++++++++++
# ncurses/tinfo/MKfallback.sh | 14 +++---
# ncurses/tinfo/write_entry.c | 4 -
# ncurses/win32con/win_driver.c | 6 +-
# 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 | 9 ++--
# test/worm.c | 10 ++--
# 18 files changed, 102 insertions(+), 39 deletions(-)
# ------------------------------------------------------------------------------
Index: Ada95/src/Makefile.in
Prereq: 1.72
--- ncurses-6.0-20160910+/Ada95/src/Makefile.in 2016-08-13 18:04:27.000000000 +0000
+++ ncurses-6.0-20160917/Ada95/src/Makefile.in 2016-09-18 00:25:32.000000000 +0000
@@ -28,7 +28,7 @@
#
# Author: Juergen Pfeifer, 1996
#
-# $Id: Makefile.in,v 1.72 2016/08/13 18:04:27 tom Exp $
+# $Id: Makefile.in,v 1.73 2016/09/18 00:25:32 tom Exp $
#
.SUFFIXES:
@@ -90,7 +90,7 @@
LIB_NAME = AdaCurses
SONAME = @ADA_SHAREDLIB@
-GNAT_PROJECT = $(srcdir)/library.gpr
+GNAT_PROJECT = AdaCurses.gpr
# build/source are the Ada95 tree
BUILD_DIR = ..
@@ -270,8 +270,10 @@
@USE_GNAT_PROJECTS@ $(ABASE)-trace.adb \
@USE_GNAT_PROJECTS@ $(STATIC_C_OBJS) \
@USE_GNAT_PROJECTS@ $(STATIC_DIRS)
+@USE_GNAT_PROJECTS@ $(SHELL) $(srcdir)/library-cfg.sh $(srcdir)/library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
@USE_GNAT_PROJECTS@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static
@USE_GNAT_PROJECTS@ $(AR) $(ARFLAGS) $@ $(STATIC_C_OBJS)
+@USE_GNAT_PROJECTS@ -rm -f $(GNAT_PROJECT)
@USE_GNAT_PROJECTS@
@USE_GNAT_LIBRARIES@install \
@USE_GNAT_LIBRARIES@install.libs :: \
@@ -302,7 +304,9 @@
@MAKE_ADA_SHAREDLIB@ $(SHARED_DIRS) \
@MAKE_ADA_SHAREDLIB@ $(SHARED_OBJS)
@MAKE_ADA_SHAREDLIB@ cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/
+@MAKE_ADA_SHAREDLIB@ $(SHELL) $(srcdir)/library-cfg.sh $(srcdir)/library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT)
@MAKE_ADA_SHAREDLIB@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic
+@MAKE_ADA_SHAREDLIB@ -rm -f $(GNAT_PROJECT)
install \
install.libs :: $(ADA_INCLUDE)
Index: Ada95/src/library-cfg.sh
--- /dev/null 2016-09-17 11:34:54.124000970 +0000
+++ ncurses-6.0-20160917/Ada95/src/library-cfg.sh 2016-09-17 23:45:03.000000000 +0000
@@ -0,0 +1,50 @@
+#!/bin/sh
+##############################################################################
+# Copyright (c) 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 "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: library-cfg.sh,v 1.1 2016/09/17 23:45:03 tom Exp $
+#
+# Work around incompatible behavior introduced with gnat6, which causes
+# gnatmake to attempt to compile all of the C objects which might be part of
+# the project. This can only work if we provide the compiler flags (done here
+# by making a copy of the project file with that information filled in).
+input=$1
+shift 1
+param=
+while test $# != 0
+do
+ test -n "$param" && param="$param,"
+ param="$param\"$1\""
+ shift 1
+done
+
+sed \
+ -e '/for Default_Switches ("C") use/s,-- ,,' \
+ -e '/for Default_Switches ("C") use/s% use .*'%" use($param);"% \
+ $input
+exit 0
Index: Ada95/src/library.gpr
Prereq: 1.9
--- ncurses-6.0-20160910+/Ada95/src/library.gpr 2014-06-01 01:13:09.000000000 +0000
+++ ncurses-6.0-20160917/Ada95/src/library.gpr 2016-09-18 00:25:54.000000000 +0000
@@ -25,10 +25,10 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
------------------------------------------------------------------------------
--- $Id: library.gpr,v 1.9 2014/06/01 01:13:09 tom Exp $
+-- $Id: library.gpr,v 1.10 2016/09/18 00:25:54 tom Exp $
-- http://gcc.gnu.org/onlinedocs/gnat_ugn_unw/Library-Projects.html
-- http://www.adaworld.com/debian/debian-ada-policy.html
-project Library is
+project AdaCurses is
Build_Dir := External ("BUILD_DIR");
Source_Dir := External ("SOURCE_DIR");
Source_Dir2 := External ("SOURCE_DIR2");
@@ -51,6 +51,7 @@
"-gnatafno",
"-gnatVa", -- All validity checks
"-gnatwa"); -- Activate all optional errors
+ -- for Default_Switches ("C") use
end Compiler;
for Languages use ("C", "Ada");
-end Library;
+end AdaCurses;
Index: MANIFEST
--- ncurses-6.0-20160910+/MANIFEST 2016-08-06 23:46:22.000000000 +0000
+++ ncurses-6.0-20160917/MANIFEST 2016-09-18 00:39:59.000000000 +0000
@@ -132,6 +132,7 @@
./Ada95/src/c_threaded_variables.h
./Ada95/src/c_varargs_to_ada.c
./Ada95/src/c_varargs_to_ada.h
+./Ada95/src/library-cfg.sh
./Ada95/src/library.gpr
./Ada95/src/modules
./Ada95/src/ncurses_compat.c
Index: NEWS
Prereq: 1.2664
--- ncurses-6.0-20160910+/NEWS 2016-09-10 22:07:14.000000000 +0000
+++ ncurses-6.0-20160917/NEWS 2016-09-18 00:38:06.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2664 2016/09/10 22:07:14 tom Exp $
+-- $Id: NEWS,v 1.2667 2016/09/18 00:38:06 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,10 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20160917
+ + build-fix for gnat6, which unhelpfully attempts to compile C files.
+ + fix typo in 20160910 changes (Debian #837892, patch by Sven Joachim).
+
20160910
+ trim dead code ifdef'd with HIDE_EINTR since 970830 (discussion with
Leon Winter).
Index: VERSION
--- ncurses-6.0-20160910+/VERSION 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/VERSION 2016-09-17 13:25:35.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20160910
+5:0:9 6.0 20160917
Index: dist.mk
Prereq: 1.1123
--- ncurses-6.0-20160910+/dist.mk 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/dist.mk 2016-09-17 13:25:35.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1123 2016/09/04 17:02:31 tom Exp $
+# $Id: dist.mk,v 1.1124 2016/09/17 13:25:35 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 = 0
-NCURSES_PATCH = 20160910
+NCURSES_PATCH = 20160917
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: ncurses/tinfo/MKfallback.sh
Prereq: 1.15
--- ncurses-6.0-20160910+/ncurses/tinfo/MKfallback.sh 2010-08-07 20:32:34.000000000 +0000
+++ ncurses-6.0-20160917/ncurses/tinfo/MKfallback.sh 2016-09-17 21:28:03.000000000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
##############################################################################
-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2010,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 "Software"), #
@@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: MKfallback.sh,v 1.15 2010/08/07 20:32:34 tom Exp $
+# $Id: MKfallback.sh,v 1.16 2016/09/17 21:28:03 tom Exp $
#
# MKfallback.sh -- create fallback table for entry reads
#
@@ -119,17 +119,19 @@
const TERMTYPE *tp;
for (tp = fallbacks;
- tp < fallbacks + sizeof(fallbacks)/sizeof(TERMTYPE);
- tp++)
- if (_nc_name_match(tp->term_names, name, "|"))
+ tp < fallbacks + sizeof(fallbacks)/sizeof(TERMTYPE);
+ tp++) {
+ if (_nc_name_match(tp->term_names, name, "|")) {
return(tp);
+ }
+ }
EOF
else
echo " /* the fallback list is empty */";
fi
cat <<EOF
- return((TERMTYPE *)0);
+ return((TERMTYPE *)0);
}
EOF
Index: ncurses/tinfo/write_entry.c
Prereq: 1.95
--- ncurses-6.0-20160910+/ncurses/tinfo/write_entry.c 2016-09-10 20:22:42.000000000 +0000
+++ ncurses-6.0-20160917/ncurses/tinfo/write_entry.c 2016-09-17 19:06:26.000000000 +0000
@@ -47,7 +47,7 @@
#define TRACE_OUT(p) /*nothing */
#endif
-MODULE_ID("$Id: write_entry.c,v 1.95 2016/09/10 20:22:42 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.96 2016/09/17 19:06:26 Sven.Joachim Exp $")
static int total_written;
@@ -443,7 +443,7 @@
_nc_STRNCPY(symlinkname, first_name, MY_SIZE);
} else {
_nc_STRCPY(symlinkname, "../", sizeof(symlinkname));
- _nc_STRNCPY(symlinkname + 3, first_name, MY_SIZE - 3);
+ _nc_STRNCPY(symlinkname + 3, filename, MY_SIZE - 3);
}
symlinkname[MY_SIZE] = '\0';
#endif /* USE_SYMLINKS */
Index: ncurses/win32con/win_driver.c
Prereq: 1.55
--- ncurses-6.0-20160910+/ncurses/win32con/win_driver.c 2015-02-28 21:30:23.000000000 +0000
+++ ncurses-6.0-20160917/ncurses/win32con/win_driver.c 2016-09-17 22:02:44.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,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 *
@@ -54,7 +54,7 @@
#define CUR my_term.type.
-MODULE_ID("$Id: win_driver.c,v 1.55 2015/02/28 21:30:23 tom Exp $")
+MODULE_ID("$Id: win_driver.c,v 1.56 2016/09/17 22:02:44 tom Exp $")
#ifndef __GNUC__
# error We need GCC to compile for MinGW
@@ -2108,7 +2108,7 @@
if (b && nRead > 0) {
if (rc < 0)
rc = 0;
- rc += nRead;
+ rc = rc + (int) nRead;
if (inp_rec.EventType == KEY_EVENT) {
if (!inp_rec.Event.KeyEvent.bKeyDown)
continue;
Index: package/debian-mingw/changelog
--- ncurses-6.0-20160910+/package/debian-mingw/changelog 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/package/debian-mingw/changelog 2016-09-17 13:25:35.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160910) unstable; urgency=low
+ncurses6 (6.0+20160917) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 04 Sep 2016 13:02:31 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Sep 2016 09:25:35 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20160910+/package/debian-mingw64/changelog 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/package/debian-mingw64/changelog 2016-09-17 13:25:35.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160910) unstable; urgency=low
+ncurses6 (6.0+20160917) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 04 Sep 2016 13:02:31 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Sep 2016 09:25:35 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20160910+/package/debian/changelog 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/package/debian/changelog 2016-09-17 13:25:35.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160910) unstable; urgency=low
+ncurses6 (6.0+20160917) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 04 Sep 2016 13:02:31 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Sep 2016 09:25:35 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.175
--- ncurses-6.0-20160910+/package/mingw-ncurses.nsi 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/package/mingw-ncurses.nsi 2016-09-17 13:25:35.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.175 2016/09/04 17:02:31 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.176 2016/09/17 13:25:35 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 "0910"
+!define VERSION_MMDD "0917"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20160910+/package/mingw-ncurses.spec 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/package/mingw-ncurses.spec 2016-09-17 13:25:35.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20160910
+Release: 20160917
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20160910+/package/ncurses.spec 2016-09-04 17:02:31.000000000 +0000
+++ ncurses-6.0-20160917/package/ncurses.spec 2016-09-17 13:25:35.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20160910
+Release: 20160917
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/ncurses.c
Prereq: 1.445
--- ncurses-6.0-20160910+/test/ncurses.c 2016-09-10 23:30:15.000000000 +0000
+++ ncurses-6.0-20160917/test/ncurses.c 2016-09-17 21:12:04.000000000 +0000
@@ -40,7 +40,7 @@
Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
Thomas E. Dickey (beginning revision 1.27 in 1996).
-$Id: ncurses.c,v 1.445 2016/09/10 23:30:15 tom Exp $
+$Id: ncurses.c,v 1.446 2016/09/17 21:12:04 tom Exp $
***************************************************************************/
@@ -2704,7 +2704,8 @@
int n;
int got;
char result[BUFSIZ];
- int check_n, check_r, check_g, check_b;
+ int check_n;
+ unsigned check_r, check_g, check_b;
raw();
noecho();
@@ -6925,11 +6926,11 @@
show_string_setting("longname", longname());
show_number_setting("baudrate", baudrate());
if (erasechar() > 0) {
- show_string_setting("unctrl(erasechar)", unctrl(erasechar()));
+ show_string_setting("unctrl(erasechar)", unctrl((chtype) erasechar()));
show_string_setting("keyname(erasechar)", keyname(erasechar()));
}
if (killchar() > 0) {
- show_string_setting("unctrl(killchar)", unctrl(killchar()));
+ show_string_setting("unctrl(killchar)", unctrl((chtype) killchar()));
show_string_setting("keyname(killchar)", keyname(killchar()));
}
#if USE_WIDEC_SUPPORT
Index: test/worm.c
Prereq: 1.65
--- ncurses-6.0-20160910+/test/worm.c 2013-06-22 20:01:41.000000000 +0000
+++ ncurses-6.0-20160917/test/worm.c 2016-09-17 21:12:30.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-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 *
@@ -61,7 +61,7 @@
traces will be dumped. The program stops and waits for one character of
input at the beginning and end of the interval.
- $Id: worm.c,v 1.65 2013/06/22 20:01:41 tom Exp $
+ $Id: worm.c,v 1.66 2016/09/17 21:12:30 tom Exp $
*/
#include <test.priv.h>
@@ -324,9 +324,9 @@
static bool
quit_worm(int bitnum)
{
- pending |= (1 << bitnum);
+ pending = (pending | (unsigned) (1 << bitnum));
napms(10); /* let the other thread(s) have a chance */
- pending &= ~(1 << bitnum);
+ pending = (pending & (unsigned) ~(1 << bitnum));
return quitting;
}
@@ -335,7 +335,7 @@
{
unsigned long compare = 0;
Trace(("start_worm"));
- while (!quit_worm(((struct worm *) arg) - worm)) {
+ while (!quit_worm((int) (((struct worm *) arg) - worm))) {
while (compare < sequence) {
++compare;
#if HAVE_USE_WINDOW

View File

@ -1,478 +0,0 @@
# ncurses 6.0 - patch 20160924 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20160924.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sat Sep 24 23:30:47 UTC 2016
# ------------------------------------------------------------------------------
# NEWS | 7 +
# VERSION | 2
# dist.mk | 4
# misc/terminfo.src | 214 +++++++++++++++++++++++++++++--------
# ncurses/tinfo/comp_expand.c | 10 +
# 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
# 11 files changed, 198 insertions(+), 59 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.2667
--- ncurses-6.0-20160917+/NEWS 2016-09-18 00:38:06.000000000 +0000
+++ ncurses-6.0-20160924/NEWS 2016-09-24 22:47:32.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2667 2016/09/18 00:38:06 tom Exp $
+-- $Id: NEWS,v 1.2670 2016/09/24 22:47:32 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.
+20160924
+ + modify _nc_tic_expand to escape comma if it immediately follows a
+ percent sign, to work with minitel change.
+ + updated minitel and viewdata descriptions (Alexandre Montaron).
+
20160917
+ build-fix for gnat6, which unhelpfully attempts to compile C files.
+ fix typo in 20160910 changes (Debian #837892, patch by Sven Joachim).
Index: VERSION
--- ncurses-6.0-20160917+/VERSION 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/VERSION 2016-09-24 13:36:42.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20160917
+5:0:9 6.0 20160924
Index: dist.mk
Prereq: 1.1124
--- ncurses-6.0-20160917+/dist.mk 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/dist.mk 2016-09-24 13:36:42.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1124 2016/09/17 13:25:35 tom Exp $
+# $Id: dist.mk,v 1.1125 2016/09/24 13:36:42 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 = 0
-NCURSES_PATCH = 20160917
+NCURSES_PATCH = 20160924
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: misc/terminfo.src
--- ncurses-6.0-20160917+/misc/terminfo.src 2016-08-17 08:17:26.000000000 +0000
+++ ncurses-6.0-20160924/misc/terminfo.src 2016-09-24 22:01:35.000000000 +0000
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.566 $
-# $Date: 2016/08/17 08:17:26 $
+# $Revision: 1.569 $
+# $Date: 2016/09/24 22:01:35 $
#
# The original header is preserved below for reference. It is noted that there
# is a "newer" version which differs in some cosmetic details (but actually
@@ -18709,64 +18709,186 @@
smacs=^N, smir=\E[4h, smso=\E[7m, smul=\E[4m, tsl=^_@A,
u6=\E[%i%d;%dR, u7=\E[6n,
-# From: Alexandre Montaron <canal@mygale.org>, 18 Jun 1998
+# From: Alexandre Montaron <canal@mygale.org>, 18 Jun 1998, updated 19 Sep 2016
#
minitel1|minitel 1,
- am, bw, eslok, hs, hz, msgr,
- colors#8, cols#40, lines#24, pairs#8,
- bel=^G, blink=\EH, civis=^T, clear=^L, cnorm=^Q, cr=^M,
- cub1=^H, cud1=^J, cuf1=^I,
- cup=\037%p1%'A'%+%c%p2%'A'%+%c, cuu1=^K, el=^X,
+ am, bw, eslok, hs, hz, .msgr, G0,
+ colors#8, cols#40, lines#24, pairs#8, .ncv#16,
+ acsc=j+k+l+m+n+o~q`s_t+u+v+w+x|, bel=^G, blink=\EH,
+ civis=^T, clear=^L, cnorm=^Q, cr=^M, cub1=^H, cud1=^J, cuf1=^I,
+ cup=\037%p1%'A'%+%c%p2%'A'%+%c, cuu1=^K,
+ dsl=\037@A\030\n, el=^X,
flash=\037@A\EW \177\022\177\022P\r\030\n, fsl=^J,
- home=^^, ind=^J, is2=\E;`ZQ\E\:iC\E\:iE\021, nel=^M^J,
- op=\EG, rep=%p1%c\022%p2%'?'%+%c, rev=\E], ri=^K,
- rmso=\E\\,
+ home=^^, ind=^J, is2=\E;`ZQ\E\:iC\E\:iE\021, kbs=^SG,
+ kcan=^SE, kend=^SI, kent=^SA, khlp=^SD, knp=^SH, kpp=^SB,
+ krfr=^SC, nel=^M^J, op=\EG, rep=%p1%c\022%p2%'?'%+%c,
+ rev=\E], ri=^K, rmso=\E\\,
+ rs2=\024\037XA\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\n\030\014\021,
+ setab=\0, setaf=\E%p1%'@'%+%c, setb=\0,
setf=\E%?%p1%{1}%=%tD%e%p1%{3}%=%tF%e%p1%{4}%=%tA%e%p1%{6}%=%tC%e%p1%'@'%+%c%;,
sgr=%?%p1%t\E]%;%?%p3%t\E]%;%?%p4%t\EH%;,
- sgr0=\EI\E\\, smso=\E], tsl=\037@%p1%'A'%+%c,
- u6=\037%c%'A'%-%c%'A'%-, u7=\Ea, .acsc=}#f0g1\,\,+../,
- .enacs=^Y, .rs2=^L, .u8=\001Br4\004, .u9=\E9{,
-# is2=Fnct TE, Fnct ER, Fnct CM et pour finir: curseur ON.
+ sgr0=\EI\E\\\EG, smso=\E], tsl=\037@%p1%'A'%+%c,
+ u6=\037%c%'A'%-%c%'A'%-, u7=\Ea,
+ u8=\001%[BCDEFGHIJKLbcresdfg0123456789]\004, u9=\E9{,
+ .dim=\EB, .hup=\E9g, .rs2=^L, .u8=\001Br4\004,
+ C0=`>a9f!j%k4l<m-n=p#q\,rpt=u5v-w<x5yvzy|l~$, E0=^O,
+ S0=^N,
+ XC=B\031%\,\241!\,\242"\,\243#\,\244$\,\245%\,\246&\,\247'\,\250(\,\253+\,\257P\,\2600\,\2611\,\2622\,\2633\,\2655\,\2677\,\272k\,\273;\,\274<\,\275=\,\276>\,\277?\,\300AA\,\301BA\,\302CA\,\303DA\,\304HA\,\305JA\,\306a\,\307KC\,\310AE\,\311BE\,\312CE\,\313HE\,\314AI\,\315BI\,\316CI\,\317HI\,\320b\,\321DN\,\322AO\,\323BO\,\324CO\,\325DO\,\326HO\,\3274\,\330i\,\331AU\,\332BU\,\333CU\,\334HU\,\335BY\,\336l\,\337{\,\340Aa\,\341Ba\,\342Ca\,\343Da\,\344Ha\,\345Ja\,\346q\,\347Kc\,\350Ae\,\351Be\,\352Ce\,\353He\,\354Ai\,\355Bi\,\356Ci\,\357Hi\,\360r\,\361Dn\,\362Ao\,\363Bo\,\364Co\,\365Do\,\366Ho\,\3678\,\370y\,\371Au\,\372Bu\,\373Cu\,\374Hu\,\375By\,\376|\,\377Hy\,\252c\,\,0\017\031%\016\,}#\,f0\,g1\,\\\,\\\,\,+.\,./\,0\177\,--,
minitel1b|minitel 1-bistandard (in 40cols mode),
mir,
cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
cuu=\E[%p1%dA, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
dl1=\E[M, ed=\E[J, el1=\E[1K, il=\E[%p1%dL, il1=\E[L,
- is1=\E;iYA\E;jYC, kclr=\E[2J, kctab=^I, kcub1=\E[D,
- kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M,
- khome=\E[H, kich1=\E[4h, kil1=\E[L, rmir=\E[4l, smir=\E[4h,
- .ich=\E[%p1%d@, .ich1=\E[@, .kel=^X, .rmkx=\E;jYA,
- .smkx=\E;iYA\E;jYC, .u8=\001Cu<\004, use=minitel1,
+ is1=\E;iYA\E;jYC, kbs@, kcan@, kclr=\E[2J, kctab=^I,
+ kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P,
+ kdl1=\E[M, kent@, kf1=^SD, kf10=^Y0, kf11=^Y1, kf12=^Y/,
+ kf13=^Y{1, kf14=^Y{2, kf15=^Y{3, kf16=^Y{4, kf17=^Y{5,
+ kf18=^Y{6, kf19=^Y{7, kf2=^SC, kf20=^Y{8, kf21=^Y{9,
+ kf22=^Y{0, kf23=^Y{*, kf24=^Y{#, kf3=^SF, kf4=^SA, kf5=^SG,
+ kf6=^SE, kf7=^Y8, kf8=^Y\,, kf9=^Y., khlp@, khome=\E[H,
+ kich1=\E[4h, kil1=\E[L, krfr@, lf1=Guide, lf2=Repetition,
+ lf3=Sommaire, lf4=Envoi, lf5=Correction, lf6=Annulation,
+ rmir=\E[4l, smir=\E[4h,
+ u8=\001%[ABCPtuvwxyz0123456789\:;<=>?]\004,
+ .ich=\E[%p1%d@, .ich1=\E[@, .kLFT=\E[P, .kRIT=\E[4h,
+ .kb2=^Y{g, .kcbt=^Y{i, .kel=^X, .mc0=\E\:|k, .rmkx=\E;jYA,
+ .rs1=\E[4l\E[2l, .smkx=\E;iYA\E;jYC, .u8=\001Cu<\004,
+ use=minitel1,
# rmkx posait des problemes (logout en sortant de vi).
minitel1b-80|minitel 1-bistandard (standard teleinformatique),
- am@, bw@, hz@,
+ am@, bw@, eslok@, hz@, msgr, G0,
colors@, cols#80, it#8, pairs@,
- blink=\E[5m, bold=\E[1m, civis=\037@A\024\n,
+ acsc@, blink=\E[5m, bold=\E[1m, civis=\037@A\024\n,
clear=\E[H\E[J, cnorm=\037@A\021\n, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H,
- ht=^I, ind=\ED, is1@, is2@, kbs=\EOl, kcan=\EOQ, kent=\EOM,
- kf0=\EOp, kf1=\EOq, kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu,
+ ht=^I, ind=\ED, is1@, is2@, kbs=\EOl, kcan=\EOQ, kend=\E)4\r,
+ kent=\EOM, kf1=\EOq, kf10=\EOp, kf11=\EOP1, kf12=\EOP2,
+ kf13=\EOP3, kf14=\EOP4, kf15=\EOP5, kf16=\EOP6, kf17=\EOP7,
+ kf18=\EOP8, kf19=\EOP9, kf2=\EOr, kf20=\EOP0, kf21=\EOP*,
+ kf22=\EOP#, kf23@, kf24@, kf3=\EOs, kf4=\EOt, kf5=\EOu,
kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, khlp=\EOm, knp=\EOn,
- kpp=\EOR, krfr=\EOS, nel=\EE, op@, rc=\E8, rep@, rev=\E[7m,
- ri=\EM, rmkx@, rmso=\E[27m, rmul=\E[24m, rs2=\E[H\E[J\E[m,
- sc=\E7, setf@, sgr@, sgr0=\E[m, smkx@, smso=\E[7m, smul=\E[4m,
- u6@, u7@, .acsc=}#f[, .enacs=^O, .mc0=\E[i, .rmacs=^O,
- .rs2=\Ec,
+ kpp=\EOR, krfr=\EOS, lf1@, lf2@, lf3@, lf4@, lf5@, lf6@, nel=\EE,
+ op@, rc=\E8, rep@, rev=\E[7m, ri=\EM, rmkx@, rmso=\E[27m,
+ rmul=\E[24m,
+ rs2=\036\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[L\E[12H\E[2M\E[H\E[J\E[m,
+ sc=\E7, setab@, setaf@, setb@, setf@, sgr@, sgr0=\E[m, smkx@,
+ smso=\E[7m, smul=\E[4m,
+ tsl=\037@%?%p1%{63}%<%t%p1%'A'%+%c%e\177%p1%{62}%-%Pa%?%ga%{1}%&%t\011%;%?%ga%{2}%&%t\011\011%;%?%ga%{4}%&%t\011\011\011\011%;%?%ga%{07}%>%t\011\011\011\011\011\011\011\011%;%?%ga%{15}%>%t\011\011\011\011\011\011\011\011%;%;,
+ u6@, u7@, u8@, u9@, .acsc=}#f[, .enacs=^O, .kb2=\EOPg,
+ .kcbt=\EOPi, .ll=\E[24H, .mc0=\E[i, .rmacs=^O, .rs2=\Ec,
.sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
- .smacs=^N, use=minitel1b,
+ .smacs=^N, C0=}#f[j+k+l+m+n+o~q=s_t+u+v+w+x!0\032,
+ E0=^O, S0=^N,
+ XC=B\016%\017\,\243#\,\247]\,\260[\,\340@\,\347\\\\\,\351{\,\350}\,\371|\,\300A\,\301A\,\302A\,\303A\,\304A\,\305A\,\306E\,\307C\,\310E\,\311E\,\312E\,\313E\,\314I\,\315I\,\316I\,\317I\,\320D\,\321N\,\322O\,\323O\,\324O\,\325O\,\326O\,\331U\,\332U\,\333U\,\334U\,\335Y\,\337s\,\341a\,\342a\,\343a\,\344a\,\345a\,\346e\,\352e\,\353e\,\354i\,\355i\,\356i\,\357i\,\360d\,\361n\,\362o\,\363o\,\364o\,\365o\,\366o\,\372u\,\373u\,\374u\,\375y\,\377y\,\267.\,\327x\,\367/\,\261\E7\E[4m+\E8\E[C\,\,0\017%\016\,x|\,y\E7\E[4m<\E8\E[C\,z\E7\E[4m>\E8\E[C\,g\E7\E[4m+\E8\E[C,
+ use=minitel1b,
+
+minitel1-nb|minitel 1 (40cols) noir & blanc sans couleurs avec bold et dim ...,
+ colors@, pairs@,
+ bold=\EG, clear=^L\EB,
+ cup=\037%p1%'A'%+%c%p2%'A'%+%c\EB, dim=\ED, home=^^\EB,
+ op@, rs2=^L\EB, setab@, setaf@, setb@, setf@,
+ sgr=%?%p1%p3%O%t\E]%;%?%p4%t\EH%;%?%p5%t\ED%;%?%p6%t\EG%;,
+ sgr0=\EI\E\\\EB, tsl=\037@%p1%'A'%+%c\EB, .invis=\E@,
+ use=minitel1,
+
minitel1b-nb|minitel 1b (40cols) noir & blanc sans couleurs avec bold et dim ...,
+ msgr,
colors@, pairs@,
acsc=`>a9f!j%k4l<m-n=p#q\,rpt=u5v-w<x5yvzy|l~$,
bold=\EG, clear=^L\EB, cup=\E[%i%p1%d;%p2%dH, dim=\ED,
- home=^^\EB, kend=\E)4\r, kf0=^Y0, kf1=\E$4\r, kf11=^Y1,
- kf12=^Y/, kf2=\E#4\r, kf3=\E&4\r, kf4=\E!4\r, kf5=\E'4\r,
- kf6=\E/4\r, kf7=^Y8, kf8=^Y\,, kf9=^Y., knp=\E(4\r,
- kpp=\E"4\r, op@, rmacs=^O, setf@,
+ home=^^\EB, kend=\E)4\r, kf1=\E$4\r, kf2=\E#4\r,
+ kf3=\E&4\r, kf4=\E!4\r, kf5=\E'4\r, kf6=\E/4\r, knp=\E(4\r,
+ kpp=\E"4\r, op@, rmacs=^O, rs2=^L\EB, setab@, setaf@, setb@,
+ setf@,
sgr=%?%p1%p3%O%t\E]%;%?%p4%t\EH%;%?%p5%t\ED%;%?%p6%t\EG%;,
- sgr0=\EI\E\\\EB, smacs=^N, .invis=\E@, .rs2=^L\EB,
- .u8=\001Cu|\004, use=minitel1b,
+ sgr0=\EI\E\\\EB, smacs=^N, tsl=\037@%p1%'A'%+%c\EB,
+ u8=\001%[ABCPpqrstuvwxyz{|}~\177]\004\r, .invis=\E@,
+ .u8=\001Cu|\004r, use=minitel1b,
+
+### Note:
+#
+# Faire, Fnct T puis "/" (TS+"?") pour activer les touches en 40cols :
+#
+# TS+Connexion/Fin(Fin),Retour(Page Up),Suite(Page Down),Guide(F1),
+# Repetition(F2),Sommaire(F3),Envoi(F4),Correction(F5),Annulation(F6),
+# Ctrl+7(F7),Ctrl+8(F8),Ctrl+9(F9),Ctrl+0(F10),Ctrl+*(F11),Ctrl+#(F12).
+#
+# Ctrl+Suite-1(F13), Ctrl+Suite-2(F14), Ctrl+Suite-3(F15),
+# Ctrl+Suite-4(F16), Ctrl+Suite-5(F17), Ctrl+Suite-6(F18),
+# Ctrl+Suite-7(F19), Ctrl+Suite-8(F20), Ctrl+Suite-9(F21),
+# Ctrl+Suite-0(F22), Ctrl+Suite-*(F23), Ctrl+Suite-#(F24).
+#
+### Fonctionne par exemple avec Midnight Commander (mc).
+
+minitel2-80|minitel 2 (80cols) avec filets vt100 (DEC),
+ G0,
+ acsc=ffggjjkkllmmnnooqqssttuuvvwwxxyyzz||}},
+ enacs=\E)0, rmacs=^O, smacs=^N, u6=\E[%i%d;%dR,
+ C0=ffggjjkkllmmnnooqqssttuuvvwwxxyyzz||}}, E0=^O,
+ S0=\E)0\016,
+ XC=B%\E(B\,\243\E(3}\,\247\E(R[\,\257\E(3v\,\260\E(3f\,\261\E(3g\,\265\E(3Y\,\267\E(3~\,\274\E(3O\,\275\E(3P\,\276\E(3Q\,\277\E(3Z\,\300A\,\301A\,\302A\,\303A\,\304\E(3R\,\305A\,\306E\,\307C\,\310E\,\311\E(3S\,\312E\,\313E\,\314\E(3T\,\315I\,\316I\,\317I\,\320D\,\321\E(3W\,\322\E(3U\,\323O\,\324O\,\325O\,\326O\,\327x\,\331U\,\332U\,\333U\,\334\E(3V\,\335Y\,\337\E(3{\,\340\E(3A\,\341a\,\342\E(3B\,\343a\,\344\E(3C\,\345a\,\346e\,\347\E(R\\\\\,\350\E(3E\,\351\E(3D\,\352\E(3F\,\353\E(3G\,\354i\,\355i\,\356\E(3H\,\357\E(3I\,\360d\,\361\E(3X\,\362o\,\363o\,\364\E(3J\,\365o\,\366\E(3K\,\367\E(3h\,\371\E(3L\,\372u\,\373\E(3M\,\374\E(3N\,\375y\,\377y\,\,0\E)3%\E)0\,\\\,m\,+k\,.l\,0\177\,-j,
+ use=minitel12-80,
+
+minitel12-80|minitel 12 (80cols),
+ G0,
+ civis=\E[<1h, cnorm=\E[<1l, is2=\E[12h, u6=\E[%i%d;%dH,
+ u7=\E[6n,
+ .acsc=ffggj+k+l+m+n+ovq-swt+u+v+w+xx}}\,m+k.l-j0\177,
+ .enacs=\E)3, .rmacs=^O, .rs3=\E[?4l, .scs=\E(%p1%c,
+ .smacs=^N,
+ C0=ffggj+k+l+m+n+ovq-swt+u+v+w+xx}}\,m+k.l-j0\177,
+ E0=^O, S0=\E)3\016,
+ XC=B%\E(B\,\243\E(3}\,\247\E(R[\,\257\E(3v\,\260\E(3f\,\261\E(3g\,\267\E(3~\,\274\E(3O\,\275\E(3P\,\276\E(3Q\,\300A\,\301A\,\302A\,\303A\,\304A\,\305A\,\306E\,\307C\,\310E\,\311E\,\312E\,\313E\,\314I\,\315I\,\316I\,\317I\,\320D\,\321N\,\322O\,\323O\,\324O\,\325O\,\326O\,\327x\,\331U\,\332U\,\333U\,\334U\,\335Y\,\337\E(3{\,\340\E(3A\,\341a\,\342\E(3B\,\343a\,\344\E(3C\,\345a\,\346e\,\347\E(R\\\\\,\350\E(3E\,\351\E(3D\,\352\E(3F\,\353\E(3G\,\354i\,\355i\,\356\E(3H\,\357\E(3I\,\360d\,\361n\,\362o\,\363o\,\364\E(3J\,\365o\,\366\E(3K\,\367\E(3h\,\371\E(3L\,\372u\,\373\E(3M\,\374\E(3N\,\375y\,\377y\,\,0\E)3%\E)0\,\\\,m\,+k\,.l\,0\177\,-j,
+ use=minitel1b-80,
+
+#
+# Add these in your ~/.screenrc for inputting some special glyphs like french
+# accentuated chars in 40 cols mode:
+#
+# bindkey ^YA digraph '`' # Saisi accent grave.
+# bindkey ^YB digraph "'" # Saisi accent aigu.
+# bindkey ^YC digraph '^' # Saisi accent circonflexe.
+# bindkey ^YH digraph '"' # Saisi accent trema.
+#
+# bindkey ^Y# stuff \243 # Livre.
+# bindkey "^Y\047" stuff \247 # Paragraphe.
+# bindkey ^Yj stuff \306 # AE
+# bindkey ^Yz stuff \346 # ae
+# bindkey ^YKc stuff \347 # c cedille.
+#
+
+screen.minitel1|Screen specific for minitel1,
+ ncv@,
+ acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz||}}~~,
+ bel=\007\E\^ \E\\, bold@, csr@, flash=\Eg\E\^ \E\\, kmous@,
+ rmul@, smul@, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\EZ,
+ use=screen,
+
+screen.minitel1b|Screen specific for minitel1b,
+ kclr=\E[2J, kdl1=\E[M, kf13=^Y{1, kf14=^Y{2, kf15=^Y{3,
+ kf16=^Y{4, kf17=^Y{5, kf18=^Y{6, kf19=^Y{7, kf20=^Y{8,
+ kf21=^Y{9, kf22=^Y{0, kf23=^Y{*, kf24=^Y{#, kil1=\E[L,
+ use=screen.minitel1,
+
+screen.minitel1b-80|screen.minitel2-80|screen.minitel12-80|Screen specific for minitel1b-80 minitel2-80 and minitel12-80,
+ colors@, ncv@, pairs@,
+ bold=\E[1m, kent=\EOM, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@,
+ kf19@, kf20@, kf21@, kf22@, kf23@, kf24@, khlp=\EOm, op@,
+ rmul=\E[24m, setab@, setaf@, setb@, setf@, smul=\E[4m,
+ use=screen.minitel1b,
+
+screen.minitel1-nb|Screen specific for minitel1-nb,
+ colors@, ncv@, pairs@,
+ bold=\E[1m, dim=\E[2m, op@, setab@, setaf@, setb@, setf@,
+ use=screen.minitel1,
+
+screen.minitel1b-nb|Screen specific for minitel1b-nb,
+ colors@, ncv@, pairs@,
+ bold=\E[1m, dim=\E[2m, op@, setab@, setaf@, setb@, setf@,
+ use=screen.minitel1b,
-# From: Alexandre Montaron, 19 Nov 2015
+
+# From: Alexandre Montaron, 19 Nov 2015, updated 19 Sep 2016
#
# He comments:
# viewdata lacks a true cup capabilitie,
@@ -18777,13 +18899,18 @@
bel=^G, civis=^T, clear=^L, cnorm=^Q, cr=^M, cub1=^H, cud1=^J,
cuf1=^I,
cup=\036%?%p1%{07}%>%t\n\n\n\n\n\n\n\n%;%?%p1%{15}%>%t\n\n\n\n\n\n\n\n%;%?%p1%{4}%&%t\n\n\n\n%;%?%p1%{2}%&%t\n\n%;%?%p1%{1}%&%t\n%;%?%p2%{07}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{15}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{23}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{31}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{4}%&%t\011\011\011\011%;%?%p2%{2}%&%t\011\011%;%?%p2%{1}%&%t\011%;,
- cuu1=^K, home=^^, nel=^M^J, .el=^X, .ind=^J,
+ cuu1=^K, home=^^, nel=^M^J, rs2=^L, .el=^X, .ind=^J,
.rep=%p1%c\022%p2%'?'%+%c, .ri=^K,
-# Also:
-# viewdata-rv works with some applications (e.g. emacs, xemacs) but fails with vim.
+
+viewdata-o|optimized version of viewdata prestel/viewdata terminals,
+ cup=\036%p1%?%p2%{20}%>%t%?%p1%{23}%=%t%Pa%{1}%e%{1}%+%;%;%Pa%?%ga%{13}%<%t%?%ga%{07}%>%t\n\n\n\n\n\n\n\n%;%?%ga%{4}%&%t\n\n\n\n%;%?%ga%{2}%&%t\n\n%;%?%ga%{1}%&%t\n%;%e%{24}%ga%-%Pa%?%ga%{07}%>%t\013\013\013\013\013\013\013\013%;%?%ga%{4}%&%t\013\013\013\013%;%?%ga%{2}%&%t\013\013%;%?%ga%{1}%&%t\013%;%;%?%p2%{21}%<%t%?%p2%{07}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{15}%>%t\011\011\011\011\011\011\011\011%;%?%p2%{4}%&%t\011\011\011\011%;%?%p2%{2}%&%t\011\011%;%?%p2%{1}%&%t\011%;%e%{40}%p2%-%Pa%?%ga%{07}%>%t\010\010\010\010\010\010\010\010%;%?%ga%{15}%>%t\010\010\010\010\010\010\010\010%;%?%ga%{4}%&%t\010\010\010\010%;%?%ga%{2}%&%t\010\010%;%?%ga%{1}%&%t\010%;%?%p1%{23}%=%t\013%;%;,
+ .ll=^^^K, use=viewdata,
+
+# Samples with TERM=viewdata and TERM=viewdata-rv: http://canal.chez.com/blog/
+
viewdata-rv|prestel/viewdata terminals with reverse capabilitie (as green),
xmc#1,
- rmso=\EG, smso=\EB, use=viewdata,
+ rmso=\EG, smso=\EB, use=viewdata-o,
######## OBSOLETE VDT TYPES
#
@@ -23854,4 +23981,9 @@
# 20160817
# + correct a typo in interix -TD
#
+# 2016-09-24
+# + updated minitel entries to use status line with screen(1), as well as
+# printing special G2 videotex chars like french accentuated glyph
+# using special cap XC= (patch by Alexandre Montaron).
+#
######## SHANTIH! SHANTIH! SHANTIH!
Index: ncurses/tinfo/comp_expand.c
Prereq: 1.25
--- ncurses-6.0-20160917+/ncurses/tinfo/comp_expand.c 2012-03-24 18:37:17.000000000 +0000
+++ ncurses-6.0-20160924/ncurses/tinfo/comp_expand.c 2016-09-24 21:15:51.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * 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 *
@@ -35,7 +35,7 @@
#include <ctype.h>
#include <tic.h>
-MODULE_ID("$Id: comp_expand.c,v 1.25 2012/03/24 18:37:17 tom Exp $")
+MODULE_ID("$Id: comp_expand.c,v 1.26 2016/09/24 21:15:51 tom Exp $")
static int
trailing_spaces(const char *src)
@@ -46,10 +46,10 @@
}
/* this deals with differences over whether 0x7f and 0x80..0x9f are controls */
-#define REALCTL(s) (UChar(*(s)) < 127 && iscntrl(UChar(*(s))))
+#define REALCTL(s) (UChar(*(s)) < 127 && iscntrl(UChar(*(s))))
#define REALPRINT(s) (UChar(*(s)) < 127 && isprint(UChar(*(s))))
-#define P_LIMIT(p) (length - (size_t)(p))
+#define P_LIMIT(p) (length - (size_t)(p))
NCURSES_EXPORT(char *)
_nc_tic_expand(const char *srcp, bool tic_format, int numbers)
@@ -133,6 +133,8 @@
}
break;
default:
+ if (*str == ',') /* minitel1 uses this */
+ buffer[bufp++] = '\\';
buffer[bufp++] = *str;
break;
}
Index: package/debian-mingw/changelog
--- ncurses-6.0-20160917+/package/debian-mingw/changelog 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/package/debian-mingw/changelog 2016-09-24 13:36:42.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160917) unstable; urgency=low
+ncurses6 (6.0+20160924) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Sep 2016 09:25:35 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 24 Sep 2016 09:36:42 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20160917+/package/debian-mingw64/changelog 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/package/debian-mingw64/changelog 2016-09-24 13:36:42.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160917) unstable; urgency=low
+ncurses6 (6.0+20160924) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Sep 2016 09:25:35 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 24 Sep 2016 09:36:42 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20160917+/package/debian/changelog 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/package/debian/changelog 2016-09-24 13:36:42.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160917) unstable; urgency=low
+ncurses6 (6.0+20160924) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Sep 2016 09:25:35 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 24 Sep 2016 09:36:42 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.176
--- ncurses-6.0-20160917+/package/mingw-ncurses.nsi 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/package/mingw-ncurses.nsi 2016-09-24 13:36:42.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.176 2016/09/17 13:25:35 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.177 2016/09/24 13:36:42 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 "0917"
+!define VERSION_MMDD "0924"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20160917+/package/mingw-ncurses.spec 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/package/mingw-ncurses.spec 2016-09-24 13:36:42.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20160917
+Release: 20160924
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20160917+/package/ncurses.spec 2016-09-17 13:25:35.000000000 +0000
+++ ncurses-6.0-20160924/package/ncurses.spec 2016-09-24 13:36:42.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20160917
+Release: 20160924
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,782 +0,0 @@
# ncurses 6.0 - patch 20161029 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161029.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Oct 30 01:40:40 UTC 2016
# ------------------------------------------------------------------------------
# NEWS | 5 +
# VERSION | 2
# dist.mk | 4 -
# form/fld_current.c | 32 ++++++++++-
# form/form.h | 5 +
# form/form.priv.h | 5 +
# form/frm_driver.c | 102 ++++++++++++++++++++-----------------
# man/form.3x | 9 ++-
# man/form_page.3x | 14 +++--
# 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.map | 12 +++-
# package/ncurses.spec | 2
# package/ncurses.sym | 6 +-
# package/ncursest.map | 11 +++
# package/ncursest.sym | 5 +
# package/ncursestw.map | 11 +++
# package/ncursestw.sym | 5 +
# package/ncursesw.map | 12 +++-
# package/ncursesw.sym | 6 +-
# 23 files changed, 178 insertions(+), 88 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.2687
--- ncurses-6.0-20161022+/NEWS 2016-10-23 00:03:47.000000000 +0000
+++ ncurses-6.0-20161029/NEWS 2016-10-29 22:28:11.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2687 2016/10/23 00:03:47 tom Exp $
+-- $Id: NEWS,v 1.2689 2016/10/29 22:28:11 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,9 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20161029
+ + add new function "unfocus_current_field" (Leon Winter)
+
20161022
+ modify tset -w (and tput reset) to update the program's copy of the
screensize if it was already set in the system, to improve tabstop
Index: VERSION
--- ncurses-6.0-20161022+/VERSION 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/VERSION 2016-10-29 19:16:10.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20161022
+5:0:9 6.0 20161029
Index: dist.mk
Prereq: 1.1129
--- ncurses-6.0-20161022+/dist.mk 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/dist.mk 2016-10-29 19:16:10.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1129 2016/10/21 22:47:18 tom Exp $
+# $Id: dist.mk,v 1.1130 2016/10/29 19:16:10 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 = 0
-NCURSES_PATCH = 20161022
+NCURSES_PATCH = 20161029
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: form/fld_current.c
Prereq: 1.12
--- ncurses-6.0-20161022+/form/fld_current.c 2010-01-23 21:14:35.000000000 +0000
+++ ncurses-6.0-20161029/form/fld_current.c 2016-10-29 22:30:10.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2010,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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: fld_current.c,v 1.12 2010/01/23 21:14:35 tom Exp $")
+MODULE_ID("$Id: fld_current.c,v 1.14 2016/10/29 22:30:10 tom Exp $")
/*---------------------------------------------------------------------------
| Facility : libnform
@@ -76,7 +76,7 @@
{
if (form->current != field)
{
- if (!_nc_Internal_Validation(form))
+ if (form->current && !_nc_Internal_Validation(form))
{
err = E_INVALID_FIELD;
}
@@ -103,6 +103,32 @@
}
/*---------------------------------------------------------------------------
+| Facility : libnform
+| Function : int unfocus_current_field(FORM * form)
+|
+| Description : Removes focus from the current field.
+|
+| Return Values : E_OK - success
+| E_BAD_ARGUMENT - invalid form pointer
+| E_REQUEST_DENIED - there is no current field to unfocus
++--------------------------------------------------------------------------*/
+NCURSES_EXPORT(int)
+unfocus_current_field(FORM *const form)
+{
+ T((T_CALLED("unfocus_current_field(%p)"), (const void *)form));
+ if (form == 0)
+ {
+ RETURN(E_BAD_ARGUMENT);
+ }
+ else if (form->current == 0)
+ {
+ RETURN(E_REQUEST_DENIED);
+ }
+ _nc_Unset_Current_Field(form);
+ RETURN(E_OK);
+}
+
+/*---------------------------------------------------------------------------
| Facility : libnform
| Function : FIELD *current_field(const FORM * form)
|
Index: form/form.h
Prereq: 0.25
--- ncurses-6.0-20161022+/form/form.h 2015-11-28 20:13:39.000000000 +0000
+++ ncurses-6.0-20161029/form/form.h 2016-10-29 22:24:24.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,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 *
@@ -30,7 +30,7 @@
* Author: Juergen Pfeifer, 1995,1997 *
****************************************************************************/
-/* $Id: form.h,v 0.25 2015/11/28 20:13:39 Leon.Winter Exp $ */
+/* $Id: form.h,v 0.26 2016/10/29 22:24:24 Leon.Winter Exp $ */
#ifndef FORM_H
#define FORM_H
@@ -387,6 +387,7 @@
extern NCURSES_EXPORT(int) set_form_win (FORM *,WINDOW *);
extern NCURSES_EXPORT(int) set_form_sub (FORM *,WINDOW *);
extern NCURSES_EXPORT(int) set_current_field (FORM *,FIELD *);
+extern NCURSES_EXPORT(int) unfocus_current_field (FORM *);
extern NCURSES_EXPORT(int) field_index (const FIELD *);
extern NCURSES_EXPORT(int) set_form_page (FORM *,int);
extern NCURSES_EXPORT(int) form_page (const FORM *);
Index: form/form.priv.h
Prereq: 0.39
--- ncurses-6.0-20161022+/form/form.priv.h 2015-11-28 20:13:39.000000000 +0000
+++ ncurses-6.0-20161029/form/form.priv.h 2016-10-29 22:30:23.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,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 *
@@ -30,7 +30,7 @@
* Author: Juergen Pfeifer, 1995,1997 *
****************************************************************************/
-/* $Id: form.priv.h,v 0.39 2015/11/28 20:13:39 Leon.Winter Exp $ */
+/* $Id: form.priv.h,v 0.41 2016/10/29 22:30:23 tom Exp $ */
#ifndef FORM_PRIV_H
#define FORM_PRIV_H 1
@@ -184,6 +184,7 @@
extern NCURSES_EXPORT(bool) _nc_Internal_Validation (FORM*);
extern NCURSES_EXPORT(int) _nc_Set_Current_Field (FORM*, FIELD*);
extern NCURSES_EXPORT(int) _nc_Position_Form_Cursor (FORM*);
+extern NCURSES_EXPORT(void) _nc_Unset_Current_Field(FORM *form);
#if NCURSES_INTEROP_FUNCS
extern NCURSES_EXPORT(FIELDTYPE *) _nc_TYPE_INTEGER(void);
Index: form/frm_driver.c
Prereq: 1.117
--- ncurses-6.0-20161022+/form/frm_driver.c 2015-11-28 20:39:09.000000000 +0000
+++ ncurses-6.0-20161029/form/frm_driver.c 2016-10-29 22:30:10.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2014,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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: frm_driver.c,v 1.117 2015/11/28 20:39:09 tom Exp $")
+MODULE_ID("$Id: frm_driver.c,v 1.119 2016/10/29 22:30:10 tom Exp $")
/*----------------------------------------------------------------------------
This is the core module of the form library. It contains the majority
@@ -1395,6 +1395,57 @@
returnCode(res);
}
+/*
+ * Removes the focus from the current field of the form.
+ */
+void
+_nc_Unset_Current_Field(FORM *form)
+{
+ FIELD *field = form->current;
+
+ _nc_Refresh_Current_Field(form);
+ if (Field_Has_Option(field, O_PUBLIC))
+ {
+ if (field->drows > field->rows)
+ {
+ if (form->toprow == 0)
+ ClrStatus(field, _NEWTOP);
+ else
+ SetStatus(field, _NEWTOP);
+ }
+ else
+ {
+ if (Justification_Allowed(field))
+ {
+ Window_To_Buffer(form, field);
+ werase(form->w);
+ Perform_Justification(field, form->w);
+ if (Field_Has_Option(field, O_DYNAMIC_JUSTIFY) &&
+ (form->w->_parent == 0))
+ {
+ copywin(form->w,
+ Get_Form_Window(form),
+ 0,
+ 0,
+ field->frow,
+ field->fcol,
+ field->frow,
+ field->cols + field->fcol - 1,
+ 0);
+ wsyncup(Get_Form_Window(form));
+ }
+ else
+ {
+ wsyncup(form->w);
+ }
+ }
+ }
+ }
+ delwin(form->w);
+ form->w = (WINDOW *)0;
+ form->current = 0;
+}
+
/*---------------------------------------------------------------------------
| Facility : libnform
| Function : int _nc_Set_Current_Field(FORM * form,
@@ -1415,7 +1466,7 @@
T((T_CALLED("_nc_Set_Current_Field(%p,%p)"), (void *)form, (void *)newfield));
- if (!form || !newfield || !form->current || (newfield->form != form))
+ if (!form || !newfield || (newfield->form != form))
returnCode(E_BAD_ARGUMENT);
if ((form->status & _IN_DRIVER))
@@ -1429,51 +1480,10 @@
if ((field != newfield) ||
!(form->status & _POSTED))
{
- if ((form->w) &&
+ if (field && (form->w) &&
(Field_Has_Option(field, O_VISIBLE)) &&
(field->form->curpage == field->page))
- {
- _nc_Refresh_Current_Field(form);
- if (Field_Has_Option(field, O_PUBLIC))
- {
- if (field->drows > field->rows)
- {
- if (form->toprow == 0)
- ClrStatus(field, _NEWTOP);
- else
- SetStatus(field, _NEWTOP);
- }
- else
- {
- if (Justification_Allowed(field))
- {
- Window_To_Buffer(form, field);
- werase(form->w);
- Perform_Justification(field, form->w);
- if (Field_Has_Option(field, O_DYNAMIC_JUSTIFY) &&
- (form->w->_parent == 0))
- {
- copywin(form->w,
- Get_Form_Window(form),
- 0,
- 0,
- field->frow,
- field->fcol,
- field->frow,
- field->cols + field->fcol - 1,
- 0);
- wsyncup(Get_Form_Window(form));
- }
- else
- {
- wsyncup(form->w);
- }
- }
- }
- }
- delwin(form->w);
- form->w = (WINDOW *)0;
- }
+ _nc_Unset_Current_Field(form);
field = newfield;
Index: man/form.3x
Prereq: 1.26
--- ncurses-6.0-20161022+/man/form.3x 2015-08-02 18:14:50.000000000 +0000
+++ ncurses-6.0-20161029/man/form.3x 2016-10-29 22:26:35.000000000 +0000
@@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
-.\" Copyright (c) 1998-2014,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 *
@@ -27,7 +27,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: form.3x,v 1.26 2015/08/02 18:14:50 tom Exp $
+.\" $Id: form.3x,v 1.28 2016/10/29 22:26:35 tom Exp $
.TH form 3X ""
.SH NAME
\fBform\fR \- curses extension for programming forms
@@ -146,6 +146,7 @@
set_form_win \fBform_win\fR(3X)
set_max_field \fBform_field_buffer\fR(3X)
set_new_page \fBform_new_page\fR(3X)
+unfocus_current_field \fBform_page\fR(3X)
unpost_form \fBform_post\fR(3X)
.TE
.SH RETURN VALUE
@@ -200,6 +201,10 @@
.SH PORTABILITY
These routines emulate the System V forms library. They were not supported on
Version 7 or BSD versions.
+.PP
+A few functions are extensions added for ncurses, e.g.,
+\fBform_driver_w\fP,
+\fBunfocus_current_field\fP.
.SH AUTHORS
Juergen Pfeifer. Manual pages and adaptation for ncurses by Eric
S. Raymond.
Index: man/form_page.3x
Prereq: 1.12
--- ncurses-6.0-20161022+/man/form_page.3x 2010-12-04 18:40:45.000000000 +0000
+++ ncurses-6.0-20161029/man/form_page.3x 2016-10-29 22:27:24.000000000 +0000
@@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2010,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,7 +27,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: form_page.3x,v 1.12 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_page.3x,v 1.14 2016/10/29 22:27:24 tom Exp $
.TH form_page 3X ""
.SH NAME
\fBform_page\fR \- set and get form page number
@@ -38,6 +38,8 @@
.br
FIELD *current_field(const FORM *);
.br
+int unfocus_current_field(FORM *form);
+.br
int set_form_page(FORM *form, int n);
.br
int form_page(const FORM *form);
@@ -45,9 +47,13 @@
int field_index(const FIELD *field);
.br
.SH DESCRIPTION
-The function \fBset_current field\fR sets the current field of the given
+The function \fBset_current_field\fR sets the current field of the given
form; \fBcurrent_field\fR returns the current field of the given form.
.PP
+The function \fBunfocus_current_field\fR removes the focus from the current
+field of the form. In such state, inquiries via \fBcurrent_field\fR shall return
+a NULL pointer.
+.PP
The function \fBset_form_page\fR sets the form's page number (goes to page
\fIn\fR of the form).
.PP
@@ -85,6 +91,8 @@
.SH PORTABILITY
These routines emulate the System V forms library. They were not supported on
Version 7 or BSD versions.
+.PP
+The \fBunfocus_current_field\fP function is an ncurses extension.
.SH AUTHORS
Juergen Pfeifer. Manual pages and adaptation for new curses by Eric
S. Raymond.
Index: package/debian-mingw/changelog
--- ncurses-6.0-20161022+/package/debian-mingw/changelog 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/package/debian-mingw/changelog 2016-10-29 19:16:10.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161022) unstable; urgency=low
+ncurses6 (6.0+20161029) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 21 Oct 2016 18:47:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Oct 2016 15:16:10 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20161022+/package/debian-mingw64/changelog 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/package/debian-mingw64/changelog 2016-10-29 19:16:10.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161022) unstable; urgency=low
+ncurses6 (6.0+20161029) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 21 Oct 2016 18:47:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Oct 2016 15:16:10 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20161022+/package/debian/changelog 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/package/debian/changelog 2016-10-29 19:16:10.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161022) unstable; urgency=low
+ncurses6 (6.0+20161029) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 21 Oct 2016 18:47:18 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Oct 2016 15:16:10 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.181
--- ncurses-6.0-20161022+/package/mingw-ncurses.nsi 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/package/mingw-ncurses.nsi 2016-10-29 19:16:10.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.181 2016/10/21 22:47:18 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.182 2016/10/29 19:16:10 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 "1022"
+!define VERSION_MMDD "1029"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20161022+/package/mingw-ncurses.spec 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/package/mingw-ncurses.spec 2016-10-29 19:16:10.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20161022
+Release: 20161029
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.map
Prereq: 1.35
--- ncurses-6.0-20161022+/package/ncurses.map 2015-09-05 19:27:16.000000000 +0000
+++ ncurses-6.0-20161029/package/ncurses.map 2016-10-30 01:06:37.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncurses.map,v 1.35 2015/09/05 19:27:16 tom Exp $
+# $Id: ncurses.map,v 1.36 2016/10/30 01:06:37 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
@@ -740,12 +740,19 @@
global:
wgetdelay;
local:
- _*;
_nc_mvcur;
_nc_mvcur_sp;
_nc_trace_mmask_t;
} NCURSES_5.8.20110226;
+NCURSES_6.0.current {
+ global:
+ unfocus_current_field;
+ local:
+ _*;
+ _nc_Unset_Current_Field;
+} NCURSES_5.9.20150530;
+
NCURSES_TIC_5.0.19991023 {
global:
_nc_capcmp;
@@ -1107,6 +1114,7 @@
keyname_sp;
keyok_sp;
killchar_sp;
+ longname_sp;
napms_sp;
new_prescr;
nocbreak_sp;
Index: package/ncurses.spec
--- ncurses-6.0-20161022+/package/ncurses.spec 2016-10-21 22:47:18.000000000 +0000
+++ ncurses-6.0-20161029/package/ncurses.spec 2016-10-29 19:16:10.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20161022
+Release: 20161029
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.sym
Prereq: 1.24
--- ncurses-6.0-20161022+/package/ncurses.sym 2015-09-05 19:36:49.000000000 +0000
+++ ncurses-6.0-20161029/package/ncurses.sym 2016-10-30 00:45:38.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncurses.sym,v 1.24 2015/09/05 19:36:49 tom Exp $
+# $Id: ncurses.sym,v 1.25 2016/10/30 00:45:38 tom Exp $
# script for shared library symbol-visibility using libtool
#
# This file was generated by ncu-mapsyms
@@ -51,7 +51,7 @@
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-wgetch-events --with-hashed-db --with-termlib --with-ticlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --with-broken_linker --with-termlib --with-ticlib --with-trace
-# Configure options (6.0.current)
+# Configure options (6.0.20161029)
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --with-broken_linker --with-hashed-db --with-termlib --with-trace
@@ -457,6 +457,7 @@
link_field
link_fieldtype
longname
+longname_sp
mcprint
mcprint_sp
menu_back
@@ -763,6 +764,7 @@
typeahead_sp
unctrl
unctrl_sp
+unfocus_current_field
ungetch
ungetch_sp
ungetmouse
Index: package/ncursest.map
Prereq: 1.31
--- ncurses-6.0-20161022+/package/ncursest.map 2015-09-05 19:35:45.000000000 +0000
+++ ncurses-6.0-20161029/package/ncursest.map 2016-10-30 01:08:04.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncursest.map,v 1.31 2015/09/05 19:35:45 tom Exp $
+# $Id: ncursest.map,v 1.32 2016/10/30 01:08:04 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
@@ -1111,8 +1111,15 @@
global:
wgetdelay;
local:
- _*;
_nc_mvcur;
_nc_mvcur_sp;
_nc_trace_mmask_t;
} NCURSEST_5.8.20110226;
+
+NCURSEST_6.0.current {
+ global:
+ unfocus_current_field;
+ local:
+ _*;
+ _nc_Unset_Current_Field;
+} NCURSEST_5.9.20150530;
Index: package/ncursest.sym
Prereq: 1.26
--- ncurses-6.0-20161022+/package/ncursest.sym 2015-09-05 19:36:49.000000000 +0000
+++ ncurses-6.0-20161029/package/ncursest.sym 2016-10-30 00:55:06.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncursest.sym,v 1.26 2015/09/05 19:36:49 tom Exp $
+# $Id: ncursest.sym,v 1.27 2016/10/30 00:55:06 tom Exp $
# script for shared library symbol-visibility using libtool
#
# This file was generated by ncu-mapsyms
@@ -35,7 +35,7 @@
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-weak-symbols --with-pthread --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --enable-wgetch-events --with-hashed-db --with-pthread --with-termlib --with-ticlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --with-broken_linker --with-pthread --with-termlib --with-ticlib --with-trace
-# Configure options (6.0.current)
+# Configure options (6.0.20161029)
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --enable-weak-symbols --with-pthread --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --enable-weak-symbols --with-pthread --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-reentrant --enable-sp-funcs --enable-weak-symbols --with-pthread --with-termlib --with-trace
@@ -748,6 +748,7 @@
typeahead_sp
unctrl
unctrl_sp
+unfocus_current_field
ungetch
ungetch_sp
ungetmouse
Index: package/ncursestw.map
Prereq: 1.32
--- ncurses-6.0-20161022+/package/ncursestw.map 2015-09-05 19:35:05.000000000 +0000
+++ ncurses-6.0-20161029/package/ncursestw.map 2016-10-30 01:09:53.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncursestw.map,v 1.32 2015/09/05 19:35:05 tom Exp $
+# $Id: ncursestw.map,v 1.33 2016/10/30 01:09:53 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
@@ -1230,8 +1230,15 @@
form_driver_w;
wgetdelay;
local:
- _*;
_nc_mvcur;
_nc_mvcur_sp;
_nc_trace_mmask_t;
} NCURSESTW_5.8.20110226;
+
+NCURSESTW_6.0.current {
+ global:
+ unfocus_current_field;
+ local:
+ _*;
+ _nc_Unset_Current_Field;
+} NCURSESTW_5.9.20150530;
Index: package/ncursestw.sym
Prereq: 1.24
--- ncurses-6.0-20161022+/package/ncursestw.sym 2015-09-05 19:36:49.000000000 +0000
+++ ncurses-6.0-20161029/package/ncursestw.sym 2016-10-30 01:00:08.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncursestw.sym,v 1.24 2015/09/05 19:36:49 tom Exp $
+# $Id: ncursestw.sym,v 1.25 2016/10/30 01:00:08 tom Exp $
# script for shared library symbol-visibility using libtool
#
# This file was generated by ncu-mapsyms
@@ -35,7 +35,7 @@
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --enable-wgetch-events --enable-widec --with-hashed-db --with-pthread --with-termlib --with-ticlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-weak-symbols --enable-widec --with-broken_linker --with-pthread --with-termlib --with-ticlib --with-trace
-# Configure options (6.0.current)
+# Configure options (6.0.20161029)
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-reentrant --enable-sp-funcs --enable-weak-symbols --enable-widec --with-pthread --with-termlib --with-trace
@@ -826,6 +826,7 @@
typeahead_sp
unctrl
unctrl_sp
+unfocus_current_field
unget_wch
unget_wch_sp
ungetch
Index: package/ncursesw.map
Prereq: 1.37
--- ncurses-6.0-20161022+/package/ncursesw.map 2015-09-05 19:33:48.000000000 +0000
+++ ncurses-6.0-20161029/package/ncursesw.map 2016-10-30 01:11:09.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncursesw.map,v 1.37 2015/09/05 19:33:48 tom Exp $
+# $Id: ncursesw.map,v 1.38 2016/10/30 01:11:09 tom Exp $
# script for shared library symbol-versioning using ld
#
# This file was generated by ncu-mapsyms
@@ -421,6 +421,7 @@
keyname_sp;
keyok_sp;
killchar_sp;
+ longname_sp;
napms_sp;
new_prescr;
nocbreak_sp;
@@ -1254,8 +1255,15 @@
form_driver_w;
wgetdelay;
local:
- _*;
_nc_mvcur;
_nc_mvcur_sp;
_nc_trace_mmask_t;
} NCURSESW_5.8.20110226;
+
+NCURSESW_6.0.current {
+ global:
+ unfocus_current_field;
+ local:
+ _*;
+ _nc_Unset_Current_Field;
+} NCURSESW_5.9.20150530;
Index: package/ncursesw.sym
Prereq: 1.25
--- ncurses-6.0-20161022+/package/ncursesw.sym 2015-09-05 19:36:49.000000000 +0000
+++ ncurses-6.0-20161029/package/ncursesw.sym 2016-10-30 00:50:36.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id: ncursesw.sym,v 1.25 2015/09/05 19:36:49 tom Exp $
+# $Id: ncursesw.sym,v 1.26 2016/10/30 00:50:36 tom Exp $
# script for shared library symbol-visibility using libtool
#
# This file was generated by ncu-mapsyms
@@ -46,7 +46,7 @@
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-widec --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-wgetch-events --enable-widec --with-hashed-db --with-termlib --with-ticlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-widec --with-broken_linker --with-termlib --with-ticlib --with-trace
-# Configure options (6.0.current)
+# Configure options (6.0.20161029)
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-getcap --enable-getcap-cache --enable-hard-tabs --enable-termcap --enable-widec --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-interop --enable-widec --with-termlib --with-trace
# --disable-getcap --disable-leaks --disable-root-environ --disable-termcap --enable-hard-tabs --enable-sp-funcs --enable-widec --with-broken_linker --with-hashed-db --with-termlib --with-trace
@@ -489,6 +489,7 @@
link_field
link_fieldtype
longname
+longname_sp
mcprint
mcprint_sp
menu_back
@@ -836,6 +837,7 @@
typeahead_sp
unctrl
unctrl_sp
+unfocus_current_field
unget_wch
unget_wch_sp
ungetch

View File

@ -1,266 +0,0 @@
# ncurses 6.0 - patch 20161105 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161105.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Nov 6 00:04:10 UTC 2016
# ------------------------------------------------------------------------------
# Ada95/gen/adacurses-config.in | 9 +++++----
# NEWS | 6 +++++-
# VERSION | 2 +-
# dist.mk | 4 ++--
# man/MKada_config.in | 13 +++++++------
# man/terminfo.tail | 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 +-
# 12 files changed, 32 insertions(+), 26 deletions(-)
# ------------------------------------------------------------------------------
Index: Ada95/gen/adacurses-config.in
Prereq: 1.9
--- ncurses-6.0-20161029+/Ada95/gen/adacurses-config.in 2014-06-07 19:32:22.000000000 +0000
+++ ncurses-6.0-20161105/Ada95/gen/adacurses-config.in 2016-11-05 20:48:35.000000000 +0000
@@ -1,7 +1,7 @@
#! /bin/sh
-# $Id: adacurses-config.in,v 1.9 2014/06/07 19:32:22 Pascal.Pignard Exp $
+# $Id: adacurses-config.in,v 1.11 2016/11/05 20:48:35 tom Exp $
##############################################################################
-# Copyright (c) 2007-2010,2014 Free Software Foundation, Inc. #
+# Copyright (c) 2007-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 "Software"), #
@@ -44,6 +44,7 @@
LIBS="-L$ADA_OBJECTS -lAdaCurses"
THIS="adacurses"
+THIS_CFG="$THIS@DFT_ARG_SUFFIX@-config"
case "x$1" in
x--version)
@@ -61,7 +62,7 @@
;;
x--help)
cat <<ENDHELP
-Usage: ${THIS}-config [options]
+Usage: ${THIS_CFG} [options]
Options:
--cflags echos the gnat (Ada compiler) flags needed to compile with ${THIS}
@@ -75,7 +76,7 @@
ENDHELP
;;
*)
- echo 'Usage: adacurses@DFT_ARG_SUFFIX@-config [--version | --cflags | --libs]' >&2
+ echo 'Usage: $THIS_CFG [--version | --cflags | --libs]' >&2
exit 1
;;
esac
Index: NEWS
Prereq: 1.2689
--- ncurses-6.0-20161029+/NEWS 2016-10-29 22:28:11.000000000 +0000
+++ ncurses-6.0-20161105/NEWS 2016-11-05 21:17:13.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2689 2016/10/29 22:28:11 tom Exp $
+-- $Id: NEWS,v 1.2692 2016/11/05 21:17:13 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,10 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20161105
+ + fix typo in man/terminfo.tail (Alain Williams).
+ + correct program-name in adacurses6-config.1 manual page.
+
20161029
+ add new function "unfocus_current_field" (Leon Winter)
Index: VERSION
--- ncurses-6.0-20161029+/VERSION 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/VERSION 2016-11-05 16:39:30.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20161029
+5:0:9 6.0 20161105
Index: dist.mk
Prereq: 1.1130
--- ncurses-6.0-20161029+/dist.mk 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/dist.mk 2016-11-05 16:39:30.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1130 2016/10/29 19:16:10 tom Exp $
+# $Id: dist.mk,v 1.1131 2016/11/05 16:39:30 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 = 0
-NCURSES_PATCH = 20161029
+NCURSES_PATCH = 20161105
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: man/MKada_config.in
Prereq: 1.8
--- ncurses-6.0-20161029+/man/MKada_config.in 2014-06-07 19:32:52.000000000 +0000
+++ ncurses-6.0-20161105/man/MKada_config.in 2016-11-05 21:08:21.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 2010-2011,2014 Free Software Foundation, Inc. *
+.\" Copyright (c) 2010-2014,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,12 +26,13 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: MKada_config.in,v 1.8 2014/06/07 19:32:52 tom Exp $
+.\" $Id: MKada_config.in,v 1.10 2016/11/05 21:08:21 tom Exp $
+.ds C adacurses@USE_CFG_SUFFIX@\-config
.TH ADACURSES "1" "" "" "User Commands"
.SH NAME
-adacurses\-config \- helper script for AdaCurses libraries
+adacurses@USE_CFG_SUFFIX@\-config \- helper script for AdaCurses libraries
.SH SYNOPSIS
-.B adacurses\-config
+.B \*C
[\fIoptions\fR]
.SH DESCRIPTION
This is a shell script which simplifies configuring an application to use
@@ -49,9 +50,9 @@
to configure and build AdaCurses.
.TP
\fB\-\-help\fR
-prints a list of the \fBadacurses\-config\fP script's options.
+prints a list of the \fB\*C\fP script's options.
.PP
-If no options are given, \fBadacurses\-config\fP prints the combination
+If no options are given, \fB\*C\fP prints the combination
of
\fB\-\-cflags\fR and
\fB\-\-libs\fR
Index: man/terminfo.tail
Prereq: 1.73
--- ncurses-6.0-20161029+/man/terminfo.tail 2016-10-22 19:56:17.000000000 +0000
+++ ncurses-6.0-20161105/man/terminfo.tail 2016-11-05 21:15:43.000000000 +0000
@@ -1,4 +1,4 @@
-.\" $Id: terminfo.tail,v 1.73 2016/10/22 19:56:17 tom Exp $
+.\" $Id: terminfo.tail,v 1.74 2016/11/05 21:15:43 Alain.Williams Exp $
.\" Beginning of terminfo.tail file
.\" This file is part of ncurses.
.\" See "terminfo.head" for copyright.
@@ -648,7 +648,7 @@
\fBindn\fR, and \fBrin\fR will simulate destructive scrolling; their
documentation cautions you not to define \fBcsr\fR unless this is true.
This \fBcurses\fR implementation is more liberal and will do explicit erases
-after scrolling if \fBndstr\fR is defined.
+after scrolling if \fBndsrc\fR is defined.
.PP
If the terminal has the ability to define a window as part of
memory, which all commands affect,
Index: package/debian-mingw/changelog
--- ncurses-6.0-20161029+/package/debian-mingw/changelog 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/package/debian-mingw/changelog 2016-11-05 16:39:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161029) unstable; urgency=low
+ncurses6 (6.0+20161105) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Oct 2016 15:16:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Nov 2016 12:39:30 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20161029+/package/debian-mingw64/changelog 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/package/debian-mingw64/changelog 2016-11-05 16:39:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161029) unstable; urgency=low
+ncurses6 (6.0+20161105) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Oct 2016 15:16:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Nov 2016 12:39:30 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20161029+/package/debian/changelog 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/package/debian/changelog 2016-11-05 16:39:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161029) unstable; urgency=low
+ncurses6 (6.0+20161105) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Oct 2016 15:16:10 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Nov 2016 12:39:30 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.182
--- ncurses-6.0-20161029+/package/mingw-ncurses.nsi 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/package/mingw-ncurses.nsi 2016-11-05 16:39:30.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.182 2016/10/29 19:16:10 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.183 2016/11/05 16:39:30 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 "1029"
+!define VERSION_MMDD "1105"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20161029+/package/mingw-ncurses.spec 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/package/mingw-ncurses.spec 2016-11-05 16:39:30.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20161029
+Release: 20161105
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20161029+/package/ncurses.spec 2016-10-29 19:16:10.000000000 +0000
+++ ncurses-6.0-20161105/package/ncurses.spec 2016-11-05 16:39:30.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20161029
+Release: 20161105
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,445 +0,0 @@
# ncurses 6.0 - patch 20161217 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20161217.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Dec 18 01:43:10 UTC 2016
# ------------------------------------------------------------------------------
# MANIFEST | 1
# NEWS | 9 +-
# VERSION | 2
# dist.mk | 4
# ncurses-6.0-20161217/test/tput-colorcube | 130 +++++++++++++++++++++++++++++
# ncurses/tinfo/lib_tputs.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/tput-initc | 78 ++++++++++++++++-
# 13 files changed, 228 insertions(+), 20 deletions(-)
# ------------------------------------------------------------------------------
Index: MANIFEST
--- ncurses-6.0-20161210+/MANIFEST 2016-12-11 02:44:18.000000000 +0000
+++ ncurses-6.0-20161217/MANIFEST 2016-12-17 23:39:59.000000000 +0000
@@ -1174,6 +1174,7 @@
./test/testaddch.c
./test/testcurs.c
./test/testscanw.c
+./test/tput-colorcube
./test/tput-initc
./test/tracemunch
./test/view.c
Index: NEWS
Prereq: 1.2708
--- ncurses-6.0-20161210+/NEWS 2016-12-11 00:24:06.000000000 +0000
+++ ncurses-6.0-20161217/NEWS 2016-12-17 23:41:02.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2708 2016/12/11 00:24:06 tom Exp $
+-- $Id: NEWS,v 1.2711 2016/12/17 23:41:02 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.
+20161217
+ + add tput-colorcube demo script.
+ + add -r and -s options to tput-initc demo, to match usage in xterm.
+ + flush the standard output in _nc_flush for the case where SP is zero,
+ e.g., when called via putp. This fixes a scenario where "tput flash"
+ did not work after changes in 20130112.
+
20161210
+ add configure script option --disable-wattr-macros for use in cases
where one wants to use the same headers for ncurses5/ncurses6
Index: VERSION
--- ncurses-6.0-20161210+/VERSION 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/VERSION 2016-12-17 16:05:02.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20161210
+5:0:9 6.0 20161217
Index: dist.mk
Prereq: 1.1136
--- ncurses-6.0-20161210+/dist.mk 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/dist.mk 2016-12-17 16:05:02.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1136 2016/12/10 12:47:46 tom Exp $
+# $Id: dist.mk,v 1.1137 2016/12/17 16:05:02 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 = 0
-NCURSES_PATCH = 20161210
+NCURSES_PATCH = 20161217
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: ncurses/tinfo/lib_tputs.c
Prereq: 1.98
--- ncurses-6.0-20161210+/ncurses/tinfo/lib_tputs.c 2016-05-28 21:58:45.000000000 +0000
+++ ncurses-6.0-20161217/ncurses/tinfo/lib_tputs.c 2016-12-17 20:47:21.000000000 +0000
@@ -51,7 +51,7 @@
#include <termcap.h> /* ospeed */
#include <tic.h>
-MODULE_ID("$Id: lib_tputs.c,v 1.98 2016/05/28 21:58:45 tom Exp $")
+MODULE_ID("$Id: lib_tputs.c,v 1.99 2016/12/17 20:47:21 tom Exp $")
NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */
NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0; /* used by termcap library */
@@ -141,6 +141,8 @@
}
}
}
+ } else {
+ fflush(stdout);
}
}
Index: package/debian-mingw/changelog
--- ncurses-6.0-20161210+/package/debian-mingw/changelog 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/package/debian-mingw/changelog 2016-12-17 16:05:02.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161210) unstable; urgency=low
+ncurses6 (6.0+20161217) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Dec 2016 07:47:46 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Dec 2016 11:05:02 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20161210+/package/debian-mingw64/changelog 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/package/debian-mingw64/changelog 2016-12-17 16:05:02.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161210) unstable; urgency=low
+ncurses6 (6.0+20161217) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Dec 2016 07:47:46 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Dec 2016 11:05:02 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20161210+/package/debian/changelog 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/package/debian/changelog 2016-12-17 16:05:02.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161210) unstable; urgency=low
+ncurses6 (6.0+20161217) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Dec 2016 07:47:46 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 17 Dec 2016 11:05:02 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.188
--- ncurses-6.0-20161210+/package/mingw-ncurses.nsi 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/package/mingw-ncurses.nsi 2016-12-17 16:05:02.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.188 2016/12/10 12:47:46 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.189 2016/12/17 16:05:02 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 "1210"
+!define VERSION_MMDD "1217"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20161210+/package/mingw-ncurses.spec 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/package/mingw-ncurses.spec 2016-12-17 16:05:02.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20161210
+Release: 20161217
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20161210+/package/ncurses.spec 2016-12-10 12:47:46.000000000 +0000
+++ ncurses-6.0-20161217/package/ncurses.spec 2016-12-17 16:05:02.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20161210
+Release: 20161217
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: test/tput-colorcube
--- /dev/null 2016-12-17 11:28:23.787999705 +0000
+++ ncurses-6.0-20161217/test/tput-colorcube 2016-12-17 23:37:37.000000000 +0000
@@ -0,0 +1,130 @@
+#!/bin/sh
+##############################################################################
+# Copyright (c) 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 "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: tput-colorcube,v 1.1 2016/12/17 23:37:37 tom Exp $
+# Use this script to print an xterm-style color cube, e.g., as done in
+# the xterm 88colors2.pl and 256colors2.pl scripts.
+
+failed() {
+ printf "?? $*\n" >&2
+ exit 1
+}
+
+newline() {
+ tput op
+ printf "\n"
+}
+
+if [ $# = 1 ]
+then
+ myterm=$1
+elif [ $# = 0 ]
+then
+ myterm=$TERM
+else
+ failed "expected one parameter or none"
+fi
+
+colors=$(tput -T $myterm colors 2>/dev/null)
+if [ ${colors:-0} -le 0 ]
+then
+ myterm=${myterm%%-color}
+ colors=$(tput -T $myterm colors 2>/dev/null)
+fi
+if [ ${colors:-0} -le 0 ]
+then
+ failed "terminal $myterm does not support color"
+fi
+
+printf "System colors:\n"
+
+color=0
+inrow=$colors
+to_do=$colors
+[ $colors -gt 256 ] && colors=256
+[ $inrow -gt 8 ] && inrow=8
+[ $to_do -gt 16 ] && to_do=16
+while [ $color -lt $to_do ]
+do
+ [ $color = $inrow ] && newline
+ tput setab $color
+ printf ' '
+ color=$(expr $color + 1)
+done
+newline
+
+[ $colors -le 16 ] && exit
+
+if [ $colors = 256 ]
+then
+ cube=6
+ ramp=232
+elif [ $colors -ge 88 ]
+then
+ cube=4
+ ramp=80
+else
+ exit
+fi
+
+printf "\n"
+printf "Color cube, ${cube}x${cube}x${cube}:\n"
+g=0
+cube2=$(expr $cube \* $cube)
+while [ $g -lt $cube ]
+do
+ r=0
+ while [ $r -lt $cube ]
+ do
+ b=0
+ while [ $b -lt $cube ]
+ do
+ color=$(expr 16 + \( $r \* $cube2 \) + \( $g \* $cube \) + $b)
+ tput setab $color
+ printf ' '
+ b=$(expr $b + 1)
+ done
+ tput op
+ printf ' '
+ r=$(expr $r + 1)
+ done
+ newline
+ g=$(expr $g + 1)
+done
+
+printf "\n"
+printf "Grayscale ramp:\n"
+color=$ramp
+while [ $color -lt $colors ]
+do
+ tput setab $color
+ printf ' '
+ color=$(expr $color + 1)
+done
+newline
+# vi:ts=4 sw=4
Index: test/tput-initc
Prereq: 1.1
--- ncurses-6.0-20161210+/test/tput-initc 2016-12-10 23:35:46.000000000 +0000
+++ ncurses-6.0-20161217/test/tput-initc 2016-12-17 22:35:05.000000000 +0000
@@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: tput-initc,v 1.1 2016/12/10 23:35:46 tom Exp $
+# $Id: tput-initc,v 1.5 2016/12/17 22:35:05 tom Exp $
# Some of the ".dat" files in ncurses' test-directory give r/g/b numbers for
# default palettes of xterm and Linux console. This script reads the numbers
# and (assuming the same or compatible terminal) uses tput to (re)initialize
@@ -37,6 +37,40 @@
exit 1
}
+usage() {
+ cat >&2 <<-EOF
+ usage: $0 [-r] [-s] [palette-data]
+
+ Use this script with a palette data-file to (re)initialize colors with
+ tput. This script assumes arrangements for 16-, 88- and 256-colors
+ like the xterm 88colors2.pl and 256colors2.pl scripts.
+
+ Options:
+ -r reverse palette
+ -s reverse system colors (first 16 if more than 16 colors)
+EOF
+ exit 1
+}
+
+opt_r=no
+opt_s=no
+
+while getopts "rs" option "$@"
+do
+ case $option in
+ (r)
+ opt_r=yes
+ ;;
+ (s)
+ opt_s=yes
+ ;;
+ (*)
+ usage
+ ;;
+ esac
+done
+shift $(expr $OPTIND - 1)
+
if [ $# = 1 ]
then
file=$1
@@ -70,8 +104,20 @@
fi
cat $file |\
-awk -v myterm=$myterm '
-BEGIN { limit=1000; }
+awk -v opt_r=$opt_r \
+ -v opt_s=$opt_s \
+ -v colors=$colors \
+ -v myterm=$myterm '
+BEGIN {
+ limit = 1000;
+ range = -1;
+ cramp = -1;
+ if ( colors == 88 ) {
+ cramp = 80;
+ } else if ( colors = 256 ) {
+ cramp = 232;
+ }
+}
function scaled(n) {
return (n * 1000)/limit;
}
@@ -83,5 +129,27 @@
/^[0-9]+:/{
sub(":","",$1);
- printf "tput -T%s initc %d %d %d %d\n", myterm, $1,scaled($2),scaled($3),scaled($4);
-}' |sh -
+ item = $1 + 0;
+ if (range < item) {
+ range = item;
+ }
+ params[$1] = sprintf ("%d %d %d", scaled($2),scaled($3),scaled($4));
+}
+END {
+ for (n = 0; n <= range; ++n) {
+ m = n;
+ if ( opt_r == "yes" ) {
+ if ( colors <= 16 ) {
+ m = range - n;
+ } else if ( ( opt_s == "yes" ) && ( n < 16 ) ) {
+ m = 15 - n;
+ } else if ( n >= cramp ) {
+ m = cramp + colors - 1 - n;
+ } else {
+ m = 16 + cramp - 1 - n;
+ }
+ }
+ printf "tput -T%s initc %d %s\n", myterm, m, params[n];
+ }
+}
+' |sh -

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,959 +0,0 @@
# ncurses 6.0 - patch 20170114 - Thomas E. Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 6.0 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 6.0 can be found at
# ftp://invisible-island.net/ncurses/6.0
# http://invisible-mirror.net/archives/ncurses/6.0
#
# ------------------------------------------------------------------------------
# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20170114.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Jan 15 01:42:56 UTC 2017
# ------------------------------------------------------------------------------
# NEWS | 10 +++++++-
# 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/curs_trace.3x.html | 27 +++++++++++++++++++++-
# doc/html/man/form.3x.html | 2 -
# doc/html/man/infocmp.1m.html | 14 +++++++----
# 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 | 20 +++++++++-------
# doc/html/man/toe.1m.html | 19 +++++++++-------
# doc/html/man/tput.1.html | 8 ++----
# doc/html/man/tset.1.html | 38 ++++++++++++++++++++++----------
# man/curs_trace.3x | 21 ++++++++++++++++-
# man/infocmp.1m | 9 +++++--
# man/manhtml.aliases | 29 +++++++++++++++++++++++-
# man/tic.1m | 6 +++--
# man/toe.1m | 6 +++--
# man/tput.1 | 5 ----
# man/tset.1 | 30 +++++++++++++++++++++----
# ncurses/curses.priv.h | 3 +-
# ncurses/tinfo/lib_data.c | 3 +-
# ncurses/trace/lib_trace.c | 8 ++++--
# 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 -
# 36 files changed, 217 insertions(+), 87 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.2732
--- ncurses-6.0-20170107+/NEWS 2017-01-07 22:49:11.000000000 +0000
+++ ncurses-6.0-20170114/NEWS 2017-01-14 20:59:06.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2732 2017/01/07 22:49:11 tom Exp $
+-- $Id: NEWS,v 1.2735 2017/01/14 20:59:06 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,14 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20170114
+ + improve discussion of early history of tset/reset programs.
+ + clarify in manual pages that the optional verbose option level is
+ available only when ncurses is configured for tracing.
+ + amend change from 20161231 to avoid writing traces to the standard
+ error after initializing the trace feature using the environment
+ variable.
+
20170107
+ amend changes for tput to reset tty modes to "sane" if the program
is run as "reset", like tset. Likewise, ensure that tset sends
Index: VERSION
--- ncurses-6.0-20170107+/VERSION 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/VERSION 2017-01-14 15:30:30.000000000 +0000
@@ -1 +1 @@
-5:0:9 6.0 20170107
+5:0:9 6.0 20170114
Index: dist.mk
Prereq: 1.1141
--- ncurses-6.0-20170107+/dist.mk 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/dist.mk 2017-01-14 15:30:30.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1141 2017/01/07 15:27:12 tom Exp $
+# $Id: dist.mk,v 1.1142 2017/01/14 15:30:30 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 = 0
-NCURSES_PATCH = 20170107
+NCURSES_PATCH = 20170114
# 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.0-20170107+/doc/html/man/adacurses6-config.1.html 2017-01-07 20:05:39.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/adacurses6-config.1.html 2017-01-14 22:55:32.000000000 +0000
@@ -131,7 +131,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/captoinfo.1m.html
--- ncurses-6.0-20170107+/doc/html/man/captoinfo.1m.html 2017-01-07 20:05:39.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/captoinfo.1m.html 2017-01-14 22:55:32.000000000 +0000
@@ -198,7 +198,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/clear.1.html
--- ncurses-6.0-20170107+/doc/html/man/clear.1.html 2017-01-07 20:05:39.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/clear.1.html 2017-01-14 22:55:32.000000000 +0000
@@ -147,7 +147,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/curs_trace.3x.html
--- ncurses-6.0-20170107+/doc/html/man/curs_trace.3x.html 2017-01-07 20:43:27.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/curs_trace.3x.html 2017-01-14 22:55:35.000000000 +0000
@@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: curs_trace.3x,v 1.17 2017/01/07 18:45:42 tom Exp @
+ * @Id: curs_trace.3x,v 1.18 2017/01/14 19:46:40 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -182,6 +182,30 @@
use_env, use_extended_names, use_tioctl
+</PRE><H3><a name="h3-Command-line-Utilities">Command-line Utilities</a></H3><PRE>
+ The command-line utilities such as <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG> provide a ver-
+ bose option which extends the set of messages written us-
+ ing the <STRONG>trace</STRONG> function. Both of these (<STRONG>-v</STRONG> and <STRONG>trace</STRONG>) use
+ the same variable (<STRONG>_nc_tracing</STRONG>), which determines the mes-
+ sages which are written.
+
+ Because the command-line utilities may call initialization
+ functions such as <STRONG>setupterm</STRONG>, <STRONG>tgetent</STRONG> or <STRONG>use_extend-</STRONG>
+ <STRONG>ed_names</STRONG>, some of their debugging output may be directed
+ to the <EM>trace</EM> file if the <STRONG>NCURSES_TRACE</STRONG> environment vari-
+ able is set:
+
+ <STRONG>o</STRONG> messages produced in the utility are written to the
+ standard error.
+
+ <STRONG>o</STRONG> messages produced by the underlying library are writ-
+ ten to <EM>trace</EM>.
+
+ If ncurses is built without tracing, none of the latter
+ are produced, and fewer diagnostics are provided by the
+ command-line utilities.
+
+
</PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
Routines which return a value are designed to be used as
parameters to the <STRONG>_tracef</STRONG> routine.
@@ -215,6 +239,7 @@
<li><a href="#h3-Functions">Functions</a></li>
<li><a href="#h3-Trace-Parameter">Trace Parameter</a></li>
<li><a href="#h3-Initialization">Initialization</a></li>
+<li><a href="#h3-Command-line-Utilities">Command-line Utilities</a></li>
</ul>
</li>
<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
Index: doc/html/man/form.3x.html
--- ncurses-6.0-20170107+/doc/html/man/form.3x.html 2017-01-07 20:05:41.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/form.3x.html 2017-01-14 22:55:35.000000000 +0000
@@ -239,7 +239,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/infocmp.1m.html
--- ncurses-6.0-20170107+/doc/html/man/infocmp.1m.html 2017-01-07 20:05:42.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/infocmp.1m.html 2017-01-14 22:55:36.000000000 +0000
@@ -1,7 +1,7 @@
<!--
* t
****************************************************************************
- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2016,2017 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 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: infocmp.1m,v 1.59 2016/10/22 19:54:35 tom Exp @
+ * @Id: infocmp.1m,v 1.60 2017/01/14 19:55:27 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -438,8 +438,12 @@
program, and exits.
<STRONG>-v</STRONG> <EM>n</EM> prints out tracing information on standard error as
- the program runs. Higher values of n induce greater
- verbosity.
+ the program runs.
+
+ The optional parameter <EM>n</EM> is a number from 1 to 10,
+ inclusive, indicating the desired level of detail of
+ information. If ncurses is built without tracing
+ support, the optional parameter is ignored.
<STRONG>-W</STRONG> By itself, the <STRONG>-w</STRONG> option will not force long strings
to be wrapped. Use the <STRONG>-W</STRONG> option to do this.
@@ -478,7 +482,7 @@
http://invisible-island.net/ncurses/tctest.html
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/infotocap.1m.html
--- ncurses-6.0-20170107+/doc/html/man/infotocap.1m.html 2017-01-07 20:05:42.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/infotocap.1m.html 2017-01-14 22:55:36.000000000 +0000
@@ -88,7 +88,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/menu.3x.html
--- ncurses-6.0-20170107+/doc/html/man/menu.3x.html 2017-01-07 20:05:42.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/menu.3x.html 2017-01-14 22:55:36.000000000 +0000
@@ -217,7 +217,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/ncurses.3x.html
--- ncurses-6.0-20170107+/doc/html/man/ncurses.3x.html 2017-01-07 20:43:29.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/ncurses.3x.html 2017-01-14 22:55:37.000000000 +0000
@@ -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
- <STRONG>ncurses</STRONG> version 6.0 (patch 20170107).
+ <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
The <STRONG>ncurses</STRONG> library emulates the curses library of System
V Release 4 UNIX, and XPG4 (X/Open Portability Guide)
Index: doc/html/man/ncurses6-config.1.html
--- ncurses-6.0-20170107+/doc/html/man/ncurses6-config.1.html 2017-01-07 20:05:43.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/ncurses6-config.1.html 2017-01-14 22:55:37.000000000 +0000
@@ -114,7 +114,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/panel.3x.html
--- ncurses-6.0-20170107+/doc/html/man/panel.3x.html 2017-01-07 20:05:43.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/panel.3x.html 2017-01-14 22:55:37.000000000 +0000
@@ -208,7 +208,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/tabs.1.html
--- ncurses-6.0-20170107+/doc/html/man/tabs.1.html 2017-01-07 20:05:43.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/tabs.1.html 2017-01-14 22:55:37.000000000 +0000
@@ -170,7 +170,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/terminfo.5.html
--- ncurses-6.0-20170107+/doc/html/man/terminfo.5.html 2017-01-07 20:43:30.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/terminfo.5.html 2017-01-14 22:55:37.000000000 +0000
@@ -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 <STRONG>ncurses</STRONG> version 6.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
fields (embedded commas may be escaped with a backslash or
Index: doc/html/man/tic.1m.html
--- ncurses-6.0-20170107+/doc/html/man/tic.1m.html 2017-01-07 20:05:43.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/tic.1m.html 2017-01-14 22:55:37.000000000 +0000
@@ -1,6 +1,6 @@
<!--
****************************************************************************
- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2016,2017 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: tic.1m,v 1.62 2016/10/01 17:14:50 tom Exp @
+ * @Id: tic.1m,v 1.63 2017/01/14 19:50:09 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -277,12 +277,14 @@
program, and exits.
<STRONG>-v</STRONG><EM>n</EM> specifies that (verbose) output be written to stan-
- dard error trace information showing <STRONG>tic</STRONG>'s progress.
- The optional parameter <EM>n</EM> is a number from 1 to 10,
- inclusive, indicating the desired level of detail of
- information. If <EM>n</EM> is omitted, the default level is
- 1. If <EM>n</EM> is specified and greater than 1, the level
- of detail is increased.
+ dard error trace information showing <STRONG>tic</STRONG>'s progress.
+
+ The optional parameter <EM>n</EM> is a number from 1 to 10,
+ inclusive, indicating the desired level of detail of
+ information. If ncurses is built without tracing
+ support, the optional parameter is ignored. If <EM>n</EM> is
+ omitted, the default level is 1. If <EM>n</EM> is specified
+ and greater than 1, the level of detail is increased.
The debug flag levels are as follows:
@@ -401,7 +403,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/toe.1m.html
--- ncurses-6.0-20170107+/doc/html/man/toe.1m.html 2017-01-07 20:05:43.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/toe.1m.html 2017-01-14 22:55:37.000000000 +0000
@@ -1,6 +1,6 @@
<!--
****************************************************************************
- * Copyright (c) 1998-2011,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2015,2017 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: toe.1m,v 1.27 2015/08/29 22:04:48 tom Exp @
+ * @Id: toe.1m,v 1.28 2017/01/14 19:55:36 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -100,11 +100,14 @@
depend on it, followed by a newline.
<STRONG>-v</STRONG><EM>n</EM> specifies that (verbose) output be written to stan-
- dard error, showing <STRONG>toe</STRONG>'s progress. The optional
- parameter <EM>n</EM> is a number from 1 to 10, interpreted
- as for <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>.
+ dard error, showing <STRONG>toe</STRONG>'s progress.
- <STRONG>-V</STRONG> reports the version of ncurses which was used in
+ The optional parameter <EM>n</EM> is a number from 1 to 10,
+ interpreted as for <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>. If ncurses is built
+ without tracing support, the optional parameter is
+ ignored.
+
+ <STRONG>-V</STRONG> reports the version of ncurses which was used in
this program, and exits.
@@ -114,10 +117,10 @@
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
- <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="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><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/tput.1.html
--- ncurses-6.0-20170107+/doc/html/man/tput.1.html 2017-01-07 23:09:13.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/tput.1.html 2017-01-14 22:55:37.000000000 +0000
@@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: tput.1,v 1.50 2017/01/07 23:03:28 tom Exp @
+ * @Id: tput.1,v 1.51 2017/01/14 20:49:40 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -394,9 +394,7 @@
AT&amp;T System V provided a different <STRONG>tput</STRONG> command, whose
<STRONG>init</STRONG> and <STRONG>reset</STRONG> subcommands (more than half the program)
were incorporated from the <STRONG>reset</STRONG> feature of BSD <STRONG>tset</STRONG> writ-
- ten by Eric Allman. Later the corresponding source code
- for <EM>reset</EM> was removed from the BSD <STRONG>tset</STRONG> (in June 1993,
- released in 4.4BSD-Lite a year later).
+ ten by Eric Allman.
Keith Bostic replaced the BSD <STRONG>tput</STRONG> command in 1989 with a
new implementation based on the AT&amp;T System V program
@@ -500,7 +498,7 @@
<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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: doc/html/man/tset.1.html
--- ncurses-6.0-20170107+/doc/html/man/tset.1.html 2017-01-07 23:09:13.000000000 +0000
+++ ncurses-6.0-20170114/doc/html/man/tset.1.html 2017-01-14 22:55:37.000000000 +0000
@@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: tset.1,v 1.47 2017/01/07 22:59:51 tom Exp @
+ * @Id: tset.1,v 1.48 2017/01/14 20:55:07 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -285,18 +285,34 @@
</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE>
- A <STRONG>reset</STRONG> command appeared in 2BSD (1979), written by Kurt
- Shoens.
+ A <STRONG>reset</STRONG> command appeared in 2BSD (April 1979), written by
+ Kurt Shoens. This program set the <EM>erase</EM> and <EM>kill</EM> charac-
+ ters to <STRONG>^H</STRONG> (backspace) and <STRONG>@</STRONG> respectively. Mark Horton
+ improved that in 3BSD (October 1979), adding <EM>intr</EM>, <EM>quit</EM>,
+ <EM>start</EM>/<EM>stop</EM> and <EM>eof</EM> characters as well as changing the pro-
+ gram to avoid modifying any user settings.
+
+ Later in 4.1BSD (December 1980), Mark Horton added a call
+ to the <STRONG>tset</STRONG> program using the <STRONG>-I</STRONG> and <STRONG>-Q</STRONG> options, i.e.,
+ using that to improve the terminal modes. With those
+ options, that version of <STRONG>reset</STRONG> did not use the termcap
+ database.
A separate <STRONG>tset</STRONG> command was provided in 2BSD by Eric All-
man. While the oldest published source (from 1979) pro-
- vides both programs, Allman's comments in the 2BSD source
- code indicate that he began work in October 1977, continu-
- ing development over the next few years.
-
- In September 1980, Eric Allman modified <STRONG>tset</STRONG> to provide a
- "reset" feature when the program was invoked as <STRONG>reset</STRONG>.
- This version appeared in 4.1cBSD, late in 1982.
+ vides both <STRONG>tset</STRONG> and <STRONG>reset</STRONG>, Allman's comments in the 2BSD
+ source code indicate that he began work in October 1977,
+ continuing development over the next few years.
+
+ In September 1980, Eric Allman modified <STRONG>tset</STRONG>, adding the
+ code from the existing "reset" feature when <STRONG>tset</STRONG> was
+ invoked as <STRONG>reset</STRONG>. Rather than simply copying the existing
+ program, in this merged version, <STRONG>tset</STRONG> used the termcap
+ database to do additional (re)initialization of the termi-
+ nal. This version appeared in 4.1cBSD, late in 1982.
+
+ Other developers (e.g., Keith Bostic and Jim Bloom) con-
+ tinued to modify <STRONG>tset</STRONG> until 4.4BSD was released in 1993.
The <STRONG>ncurses</STRONG> implementation was lightly adapted from the
4.4BSD sources for a terminfo environment by Eric S. Ray-
@@ -419,7 +435,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.0 (patch 20170107).
+ This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20170114).
Index: man/curs_trace.3x
Prereq: 1.17
--- ncurses-6.0-20170107+/man/curs_trace.3x 2017-01-07 18:45:42.000000000 +0000
+++ ncurses-6.0-20170114/man/curs_trace.3x 2017-01-14 19:46:40.000000000 +0000
@@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: curs_trace.3x,v 1.17 2017/01/07 18:45:42 tom Exp $
+.\" $Id: curs_trace.3x,v 1.18 2017/01/14 19:46:40 tom Exp $
.de bP
.IP \(bu 4
..
@@ -190,6 +190,25 @@
.hy
.ad
.RE
+.SS Command-line Utilities
+.PP
+The command-line utilities such as \fBtic\fP(1) provide a verbose option
+which extends the set of messages written using the \fBtrace\fP function.
+Both of these (\fB\-v\fP and \fBtrace\fP)
+use the same variable (\fB_nc_tracing\fP),
+which determines the messages which are written.
+.PP
+Because the command-line utilities may call initialization functions
+such as \fBsetupterm\fP, \fBtgetent\fP or \fBuse_extended_names\fP,
+some of their debugging output may be directed to the \fItrace\fP file
+if the \fBNCURSES_TRACE\fP environment variable is set:
+.bP
+messages produced in the utility are written to the standard error.
+.bP
+messages produced by the underlying library are written to \fItrace\fP.
+.PP
+If ncurses is built without tracing, none of the latter are produced,
+and fewer diagnostics are provided by the command-line utilities.
.SH RETURN VALUE
Routines which return a value are designed to be used as parameters
to the \fB_tracef\fR routine.
Index: man/infocmp.1m
Prereq: 1.59
--- ncurses-6.0-20170107+/man/infocmp.1m 2016-10-22 19:54:35.000000000 +0000
+++ ncurses-6.0-20170114/man/infocmp.1m 2017-01-14 19:55:27.000000000 +0000
@@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2016,2017 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: infocmp.1m,v 1.59 2016/10/22 19:54:35 tom Exp $
+.\" $Id: infocmp.1m,v 1.60 2017/01/14 19:55:27 tom Exp $
.TH @INFOCMP@ 1M ""
.ds n 5
.de bP
@@ -476,7 +476,10 @@
.TP 5
\fB\-v\fR \fIn\fR
prints out tracing information on standard error as the program runs.
-Higher values of n induce greater verbosity.
+.IP
+The optional parameter \fIn\fR is a number from 1 to 10, inclusive,
+indicating the desired level of detail of information.
+If ncurses is built without tracing support, the optional parameter is ignored.
.TP
\fB\-W\fR
By itself, the \fB\-w\fP option will not force long strings to be wrapped.
Index: man/manhtml.aliases
Prereq: 1.5
--- ncurses-6.0-20170107+/man/manhtml.aliases 2017-01-07 20:28:43.000000000 +0000
+++ ncurses-6.0-20170114/man/manhtml.aliases 2017-01-14 19:57:16.000000000 +0000
@@ -1,4 +1,31 @@
-# $Id: manhtml.aliases,v 1.5 2017/01/07 20:28:43 tom Exp $
+# $Id: manhtml.aliases,v 1.6 2017/01/14 19:57:16 tom Exp $
+#***************************************************************************
+# Copyright (c) 2013-2016,2017 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. *
+#***************************************************************************
# Items in this list will be linked to the corresponding manpages by man2html
addch(3X) curs_addch(3X)
delscreen(3X) curs_initscr(3X)
Index: man/tic.1m
Prereq: 1.62
--- ncurses-6.0-20170107+/man/tic.1m 2016-10-01 17:14:50.000000000 +0000
+++ ncurses-6.0-20170114/man/tic.1m 2017-01-14 19:50:09.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2016,2017 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: tic.1m,v 1.62 2016/10/01 17:14:50 tom Exp $
+.\" $Id: tic.1m,v 1.63 2017/01/14 19:50:09 tom Exp $
.TH @TIC@ 1M ""
.ie \n(.g .ds `` \(lq
.el .ds `` ``
@@ -307,8 +307,10 @@
\fB\-v\fR\fIn\fR
specifies that (verbose) output be written to standard error trace
information showing \fB@TIC@\fR's progress.
+.IP
The optional parameter \fIn\fR is a number from 1 to 10, inclusive,
indicating the desired level of detail of information.
+If ncurses is built without tracing support, the optional parameter is ignored.
If \fIn\fR is omitted, the default level is 1.
If \fIn\fR is specified and greater than 1, the level of
detail is increased.
Index: man/toe.1m
Prereq: 1.27
--- ncurses-6.0-20170107+/man/toe.1m 2015-08-29 22:04:48.000000000 +0000
+++ ncurses-6.0-20170114/man/toe.1m 2017-01-14 19:55:36.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 1998-2011,2015 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2015,2017 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: toe.1m,v 1.27 2015/08/29 22:04:48 tom Exp $
+.\" $Id: toe.1m,v 1.28 2017/01/14 19:55:36 tom Exp $
.TH @TOE@ 1M ""
.ds n 5
.ds d @TERMINFO@
@@ -91,8 +91,10 @@
\fB\-v\fR\fIn\fR
specifies that (verbose) output be written to standard error,
showing \fB@TOE@\fR's progress.
+.IP
The optional parameter \fIn\fR is a number from 1 to 10,
interpreted as for \fB@TIC@\fR(1M).
+If ncurses is built without tracing support, the optional parameter is ignored.
.TP
\fB\-V\fR
reports the version of ncurses which was used in this program,
Index: man/tput.1
Prereq: 1.50
--- ncurses-6.0-20170107+/man/tput.1 2017-01-07 23:03:28.000000000 +0000
+++ ncurses-6.0-20170114/man/tput.1 2017-01-14 20:49:40.000000000 +0000
@@ -27,7 +27,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: tput.1,v 1.50 2017/01/07 23:03:28 tom Exp $
+.\" $Id: tput.1,v 1.51 2017/01/14 20:49:40 tom Exp $
.TH @TPUT@ 1 ""
.ds d @TERMINFO@
.ds n 1
@@ -401,9 +401,6 @@
whose \fBinit\fP and \fBreset\fP subcommands
(more than half the program) were incorporated from
the \fBreset\fP feature of BSD \fBtset\fP written by Eric Allman.
-Later the corresponding source code for \fIreset\fP
-was removed from the BSD \fBtset\fP
-(in June 1993, released in 4.4BSD-Lite a year later).
.PP
Keith Bostic replaced the BSD \fBtput\fP command in 1989 with a new implementation
based on the AT&T System V program \fBtput\fP.
Index: man/tset.1
Prereq: 1.47
--- ncurses-6.0-20170107+/man/tset.1 2017-01-07 22:59:51.000000000 +0000
+++ ncurses-6.0-20170114/man/tset.1 2017-01-14 20:55:07.000000000 +0000
@@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: tset.1,v 1.47 2017/01/07 22:59:51 tom Exp $
+.\" $Id: tset.1,v 1.48 2017/01/14 20:55:07 tom Exp $
.TH @TSET@ 1 ""
.ie \n(.g .ds `` \(lq
.el .ds `` ``
@@ -274,18 +274,38 @@
any exclamation marks (\*(``!\*('').
.SH HISTORY
.PP
-A \fBreset\fP command appeared in 2BSD (1979), written by Kurt Shoens.
+A \fBreset\fP command appeared in 2BSD (April 1979), written by Kurt Shoens.
+This program set the \fIerase\fP and \fIkill\fP characters
+to \fB^H\fP (backspace) and \fB@\fP respectively.
+Mark Horton improved that in 3BSD (October 1979), adding
+\fIintr\fP, \fIquit\fP, \fIstart\fP/\fIstop\fP and \fIeof\fP characters
+as well as changing the program to avoid modifying any user settings.
+.PP
+Later in 4.1BSD (December 1980),
+Mark Horton added a call to the \fBtset\fP program
+using the \fB\-I\fP and \fB\-Q\fP options, i.e.,
+using that to improve the terminal modes.
+With those options,
+that version of \fBreset\fP did not use the termcap database.
.PP
A separate \fBtset\fP command was provided in 2BSD by Eric Allman.
-While the oldest published source (from 1979) provides both programs,
+While the oldest published source (from 1979)
+provides both \fBtset\fP and \fBreset\fP,
Allman's comments in the 2BSD source code indicate
that he began work in October 1977,
continuing development over the next few years.
.PP
-In September 1980, Eric Allman modified \fBtset\fP to provide a \*(lqreset\*(rq
-feature when the program was invoked as \fBreset\fP.
+In September 1980, Eric Allman modified \fBtset\fP,
+adding the code from the existing \*(lqreset\*(rq
+feature when \fBtset\fP was invoked as \fBreset\fP.
+Rather than simply copying the existing program,
+in this merged version, \fBtset\fP used the termcap database
+to do additional (re)initialization of the terminal.
This version appeared in 4.1cBSD, late in 1982.
.PP
+Other developers (e.g., Keith Bostic and Jim Bloom)
+continued to modify \fBtset\fP until 4.4BSD was released in 1993.
+.PP
The \fBncurses\fR implementation
was lightly adapted from the 4.4BSD sources for a terminfo environment by Eric
S. Raymond <esr@snark.thyrsus.com>.
Index: ncurses/curses.priv.h
Prereq: 1.557
--- ncurses-6.0-20170107+/ncurses/curses.priv.h 2017-01-07 19:45:37.000000000 +0000
+++ ncurses-6.0-20170114/ncurses/curses.priv.h 2017-01-14 17:52:49.000000000 +0000
@@ -34,7 +34,7 @@
****************************************************************************/
/*
- * $Id: curses.priv.h,v 1.557 2017/01/07 19:45:37 tom Exp $
+ * $Id: curses.priv.h,v 1.558 2017/01/14 17:52:49 tom Exp $
*
* curses.priv.h
*
@@ -901,6 +901,7 @@
#endif
#ifdef TRACE
+ bool trace_opened;
char trace_fname[PATH_MAX];
int trace_level;
FILE *trace_fp;
Index: ncurses/tinfo/lib_data.c
Prereq: 1.69
--- ncurses-6.0-20170107+/ncurses/tinfo/lib_data.c 2017-01-07 19:51:37.000000000 +0000
+++ ncurses-6.0-20170114/ncurses/tinfo/lib_data.c 2017-01-14 17:52:32.000000000 +0000
@@ -42,7 +42,7 @@
#include <curses.priv.h>
-MODULE_ID("$Id: lib_data.c,v 1.69 2017/01/07 19:51:37 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.70 2017/01/14 17:52:32 tom Exp $")
/*
* OS/2's native linker complains if we don't initialize public data when
@@ -168,6 +168,7 @@
#endif
#ifdef TRACE
+ FALSE, /* trace_opened */
CHARS_0s, /* trace_fname */
0, /* trace_level */
NULL, /* trace_fp */
Index: ncurses/trace/lib_trace.c
Prereq: 1.85
--- ncurses-6.0-20170107+/ncurses/trace/lib_trace.c 2016-12-31 13:50:06.000000000 +0000
+++ ncurses-6.0-20170114/ncurses/trace/lib_trace.c 2017-01-14 17:53:42.000000000 +0000
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2016,2017 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 *
@@ -47,7 +47,7 @@
#include <ctype.h>
-MODULE_ID("$Id: lib_trace.c,v 1.85 2016/12/31 13:50:06 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.86 2017/01/14 17:53:42 tom Exp $")
NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
@@ -87,6 +87,7 @@
#define MyFP _nc_globals.trace_fp
#define MyFD _nc_globals.trace_fd
+#define MyInit _nc_globals.trace_opened
#define MyPath _nc_globals.trace_fname
#define MyLevel _nc_globals.trace_level
#define MyNested _nc_globals.nested_tracef
@@ -95,6 +96,7 @@
trace(const unsigned int tracelevel)
{
if ((MyFP == 0) && tracelevel) {
+ MyInit = TRUE;
if (MyFD >= 0) {
MyFP = fdopen(MyFD, "wb");
} else {
@@ -160,7 +162,7 @@
#ifdef TRACE
/* verbose-trace in the command-line utilities relies on this */
- if (fp == 0 && _nc_tracing >= DEBUG_LEVEL(1))
+ if (fp == 0 && !MyInit && _nc_tracing >= DEBUG_LEVEL(1))
fp = stderr;
#endif
Index: package/debian-mingw/changelog
--- ncurses-6.0-20170107+/package/debian-mingw/changelog 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/package/debian-mingw/changelog 2017-01-14 15:30:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170107) unstable; urgency=low
+ncurses6 (6.0+20170114) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Jan 2017 10:27:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Jan 2017 10:30:30 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.0-20170107+/package/debian-mingw64/changelog 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/package/debian-mingw64/changelog 2017-01-14 15:30:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170107) unstable; urgency=low
+ncurses6 (6.0+20170114) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Jan 2017 10:27:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Jan 2017 10:30:30 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.0-20170107+/package/debian/changelog 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/package/debian/changelog 2017-01-14 15:30:30.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170107) unstable; urgency=low
+ncurses6 (6.0+20170114) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Jan 2017 10:27:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Jan 2017 10:30:30 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.192
--- ncurses-6.0-20170107+/package/mingw-ncurses.nsi 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/package/mingw-ncurses.nsi 2017-01-14 15:30:30.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.192 2017/01/07 15:27:12 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.193 2017/01/14 15:30:30 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 "0107"
+!define VERSION_MMDD "0114"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.0-20170107+/package/mingw-ncurses.spec 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/package/mingw-ncurses.spec 2017-01-14 15:30:30.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.0
-Release: 20170107
+Release: 20170114
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.0-20170107+/package/ncurses.spec 2017-01-07 15:27:12.000000000 +0000
+++ ncurses-6.0-20170114/package/ncurses.spec 2017-01-14 15:30:30.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.0
-Release: 20170107
+Release: 20170114
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

File diff suppressed because it is too large Load Diff

1437
ncurses-6.1-20190615.patch Normal file

File diff suppressed because it is too large Load Diff

8026
ncurses-6.1-20190623.patch Normal file

File diff suppressed because it is too large Load Diff

17671
ncurses-6.1-20190630.patch Normal file

File diff suppressed because it is too large Load Diff

309
ncurses-6.1-20190706.patch Normal file
View File

@ -0,0 +1,309 @@
# ncurses 6.1 - patch 20190706 - 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-20190706.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Jul 7 00:14:47 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 6 ++
# VERSION | 2
# dist.mk | 4 -
# misc/terminfo.src | 77 +++++++++++++++++++++++++++++++++----
# 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/ncursest.spec | 2
# 11 files changed, 89 insertions(+), 22 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3342
--- ncurses-6.1-20190630+/NEWS 2019-06-30 10:45:10.000000000 +0000
+++ ncurses-6.1-20190706/NEWS 2019-07-06 20:51:46.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3342 2019/06/30 10:45:10 tom Exp $
+-- $Id: NEWS,v 1.3344 2019/07/06 20:51:46 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,10 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20190706
+ + add domterm -TD
+ + improve comments for recent changes, add alias xterm.js -TD
+
20190630
+ add --with-tic-path and --with-infocmp-path to work around problems
building fallback source using pre-6.0 tic/infocmp.
Index: VERSION
--- ncurses-6.1-20190630+/VERSION 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/VERSION 2019-07-06 09:10:26.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20190630
+5:0:10 6.1 20190706
Index: dist.mk
Prereq: 1.1292
--- ncurses-6.1-20190630+/dist.mk 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/dist.mk 2019-07-06 09:10:26.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1292 2019/06/30 01:30:19 tom Exp $
+# $Id: dist.mk,v 1.1293 2019/07/06 09:10:26 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 = 20190630
+NCURSES_PATCH = 20190706
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: misc/terminfo.src
--- ncurses-6.1-20190630+/misc/terminfo.src 2019-06-30 20:05:21.000000000 +0000
+++ ncurses-6.1-20190706/misc/terminfo.src 2019-07-06 20:35:26.000000000 +0000
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.749 $
-# $Date: 2019/06/30 20:05:21 $
+# $Revision: 1.757 $
+# $Date: 2019/07/06 20:35:26 $
#
# The original header is preserved below for reference. It is noted that there
# is a "newer" version which differs in some cosmetic details (but actually
@@ -4225,6 +4225,8 @@
# Windows 10 1903
# Version 0.2.1715.0
+# https://github.com/microsoft/terminal
+#
# The task manager shows this as "OpenConsole.exe", which differs
# from the "Windows Command Processor" used for the command-prompt.
#
@@ -4247,9 +4249,9 @@
# - a few generic xterm features are supported (set window title), but
# others are missing (such as the mouse).
# - the cursor visible/invisible works in the PowerShell tab, not in "Legacy"
-# tack:
+# tack:
# - blink, dim, bold, invis, protect do not work
-# - bce works (but per vttest, with ED, EL, not BCE)
+# - bce works (but per vttest, with ED, EL, not ECH)
# - does not support keypad application mode
# - implements most of the xterm modified keys; sometimes modifiers are ignored
# or simply incorrect
@@ -4262,7 +4264,8 @@
use=xterm+pcfkeys, use=xterm-basic,
#### Visual Studio
-# Visual Studio Code 1.35.1
+# Visual Studio Code 1.35.1 uses xterm.js (see https://xtermjs.org/).
+# https://code.visualstudio.com/docs/editor/integrated-terminal
#
# This sets TERM to xterm-256color, which is a little more successful than
# Windows Terminal.
@@ -4289,11 +4292,11 @@
# - mouse mode is not reset by reset-sequence
# - supports italics and dim, but not cross-out or double-underline
# - color-palette cannot be changed
-vscode|Visual Studio Code terminal,
+vscode|xterm.js|Visual Studio Code terminal using xterm.js,
npc,
kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=xterm+256setaf,
use=ecma+index, use=xterm+sm+1006, use=xterm+pcfkeys,
- use=xterm-basic, use=xterm-basic,
+ use=xterm-basic,
vscode-direct|Visual Studio Code with direct-colors,
use=xterm+indirect, use=vscode,
@@ -7012,6 +7015,62 @@
use=xterm+pce2, use=xterm+pcc2, use=ecma+italics,
use=xterm+alt1049,
+######## WEB CLIENTS
+
+#### DomTerm
+# https://domterm.org
+#
+# Quoting its webpage:
+# The domterm command runs a server that manages sessions (usually shell
+# processes). The user interface and terminal emulation is handled by a
+# JavaScript library that can run in a regular web browser or an embedded
+# browser such as Electron, using Web Sockets to talk to the server.
+#
+# it can connect to, and display in, a web browser, or as a standalone Qt
+# application. Either way, it displays in the current desktop session.
+#
+# Testing current code (2019/07/06) with Fedora 30:
+# tack
+# no flash
+# no beep
+# no dim
+# no blink
+# no invis
+# no italics
+# ok smxx/rmxx
+# bce screen shows diagonal lines...
+# kf6 sends nothing
+# kf11 toggles maximize
+# cursor-key application mode works
+# numeric keypad application does not work; keys always send face-codes
+# sends utf-8 for meta, like xterm
+# vttest
+# has problems with menu #1 (wrapping)
+# DA = vt200 with 132 columns, color
+# DA2 = 990, 100300 ("\E[>990;100300;0c")
+# no VT52, no double-size characters
+# vt220 ECH test works, SRM, DECSCA do not
+# S7C1T/S8C1t does not work
+# DECUDK does not work
+# CNL does not work; the other ECMA-48 cursor-movement tests work
+# REP sort-of works (does not match xterm)
+# SD/SU work, but not SL/SR
+# window reporting: works for size in chars/pixels, but not other tests
+# X10 mouse clicks work -- but return 4 rather than 1 for codes
+# any-event mouse mode acts like any-button mode
+# implements SGR mouse-mode
+# other:
+# does not implement initc
+# does accept either colons or semicolon in 38/48 SGR.
+domterm|DomTerm web client,
+ npc,
+ bel@, blink@, dim@, invis@, kcbt=\E[Z, ritm@, rmkx=\E[?1l,
+ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ %t;7%;m,
+ sitm@, smkx=\E[?1h, use=xterm+256setaf, use=ecma+index,
+ use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm-basic,
+ use=xterm-basic,
+
######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
#
@@ -26282,4 +26341,8 @@
# + add vscode, vscode-direct -TD
# + use ecma+index in screen, st -TD
#
+# 2019-07-06
+# + add domterm -TD
+# + improve comments for recent changes, add alias xterm.js -TD
+#
######## SHANTIH! SHANTIH! SHANTIH!
Index: package/debian-mingw/changelog
--- ncurses-6.1-20190630+/package/debian-mingw/changelog 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/package/debian-mingw/changelog 2019-07-06 09:10:26.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190630) unstable; urgency=low
+ncurses6 (6.1+20190706) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Jun 2019 21:29:49 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20190630+/package/debian-mingw64/changelog 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/package/debian-mingw64/changelog 2019-07-06 09:10:26.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190630) unstable; urgency=low
+ncurses6 (6.1+20190706) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Jun 2019 21:29:49 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20190630+/package/debian/changelog 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/package/debian/changelog 2019-07-06 09:10:26.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190630) unstable; urgency=low
+ncurses6 (6.1+20190706) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Jun 2019 21:29:49 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.338
--- ncurses-6.1-20190630+/package/mingw-ncurses.nsi 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/package/mingw-ncurses.nsi 2019-07-06 09:10:26.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.338 2019/06/30 01:30:19 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.339 2019/07/06 09:10:26 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 "2019"
-!define VERSION_MMDD "0630"
+!define VERSION_MMDD "0706"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20190630+/package/mingw-ncurses.spec 2019-06-30 18:34:07.000000000 +0000
+++ ncurses-6.1-20190706/package/mingw-ncurses.spec 2019-07-06 09:10:26.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20190630
+Release: 20190706
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20190630+/package/ncurses.spec 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/package/ncurses.spec 2019-07-06 09:10:26.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20190630
+Release: 20190706
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20190630+/package/ncursest.spec 2019-06-30 01:30:19.000000000 +0000
+++ ncurses-6.1-20190706/package/ncursest.spec 2019-07-06 09:10:26.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20190630
+Release: 20190706
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

904
ncurses-6.1-20190713.patch Normal file
View File

@ -0,0 +1,904 @@
# ncurses 6.1 - patch 20190713 - 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-20190713.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Sun Jul 14 00:50:41 UTC 2019
# ------------------------------------------------------------------------------
# NEWS | 8 ++
# VERSION | 2
# dist.mk | 4 -
# doc/html/ada/funcs/T.htm | 2
# doc/html/ada/terminal_interface-curses-terminfo__adb.htm | 2
# 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/curs_bkgd.3x.html | 10 ++-
# doc/html/man/curs_mouse.3x.html | 13 ++--
# 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/term.7.html | 6 +-
# doc/html/man/terminfo.5.html | 39 +++++++------
# 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/curs_bkgd.3x | 10 ++-
# man/curs_mouse.3x | 18 +++---
# man/term.7 | 6 +-
# man/terminfo.head | 6 +-
# man/terminfo.tail | 30 +++++-----
# 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/ncursest.spec | 2
# progs/reset_cmd.c | 9 +--
# test/padview.c | 14 +++-
# 38 files changed, 132 insertions(+), 99 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.3344
--- ncurses-6.1-20190706+/NEWS 2019-07-06 20:51:46.000000000 +0000
+++ ncurses-6.1-20190713/NEWS 2019-07-13 23:10:57.000000000 +0000
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3344 2019/07/06 20:51:46 tom Exp $
+-- $Id: NEWS,v 1.3347 2019/07/13 23:10:57 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,12 @@
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20190713
+ + change reset's behavior for margins to simply clear soft-margins if
+ possible, rather than clearing and then setting them according to the
+ terminal's width (suggested by Thomas Wolff).
+ + correct order of one wbkgd versus start_color call in test/padview.c
+
20190706
+ add domterm -TD
+ improve comments for recent changes, add alias xterm.js -TD
Index: VERSION
--- ncurses-6.1-20190706+/VERSION 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/VERSION 2019-07-13 20:42:44.000000000 +0000
@@ -1 +1 @@
-5:0:10 6.1 20190706
+5:0:10 6.1 20190713
Index: dist.mk
Prereq: 1.1293
--- ncurses-6.1-20190706+/dist.mk 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/dist.mk 2019-07-13 20:42:44.000000000 +0000
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1293 2019/07/06 09:10:26 tom Exp $
+# $Id: dist.mk,v 1.1294 2019/07/13 20:42:44 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 = 20190706
+NCURSES_PATCH = 20190713
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Index: doc/html/ada/funcs/T.htm
--- ncurses-6.1-20190706+/doc/html/ada/funcs/T.htm 2019-06-15 23:31:13.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/ada/funcs/T.htm 2019-07-13 23:50:38.000000000 +0000
@@ -20,8 +20,8 @@
<LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_89_16" TARGET="main">tgetnum</A>
<LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_108_16" TARGET="main">tgetstr - terminal_interface-curses-termcap.adb:108</A>
<LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_129_16" TARGET="main">tgetstr - terminal_interface-curses-termcap.adb:129</A>
-<LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_53_13" TARGET="main">TGoto</A>
<LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_151_16" TARGET="main">tgoto</A>
+<LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_53_13" TARGET="main">TGoto</A>
<LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_69_16" TARGET="main">tigetflag</A>
<LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_87_16" TARGET="main">tigetstr - terminal_interface-curses-terminfo.adb:87</A>
<LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_108_16" TARGET="main">tigetstr - terminal_interface-curses-terminfo.adb:108</A>
Index: doc/html/ada/terminal_interface-curses-terminfo__adb.htm
--- ncurses-6.1-20190706+/doc/html/ada/terminal_interface-curses-terminfo__adb.htm 2019-03-16 19:34:48.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/ada/terminal_interface-curses-terminfo__adb.htm 2019-07-13 23:50:39.000000000 +0000
@@ -151,7 +151,7 @@
<b>end</b> <A HREF="terminal_interface-curses-terminfo__ads.htm#ref_68_13">Get_Number</A>;
<span class="comment"><EM>------------------------------------------------------------------------------</EM></span>
- <b>procedure</b> <span class="symbol"><A NAME="ref_137_14" HREF="terminal_interface-curses-terminfo__ads.htm#ref_76_14">Put_String</A></span> (<span class="symbol"><A NAME="ref_137_26" HREF="terminal_interface-curses-terminfo__ads.htm#ref_76_26">Str</A></span> : Terminfo_String;
+ <b>procedure</b> <span class="symbol"><A NAME="ref_137_14" HREF="terminal_interface-curses-terminfo__ads.htm#ref_76_14">Put_String</A></span> (<span class="symbol"><A NAME="ref_137_26" HREF="terminal_interface-curses-terminfo__ads.htm#ref_76_26">Str</A></span> : <A HREF="terminal_interface-curses-terminfo__ads.htm#ref_44_35">Terminfo_String</A>;
<span class="symbol"><A NAME="ref_138_26" HREF="terminal_interface-curses-terminfo__ads.htm#ref_77_26">affcnt</A></span> : Natural := 1;
<span class="symbol"><A NAME="ref_139_26" HREF="terminal_interface-curses-terminfo__ads.htm#ref_78_26">putc</A></span> : <A HREF="terminal_interface-curses-terminfo__ads.htm#ref_71_9">putctype</A> := <b>null</b>) <b>is</b>
<b>function</b> <span class="symbol"><A NAME="ref_140_16">tputs</A></span> (<span class="symbol"><A NAME="ref_140_23" HREF="terminal_interface-curses-terminfo__adb.htm#ref_140_16">str</A></span> : char_array;
Index: doc/html/man/adacurses6-config.1.html
--- ncurses-6.1-20190706+/doc/html/man/adacurses6-config.1.html 2019-06-23 21:16:02.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/adacurses6-config.1.html 2019-07-13 23:50:33.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 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/captoinfo.1m.html
--- ncurses-6.1-20190706+/doc/html/man/captoinfo.1m.html 2019-06-23 21:16:02.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/captoinfo.1m.html 2019-07-13 23:50:33.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 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/clear.1.html
--- ncurses-6.1-20190706+/doc/html/man/clear.1.html 2019-06-23 21:16:02.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/clear.1.html 2019-07-13 23:50:33.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 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/curs_bkgd.3x.html
--- ncurses-6.1-20190706+/doc/html/man/curs_bkgd.3x.html 2019-03-16 19:34:43.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/curs_bkgd.3x.html 2019-07-13 23:50:33.000000000 +0000
@@ -1,6 +1,6 @@
<!--
****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2018,2019 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: curs_bkgd.3x,v 1.28 2018/12/09 00:45:05 tom Exp @
+ * @Id: curs_bkgd.3x,v 1.29 2019/07/13 21:01:06 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -121,6 +121,12 @@
rent background, and then adding attributes from the new back-
ground.
+ If the background's character value is zero, a space is assumed.
+
+ If the terminal does not support color, or if color has not been
+ started with <STRONG>start_color</STRONG>, the new background character's color
+ attribute will be ignored.
+
</PRE><H3><a name="h3-getbkgd">getbkgd</a></H3><PRE>
The <STRONG>getbkgd</STRONG> function returns the given window's current background
Index: doc/html/man/curs_mouse.3x.html
--- ncurses-6.1-20190706+/doc/html/man/curs_mouse.3x.html 2019-03-16 19:34:44.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/curs_mouse.3x.html 2019-07-13 23:50:34.000000000 +0000
@@ -1,7 +1,7 @@
<!--
* t
****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2018,2019 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 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: curs_mouse.3x,v 1.50 2018/12/29 23:40:47 tom Exp @
+ * @Id: curs_mouse.3x,v 1.51 2019/07/13 23:45:12 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -347,10 +347,11 @@
Because there are no standard terminal responses that would serve to
identify terminals which support the xterm mouse protocol, <STRONG>ncurses</STRONG> as-
- sumes that if your $TERM environment variable contains "xterm", or
- <STRONG>kmous</STRONG> is defined in the terminal description, then the terminal may
- send mouse events. The <STRONG>kmous</STRONG> capability is checked first, allowing the
- use of newer xterm mouse protocols.
+ sumes that if <STRONG>kmous</STRONG> is defined in the terminal description, or if the
+ terminal description's primary name or aliases contain the string
+ "xterm", then the terminal may send mouse events. The <STRONG>kmous</STRONG> capability
+ is checked first, allowing the use of newer xterm mouse protocols such
+ as xterm's private mode 1006.
</PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
Index: doc/html/man/form.3x.html
--- ncurses-6.1-20190706+/doc/html/man/form.3x.html 2019-06-23 21:16:04.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/form.3x.html 2019-07-13 23:50:35.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 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/infocmp.1m.html
--- ncurses-6.1-20190706+/doc/html/man/infocmp.1m.html 2019-06-23 21:16:04.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/infocmp.1m.html 2019-07-13 23:50:36.000000000 +0000
@@ -481,7 +481,7 @@
https://invisible-island.net/ncurses/tctest.html
- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/infotocap.1m.html
--- ncurses-6.1-20190706+/doc/html/man/infotocap.1m.html 2019-06-23 21:16:04.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/infotocap.1m.html 2019-07-13 23:50:36.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 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/menu.3x.html
--- ncurses-6.1-20190706+/doc/html/man/menu.3x.html 2019-06-23 21:16:05.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/menu.3x.html 2019-07-13 23:50:36.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 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/ncurses.3x.html
--- ncurses-6.1-20190706+/doc/html/man/ncurses.3x.html 2019-06-23 21:16:05.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/ncurses.3x.html 2019-07-13 23:50:37.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 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
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-20190706+/doc/html/man/ncurses6-config.1.html 2019-06-23 21:16:05.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/ncurses6-config.1.html 2019-07-13 23:50:37.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 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/panel.3x.html
--- ncurses-6.1-20190706+/doc/html/man/panel.3x.html 2019-06-23 21:16:05.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/panel.3x.html 2019-07-13 23:50:37.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 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/tabs.1.html
--- ncurses-6.1-20190706+/doc/html/man/tabs.1.html 2019-06-23 21:16:06.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/tabs.1.html 2019-07-13 23:50:37.000000000 +0000
@@ -205,7 +205,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 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/term.7.html
--- ncurses-6.1-20190706+/doc/html/man/term.7.html 2019-03-16 19:34:46.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/term.7.html 2019-07-13 23:50:37.000000000 +0000
@@ -1,6 +1,6 @@
<!--
****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2018,2019 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: term.7,v 1.26 2018/07/28 22:19:56 tom Exp @
+ * @Id: term.7,v 1.27 2019/07/13 23:17:23 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
@@ -177,7 +177,7 @@
-vb Use visible bell (flash) rather than beep.
- -w Wide; terminal is in 132 column mode.
+ -w Wide; terminal is in 132-column mode.
Conventionally, if your terminal type is a variant intended to specify
a line height, that suffix should go first. So, for a hypothetical
Index: doc/html/man/terminfo.5.html
--- ncurses-6.1-20190706+/doc/html/man/terminfo.5.html 2019-06-23 21:16:06.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/terminfo.5.html 2019-07-13 23:50:37.000000000 +0000
@@ -5,7 +5,7 @@
* Note: this must be run through tbl before nroff.
* The magic cookie on the first line triggers this under some man programs.
****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2018,2019 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 *
@@ -31,9 +31,9 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
- * @Id: terminfo.head,v 1.35 2018/07/28 22:29:09 tom Exp @
+ * @Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp @
* Head of terminfo man page ends here
- * @Id: terminfo.tail,v 1.93 2019/06/01 22:32:15 tom Exp @
+ * @Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp @
* Beginning of terminfo.tail file
* This file is part of ncurses.
* See "terminfo.head" for copyright.
@@ -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 20190623).
+ <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
</PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
@@ -124,7 +124,7 @@
ing up the terminal should have a root name, thus "hp2621". This name
should not contain hyphens. Modes that the hardware can be in, or user
preferences, should be indicated by appending a hyphen and a mode suf-
- fix. Thus, a vt100 in 132 column mode would be vt100-w. The following
+ fix. Thus, a vt100 in 132-column mode would be vt100-w. The following
suffixes should be used where possible:
<STRONG>Suffix</STRONG> <STRONG>Meaning</STRONG> <STRONG>Example</STRONG>
@@ -1902,10 +1902,14 @@
run the program
<STRONG>iprog</STRONG>
- output <STRONG>is1</STRONG> <STRONG>is2</STRONG>
+ output
+ <STRONG>is1</STRONG> and
+ <STRONG>is2</STRONG>
set the margins using
- <STRONG>mgc</STRONG>, <STRONG>smgl</STRONG> and <STRONG>smgr</STRONG>
+ <STRONG>mgc</STRONG> or
+ <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> or
+ <STRONG>smgl</STRONG> and <STRONG>smgr</STRONG>
set tabs using
<STRONG>tbc</STRONG> and <STRONG>hts</STRONG>
@@ -1913,8 +1917,8 @@
print the file
<STRONG>if</STRONG>
- and finally
- output <STRONG>is3</STRONG>.
+ and finally output
+ <STRONG>is3</STRONG>.
Most initialization is done with <STRONG>is2</STRONG>. Special terminal modes can be
set up without duplicating strings by putting the common sequences in
@@ -1922,14 +1926,14 @@
A set of sequences that does a harder reset from a totally unknown
state can be given as <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rf</STRONG> and <STRONG>rs3</STRONG>, analogous to <STRONG>is1</STRONG> <STRONG>,</STRONG> <STRONG>is2</STRONG> <STRONG>,</STRONG> <STRONG>if</STRONG>
- and <STRONG>is3</STRONG> respectively. These strings are output by the <STRONG>reset</STRONG> program
- (an alias of <STRONG>tset</STRONG>), which is used when the terminal gets into a wedged
- state. Commands are normally placed in <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG> <STRONG>rs3</STRONG> and <STRONG>rf</STRONG> only if
- they produce annoying effects on the screen and are not necessary when
- logging in. For example, the command to set the vt100 into 80-column
- mode would normally be part of <STRONG>is2</STRONG>, but it causes an annoying glitch of
- the screen and is not normally needed since the terminal is usually
- already in 80 column mode.
+ and <STRONG>is3</STRONG> respectively. These strings are output by <EM>reset</EM> option of
+ <STRONG>tput</STRONG>, or by the <STRONG>reset</STRONG> program (an alias of <STRONG>tset</STRONG>), which is used when
+ the terminal gets into a wedged state. Commands are normally placed in
+ <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG> <STRONG>rs3</STRONG> and <STRONG>rf</STRONG> only if they produce annoying effects on the screen
+ and are not necessary when logging in. For example, the command to set
+ the vt100 into 80-column mode would normally be part of <STRONG>is2</STRONG>, but it
+ causes an annoying glitch of the screen and is not normally needed
+ since the terminal is usually already in 80-column mode.
The <STRONG>reset</STRONG> program writes strings including <STRONG>iprog</STRONG>, etc., in the same
order as the <EM>init</EM> program, using <STRONG>rs1</STRONG>, etc., instead of <STRONG>is1</STRONG>, etc. If
@@ -2146,7 +2150,6 @@
green <STRONG>COLOR_GREEN</STRONG> 2 0,max,0
yellow <STRONG>COLOR_YELLOW</STRONG> 3 max,max,0
blue <STRONG>COLOR_BLUE</STRONG> 4 0,0,max
-
magenta <STRONG>COLOR_MAGENTA</STRONG> 5 max,0,max
cyan <STRONG>COLOR_CYAN</STRONG> 6 0,max,max
white <STRONG>COLOR_WHITE</STRONG> 7 max,max,max
Index: doc/html/man/tic.1m.html
--- ncurses-6.1-20190706+/doc/html/man/tic.1m.html 2019-06-23 21:16:06.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/tic.1m.html 2019-07-13 23:50:37.000000000 +0000
@@ -365,7 +365,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>. <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Index: doc/html/man/toe.1m.html
--- ncurses-6.1-20190706+/doc/html/man/toe.1m.html 2019-06-23 21:16:06.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/toe.1m.html 2019-07-13 23:50:37.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 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/tput.1.html
--- ncurses-6.1-20190706+/doc/html/man/tput.1.html 2019-06-23 21:16:06.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/tput.1.html 2019-07-13 23:50:37.000000000 +0000
@@ -522,7 +522,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 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: doc/html/man/tset.1.html
--- ncurses-6.1-20190706+/doc/html/man/tset.1.html 2019-06-23 21:16:06.000000000 +0000
+++ ncurses-6.1-20190713/doc/html/man/tset.1.html 2019-07-13 23:50:37.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 20190623).
+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713).
Index: man/curs_bkgd.3x
Prereq: 1.28
--- ncurses-6.1-20190706+/man/curs_bkgd.3x 2018-12-09 00:45:05.000000000 +0000
+++ ncurses-6.1-20190713/man/curs_bkgd.3x 2019-07-13 21:01:06.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2018,2019 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: curs_bkgd.3x,v 1.28 2018/12/09 00:45:05 tom Exp $
+.\" $Id: curs_bkgd.3x,v 1.29 2019/07/13 21:01:06 tom Exp $
.de bP
.ie n .IP \(bu 4
.el .IP \(bu 2
@@ -112,6 +112,12 @@
the library updates only the non-color attributes,
first removing those which may have come from the current background,
and then adding attributes from the new background.
+.PP
+If the background's character value is zero, a space is assumed.
+.PP
+If the terminal does not support color,
+or if color has not been started with \fBstart_color\fP,
+the new background character's color attribute will be ignored.
.SS getbkgd
.PP
The \fBgetbkgd\fR function returns the given window's current background
Index: man/curs_mouse.3x
Prereq: 1.50
--- ncurses-6.1-20190706+/man/curs_mouse.3x 2018-12-29 23:40:47.000000000 +0000
+++ ncurses-6.1-20190713/man/curs_mouse.3x 2019-07-13 23:45:12.000000000 +0000
@@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2018,2019 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: curs_mouse.3x,v 1.50 2018/12/29 23:40:47 tom Exp $
+.\" $Id: curs_mouse.3x,v 1.51 2019/07/13 23:45:12 tom Exp $
.ie \n(.g .ds `` \(lq
.el .ds `` ``
.ie \n(.g .ds '' \(rq
@@ -394,7 +394,7 @@
.PP
Mouse events under xterm will not be detected correctly in a window with
its keypad bit off, since they are interpreted as a variety of function key.
-Your terminfo description should have \fBkmous\fR set to "\\E[M"
+Your terminfo description should have \fBkmous\fR set to \*(``\\E[M\*(''
(the beginning of the response from xterm for mouse clicks).
Other values for \fBkmous\fR are permitted,
but under the same assumption,
@@ -402,11 +402,13 @@
.PP
Because there are no standard terminal responses that would serve to identify
terminals which support the xterm mouse protocol, \fBncurses\fR assumes that
-if your $TERM environment variable contains \*(``xterm\*('',
-or \fBkmous\fR is defined in
-the terminal description, then the terminal may send mouse events.
-The \fBkmous\fP capability is checked first, allowing the
-use of newer xterm mouse protocols.
+if \fBkmous\fR is defined in the terminal description,
+or if the terminal description's primary name or aliases
+contain the string \*(``xterm\*('',
+then the terminal may send mouse events.
+The \fBkmous\fP capability is checked first,
+allowing the use of newer xterm mouse protocols
+such as xterm's private mode 1006.
.SH SEE ALSO
\fBcurses\fR(3X),
\fBcurs_kernel\fR(3X),
Index: man/term.7
Prereq: 1.26
--- ncurses-6.1-20190706+/man/term.7 2018-07-28 22:19:56.000000000 +0000
+++ ncurses-6.1-20190713/man/term.7 2019-07-13 23:17:23.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2018,2019 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: term.7,v 1.26 2018/07/28 22:19:56 tom Exp $
+.\" $Id: term.7,v 1.27 2019/07/13 23:17:23 tom Exp $
.TH term 7
.ie \n(.g .ds `` \(lq
.el .ds `` ``
@@ -190,7 +190,7 @@
Use visible bell (flash) rather than beep.
.TP 5
\-w
-Wide; terminal is in 132 column mode.
+Wide; terminal is in 132-column mode.
.PP
Conventionally, if your terminal type is a variant intended to specify a
line height, that suffix should go first.
Index: man/terminfo.head
Prereq: 1.35
--- ncurses-6.1-20190706+/man/terminfo.head 2018-07-28 22:29:09.000000000 +0000
+++ ncurses-6.1-20190713/man/terminfo.head 2019-07-13 23:17:33.000000000 +0000
@@ -1,5 +1,5 @@
.\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. *
+.\" Copyright (c) 1998-2018,2019 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: terminfo.head,v 1.35 2018/07/28 22:29:09 tom Exp $
+.\" $Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp $
.TH terminfo 5 "" "" "File Formats"
.ds n 5
.ds d @TERMINFO@
@@ -124,7 +124,7 @@
This name should not contain hyphens.
Modes that the hardware can be in, or user preferences, should
be indicated by appending a hyphen and a mode suffix.
-Thus, a vt100 in 132 column mode would be vt100\-w.
+Thus, a vt100 in 132-column mode would be vt100\-w.
The following suffixes should be used where possible:
.PP
.TS
Index: man/terminfo.tail
Prereq: 1.93
--- ncurses-6.1-20190706+/man/terminfo.tail 2019-06-01 22:32:15.000000000 +0000
+++ ncurses-6.1-20190713/man/terminfo.tail 2019-07-13 23:29:04.000000000 +0000
@@ -1,4 +1,4 @@
-.\" $Id: terminfo.tail,v 1.93 2019/06/01 22:32:15 tom Exp $
+.\" $Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp $
.\" Beginning of terminfo.tail file
.\" This file is part of ncurses.
.\" See "terminfo.head" for copyright.
@@ -1141,14 +1141,17 @@
.B iprog
.TP
output
-.B is1
-.B is2
+.br
+\fBis1\fP and
+.br
+\fBis2\fP
.TP
set the margins using
-.BR mgc ,
-.B smgl
-and
-.B smgr
+\fBmgc\fP or
+.br
+\fBsmglp\fP and \fBsmgrp\fP or
+.br
+\fBsmgl\fP and \fBsmgr\fP
.TP
set tabs using
.B tbc
@@ -1156,11 +1159,10 @@
.B hts
.TP
print the file
-.B if
+\fBif\fP
.TP
-and finally
-output
-.BR is3 .
+and finally output
+\fBis3\fP.
.RE
.PP
Most initialization is done with
@@ -1187,7 +1189,9 @@
and
.B is3
respectively.
-These strings are output by the \fB@RESET@\fP program
+These strings are output
+by \fIreset\fP option of \fB@TPUT@\fP,
+or by the \fB@RESET@\fP program
(an alias of \fB@TSET@\fP),
which is used when the terminal gets into a wedged state.
Commands are normally placed in
@@ -1202,7 +1206,7 @@
normally be part of
.BR is2 ,
but it causes an annoying glitch of the screen and is not normally
-needed since the terminal is usually already in 80 column mode.
+needed since the terminal is usually already in 80-column mode.
.PP
The \fB@RESET@\fP program writes strings including
.BR iprog ,
Index: package/debian-mingw/changelog
--- ncurses-6.1-20190706+/package/debian-mingw/changelog 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/debian-mingw/changelog 2019-07-13 20:42:44.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190706) unstable; urgency=low
+ncurses6 (6.1+20190713) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Jul 2019 16:42:44 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian-mingw64/changelog
--- ncurses-6.1-20190706+/package/debian-mingw64/changelog 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/debian-mingw64/changelog 2019-07-13 20:42:44.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190706) unstable; urgency=low
+ncurses6 (6.1+20190713) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Jul 2019 16:42:44 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
Index: package/debian/changelog
--- ncurses-6.1-20190706+/package/debian/changelog 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/debian/changelog 2019-07-13 20:42:44.000000000 +0000
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190706) unstable; urgency=low
+ncurses6 (6.1+20190713) unstable; urgency=low
* latest weekly patch
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Jul 2019 16:42:44 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
Index: package/mingw-ncurses.nsi
Prereq: 1.339
--- ncurses-6.1-20190706+/package/mingw-ncurses.nsi 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/mingw-ncurses.nsi 2019-07-13 20:42:44.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.339 2019/07/06 09:10:26 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.340 2019/07/13 20:42:44 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 "2019"
-!define VERSION_MMDD "0706"
+!define VERSION_MMDD "0713"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"
Index: package/mingw-ncurses.spec
--- ncurses-6.1-20190706+/package/mingw-ncurses.spec 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/mingw-ncurses.spec 2019-07-13 20:42:44.000000000 +0000
@@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.1
-Release: 20190706
+Release: 20190713
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncurses.spec
--- ncurses-6.1-20190706+/package/ncurses.spec 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/ncurses.spec 2019-07-13 20:42:44.000000000 +0000
@@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.1
-Release: 20190706
+Release: 20190713
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: package/ncursest.spec
--- ncurses-6.1-20190706+/package/ncursest.spec 2019-07-06 09:10:26.000000000 +0000
+++ ncurses-6.1-20190713/package/ncursest.spec 2019-07-13 20:42:44.000000000 +0000
@@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.1
-Release: 20190706
+Release: 20190713
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Index: progs/reset_cmd.c
Prereq: 1.17
--- ncurses-6.1-20190706+/progs/reset_cmd.c 2019-05-25 22:36:53.000000000 +0000
+++ ncurses-6.1-20190713/progs/reset_cmd.c 2019-07-13 21:35:13.000000000 +0000
@@ -52,7 +52,7 @@
#include <sys/ptem.h>
#endif
-MODULE_ID("$Id: reset_cmd.c,v 1.17 2019/05/25 22:36:53 tom Exp $")
+MODULE_ID("$Id: reset_cmd.c,v 1.18 2019/07/13 21:35:13 tom Exp $")
/*
* SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS,
@@ -495,6 +495,9 @@
? reset_2string
: init_2string);
+ if (VALID_STRING(clear_margins)) {
+ need_flush |= sent_string(clear_margins);
+ } else
#if defined(set_lr_margin)
if (VALID_STRING(set_lr_margin)) {
need_flush |= sent_string(TPARM_2(set_lr_margin, 0,
@@ -509,10 +512,8 @@
columns - 1));
} else
#endif
- if (VALID_STRING(clear_margins)
- && VALID_STRING(set_left_margin)
+ if (VALID_STRING(set_left_margin)
&& VALID_STRING(set_right_margin)) {
- need_flush |= sent_string(clear_margins);
need_flush |= to_left_margin();
need_flush |= sent_string(set_left_margin);
if (VALID_STRING(parm_right_cursor)) {
Index: test/padview.c
Prereq: 1.13
--- ncurses-6.1-20190706+/test/padview.c 2019-01-21 19:47:07.000000000 +0000
+++ ncurses-6.1-20190713/test/padview.c 2019-07-13 20:41:47.000000000 +0000
@@ -28,7 +28,7 @@
/*
* clone of view.c, using pads
*
- * $Id: padview.c,v 1.13 2019/01/21 19:47:07 tom Exp $
+ * $Id: padview.c,v 1.14 2019/07/13 20:41:47 tom Exp $
*/
#include <test.priv.h>
@@ -191,7 +191,7 @@
failed("cannot allocate pad workspace");
if (try_color) {
wattrset(my_pad, COLOR_PAIR(my_pair));
- wbkgd(my_pad, (chtype) COLOR_PAIR(my_pair));
+ wbkgd(my_pad, (chtype) (' ' | COLOR_PAIR(my_pair)));
}
/*
@@ -347,18 +347,22 @@
nodelay(stdscr, TRUE);
idlok(stdscr, TRUE); /* allow use of insert/delete line */
- my_pad = read_file(fname = argv[optind]);
-
if (try_color) {
if (has_colors()) {
start_color();
init_pair(my_pair, COLOR_WHITE, COLOR_BLUE);
- bkgd((chtype) COLOR_PAIR(my_pair));
+ bkgd((chtype) (' ' | COLOR_PAIR(my_pair)));
} else {
try_color = FALSE;
}
}
+ /*
+ * Do this after starting color, otherwise the pad's background will be
+ * uncolored after the ncurses 6.1.20181208 fixes.
+ */
+ my_pad = read_file(fname = argv[optind]);
+
my_row = 0;
while (!done) {
int n, c;

1437
ncurses-6.1-20190720.patch Normal file

File diff suppressed because it is too large Load Diff

4133
ncurses-6.1-20190727.patch Normal file

File diff suppressed because it is too large Load Diff

1319
ncurses-6.1-20190728.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -3,8 +3,8 @@
%define patchver %(echo %version | cut -d. -f 3)
%define tack_ver 1.07
Name: ncurses
Version: 6.0.20170121
Release: 3mamba
Version: 6.1.20190728
Release: 1mamba
Summary: A CRT screen handling and optimization package
Group: System/Libraries
Vendor: openmamba
@ -13,25 +13,14 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.gnu.org/directory/GNU/ncurses.html
Source0: http://ftp.gnu.org/pub/gnu/ncurses/ncurses-%{majver}.tar.gz
%if "%{?patchver}" != ""
Source1: ftp://dickey.his.com/ncurses/%{majver}/patch-%{majver}-20160910.sh.gz
Source2: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160917.patch.gz
Source3: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20160924.patch.gz
Source4: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161001.patch.gz
Source5: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161008.patch.gz
Source6: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161015.patch.gz
Source7: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161022.patch.gz
Source8: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161029.patch.gz
Source9: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161105.patch.gz
Source10: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161112.patch.gz
Source11: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161119.patch.gz
Source12: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161126.patch.gz
Source13: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161203.patch.gz
Source14: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161210.patch.gz
Source15: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161217.patch.gz
Source16: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161224.patch.gz
Source17: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20161231.patch.gz
Source18: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20170107.patch.gz
Source19: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20170114.patch.gz
Source1: ftp://dickey.his.com/ncurses/%{majver}/patch-%{majver}-20190609.sh.gz
Source2: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190615.patch.gz
Source3: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190623.patch.gz
Source4: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190630.patch.gz
Source5: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190706.patch.gz
Source6: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190713.patch.gz
Source7: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190720.patch.gz
Source8: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190727.patch.gz
Source20: ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-%{patchver}.patch.gz
%endif
License: MIT
@ -88,17 +77,6 @@ gunzip -c %{SOURCE5} | patch -p1
gunzip -c %{SOURCE6} | patch -p1
gunzip -c %{SOURCE7} | patch -p1
gunzip -c %{SOURCE8} | patch -p1
gunzip -c %{SOURCE9} | patch -p1
gunzip -c %{SOURCE10} | patch -p1
gunzip -c %{SOURCE11} | patch -p1
gunzip -c %{SOURCE12} | patch -p1
gunzip -c %{SOURCE13} | patch -p1
gunzip -c %{SOURCE14} | patch -p1
gunzip -c %{SOURCE15} | patch -p1
gunzip -c %{SOURCE16} | patch -p1
gunzip -c %{SOURCE17} | patch -p1
gunzip -c %{SOURCE18} | patch -p1
gunzip -c %{SOURCE19} | patch -p1
gunzip -c %{SOURCE20} | patch -p1
%endif
@ -275,6 +253,9 @@ chmod 755 %{buildroot}/%{_libdir}/*.so.*
%{_datadir}/terminfo/*
%changelog
* Fri Aug 02 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 6.1.20190728-1mamba
- update to 6.1.20190728
* Wed Feb 01 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.20170121-3mamba
- provide all terminfo in ncurses-terminfo package required by libncurses; obsolete ncurses-terminfo-extras

Binary file not shown.

BIN
patch-6.1-20190609.sh.gz Normal file

Binary file not shown.