From 73dd18dba5148d708638caa25c085d82f704e972 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 7 Jun 2020 01:06:32 +0000 Subject: [PATCH] ncurses 6.2 - patch 20200606 + add xterm+256color2, xterm+88color2, to deprecate nonstandard usage in xterm+256color, xterm+88color -TD + add shifted Linux console keys in linux+sfkeys entry for screen.linux (report by Alexandre Montaron). + use vt100+enq in screen (report by Alexandre Montaron). + add screen.linux-s alias (suggested by Alexandre Montaron). --- NEWS | 10 ++++- VERSION | 2 +- dist.mk | 4 +- misc/terminfo.src | 63 ++++++++++++++++++++++++++------ 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, 74 insertions(+), 27 deletions(-) diff --git a/NEWS b/NEWS index 07434fa2..812b56b1 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3502 2020/05/31 19:41:31 tom Exp $ +-- $Id: NEWS,v 1.3504 2020/06/07 00:22:03 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20200606 + + add xterm+256color2, xterm+88color2, to deprecate nonstandard usage + in xterm+256color, xterm+88color -TD + + add shifted Linux console keys in linux+sfkeys entry for + screen.linux (report by Alexandre Montaron). + + use vt100+enq in screen (report by Alexandre Montaron). + + add screen.linux-s alias (suggested by Alexandre Montaron). + 20200531 + correct configure version-check/warnng for g++ to allow for 10.x + re-enable "bel" in konsole-base (report by Nia Huang) diff --git a/VERSION b/VERSION index 18172f0c..9c13848b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.2 20200531 +5:0:10 6.2 20200606 diff --git a/dist.mk b/dist.mk index 6bfdbd5e..dceb5b5a 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1354 2020/05/31 18:56:59 tom Exp $ +# $Id: dist.mk,v 1.1355 2020/06/06 08:52:59 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 2 -NCURSES_PATCH = 20200531 +NCURSES_PATCH = 20200606 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/misc/terminfo.src b/misc/terminfo.src index 21fdd2e9..707a6b4a 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src @@ -6,8 +6,8 @@ # Report bugs and new terminal descriptions to # bug-ncurses@gnu.org # -# $Revision: 1.802 $ -# $Date: 2020/05/30 21:37:01 $ +# $Revision: 1.807 $ +# $Date: 2020/06/07 00:16:21 $ # # 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 @@ -966,9 +966,7 @@ linux-basic|linux console, il=\E[%p1%dL, il1=\E[L, ind=\n, kb2=\E[G, kbs=^?, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kend=\E[4~, kf1=\E[[A, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, - kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, - kf19=\E[33~, kf2=\E[[B, kf20=\E[34~, kf3=\E[[C, kf4=\E[[D, + kf11=\E[23~, kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, kspd=^Z, nel=\r\n, rc=\E8, rev=\E[7m, ri=\EM, rmam=\E[?7l, @@ -977,7 +975,14 @@ linux-basic|linux console, %t;2%;%?%p6%t;1%;%?%p9%t;11%;m, smam=\E[?7h, smir=\E[4h, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt102+enq, use=klone+sgr, - use=ecma+color, + use=ecma+color, use=linux+sfkeys, + +linux+decid|ncurses extension for Linux console DECID, + u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?6c, u9=\EZ, + +linux+sfkeys|shifted function-keys for Linux console, + kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, + kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, linux-m|Linux console no color, colors@, pairs@, @@ -4834,7 +4839,7 @@ xterm-16color|xterm with 16 colors like aixterm, # 256-colors is a compile-time feature of XFree86 xterm beginning with # xterm patch #111 (1999/7/10) -TD -xterm+256color|xterm 256-color feature, +xterm+256color|original xterm 256-color feature, ccc, colors#0x100, pairs#0x10000, initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%* @@ -4846,6 +4851,19 @@ xterm+256color|xterm 256-color feature, ;%p1%d%;m, setb@, setf@, +# The semicolon separator used in xterm+256color does not follow the ECMA-48 +# standard. Since patch #282 (in 2012), xterm has supported both the legacy +# subparameter separator (semicolon) and the standard (colon). +# +# The xterm FAQ gives some of the history: +# https://invisible-island.net/xterm/xterm.faq.html#color_by_number +xterm+256color2|xterm 256-color feature, + setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48 + \:5\:%p1%d%;m, + setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38\: + 5\:%p1%d%;m, + use=xterm+256color, + # xterm OSC 104 resets the color palette. Using it as part of xterm+256color # has the drawback that some of the xterm-alikes which use that building block # require a different approach to rs1 -TD @@ -4879,9 +4897,12 @@ xterm+256setaf|xterm 256-color (set-only), # The default color palette for the 256- and 88-colors are different. A # given executable will have one palette (perhaps compiled-in). If the program # supports xterm's control sequence, it can be programmed using initc. -xterm+88color|xterm 88-color feature, +xterm+88color|original xterm 88-color feature, colors#88, pairs#7744, use=xterm+256color, +xterm+88color2|xterm 88-color feature, + colors#88, pairs#7744, use=xterm+256color2, + # These variants of XFree86 3.9.16 xterm are built as a configure option. xterm-256color|xterm with 256 colors, use=xterm+osc104, use=xterm+256color, use=xterm-new, @@ -4965,6 +4986,15 @@ nsterm-direct|nsterm with direct-color indexing, # + terminology 0.91 recognizes xterm's original implementation, but does # nothing useful with it. +# Reviewing after ncurses 6.2: +# + Apple's Terminal.app is unchanged, has no support for direct color: +# Catalina 10.15.5 Terminal.app 2.10 (433) +# Mohave 10.14.6 - Terminal.app 2.9.5 (421.2) +# + Cygwin's mintty 3.1.7 works with colon/semicolon +# + PuTTY 0.73 works with semicolon +# + Teraterm 4.105 works with semicolon +# + terminology 1.7.0 works with colon/semicolon. + # Other variants are possible, e.g., by using more of xterm's indexed color # palette, though the intrusion of indexed colors on the direct-color space # would be more noticeable. @@ -7385,6 +7415,7 @@ screen|VT 100/ANSI X3.64 virtual terminal, sgr0=\E[m\017, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c, use=xterm+alt1049, use=ecma+color, + use=vt100+enq, # The bce and status-line entries are from screen 3.9.13 (and require some # changes to .screenrc). screen-bce|VT 100/ANSI X3.64 virtual terminal with bce, @@ -7525,10 +7556,10 @@ screen.konsole|screen in KDE console window, use=xterm+x11mouse, use=screen+italics, use=screen+fkeys, use=konsole, # fix the backspace key -screen.linux|screen in linux console, +screen.linux|screen.linux-s|screen in linux console, bw, - kbs=^?, kcbt@, use=xterm+x11mouse, use=screen+fkeys, - use=screen4, + kbs=^?, kcbt@, use=linux+sfkeys, use=xterm+x11mouse, + use=screen+fkeys, use=screen4, screen.mlterm|screen in mlterm, use=xterm+x11mouse, use=screen+fkeys, use=mlterm, screen.putty|screen in putty, @@ -20859,7 +20890,6 @@ linux-m1|Linux Minitel 1 "like" Couleurs, rs1=\Ec, rs3=\E[37;40m\E[8], sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[m, smacs=^N, smam=\E[?7h, smir=\E[4h, smpch=\E[11m, smso=\E[7m, tbc=\E[3g, - u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?6c, u9=\EZ, vpa=\E[%i%p1%dd, .VN=\E[?5l, .VR=\E[?5h, .am@, .ich=\E[%p1%d@, .ich1=\E[@, .ll=\E[99H, .rmcup=, .rmul=\E[24m, .smcup=\E]R\E]P3FFFF80\E[?8c, @@ -20872,6 +20902,7 @@ linux-m1|Linux Minitel 1 "like" Couleurs, \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n\n, + use=linux+decid, # 1. Using double-shapes for vt100 graphical chars (eg: mc). # 2. Native brown color corrected to good yellow color. @@ -26575,4 +26606,12 @@ v3220|LANPAR Vision II model 3220/3221/3222, # + re-enable "bel" in konsole-base (report by Nia Huang) # + add linux-s entry (patch by Alexandre Montaron). # +# 2020-06-06 +# + add xterm+256color2, xterm+88color2, to deprecate nonstandard usage +# in xterm+256color, xterm+88color -TD +# + add shifted Linux console keys in linux+sfkeys entry for +# screen.linux (report by Alexandre Montaron). +# + use vt100+enq in screen (report by Alexandre Montaron). +# + add screen.linux-s alias (suggested by Alexandre Montaron). +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 7a9d961d..153210d9 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200531) unstable; urgency=low +ncurses6 (6.2+20200606) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 31 May 2020 14:56:59 -0400 + -- Thomas E. Dickey Sat, 06 Jun 2020 04:52:59 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 7a9d961d..153210d9 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200531) unstable; urgency=low +ncurses6 (6.2+20200606) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 31 May 2020 14:56:59 -0400 + -- Thomas E. Dickey Sat, 06 Jun 2020 04:52:59 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 843c49b8..0dca3cac 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20200531) unstable; urgency=low +ncurses6 (6.2+20200606) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 31 May 2020 14:56:59 -0400 + -- Thomas E. Dickey Sat, 06 Jun 2020 04:52:59 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index ce1de07c..f06e523b 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.398 2020/05/31 18:56:59 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.399 2020/06/06 08:52:59 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "2" !define VERSION_YYYY "2020" -!define VERSION_MMDD "0531" +!define VERSION_MMDD "0606" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index cefaa9b4..8a8aec51 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 6.2 -Release: 20200531 +Release: 20200606 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 32bc053c..5a2d79ce 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.2 -Release: 20200531 +Release: 20200606 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index b3c4bff1..3f1c51be 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.2 -Release: 20200531 +Release: 20200606 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz -- 2.44.0