From ad14e224ecf8bc5e6faeffeecd44c3cfa31827e4 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 27 Mar 2022 00:22:57 +0000 Subject: [PATCH] ncurses 6.3 - patch 20220326 + update teken -TD + add teken-16color, teken-vt and teken-sc -TD + add a few missing details for vte-2018 (report by Robert Lange) -TD --- NEWS | 9 ++- VERSION | 2 +- dist.mk | 4 +- misc/terminfo.src | 95 +++++++++++++++++++++++++++++--- 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, 108 insertions(+), 24 deletions(-) diff --git a/NEWS b/NEWS index cad7fcad..56312553 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.3788 2022/03/20 00:18:08 tom Exp $ +-- $Id: NEWS,v 1.3790 2022/03/26 22:01:51 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,11 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20220326 + + update teken -TD + + add teken-16color, teken-vt and teken-sc -TD + + add a few missing details for vte-2018 (report by Robert Lange) -TD + 20220319 + add xgterm -TD + correct setal in mintty/tmux entries, add to vte-2018 (report by @@ -56,7 +61,7 @@ it is not possible to add this information. 20220312 + add xterm+acs building-block -TD + add xterm-p370, for use in older terminals -TD - + add dec+sl to xterm-new, per patch #371 -TD + + add dec+sl to xterm-new, per xterm patch #371 -TD + add mosh and mosh-256color -TD 20220305 diff --git a/VERSION b/VERSION index 764b6cde..44de1233 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.3 20220319 +5:0:10 6.3 20220326 diff --git a/dist.mk b/dist.mk index f4abebdf..0616541f 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.1471 2022/03/19 11:19:25 tom Exp $ +# $Id: dist.mk,v 1.1472 2022/03/26 11:02:20 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 = 3 -NCURSES_PATCH = 20220319 +NCURSES_PATCH = 20220326 # 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 83179215..7e560892 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.985 $ -# $Date: 2022/03/20 00:10:41 $ +# $Revision: 1.997 $ +# $Date: 2022/03/26 21:59:51 $ # # 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 @@ -2082,6 +2082,32 @@ cons60l1-m|cons60-iso-m|FreeBSD console w/iso 8859-1 chars (60-line mono), # http://svnweb.freebsd.org/base/stable/8/sys/dev/syscons/ # in particular scterm-teken.c # +# For FreeBSD 12 and 13: +# --------------------- +# In newer releases, it is no longer possible to boot into a configuration that +# works with syscons. teken's "cons25" configuration supports only the first +# 12 function keys. One may switch at runtime between the two flavors of +# function keys using vidcontrol: +# vidcontrol -T cons25 +# vidcontrol -T xterm +# But for each, teken implements only about a quarter of the imitated terminal's +# terminal descriptions. +# +# tack: +# VT100 line-drawing does not work (UTF-8 equivalents do). +# Shift/control modifiers have no effect on special keys. +# Meta does not work. +# vttest: +# supports REP (repeat). +# still does not support left/right margins +# SU/SD work, but not SL/SR +# alternate screen does not work +# ENQ/DA1 is unimplemented (the terminal does not identify itself) +# CPR, XCPR are unimplemented (i.e., vttest and resize are broken) +# implements X11 (original) xterm-mouse. +# ncurses: +# UTF-8 line-drawing works, including some double/thick lines +# # For FreeBSD 9 and 10: # -------------------- # The /etc/ttys entries for console and other ttys are all configured to set @@ -2111,7 +2137,7 @@ cons60l1-m|cons60-iso-m|FreeBSD console w/iso 8859-1 chars (60-line mono), # # Those are removed from this entry's acsc string to avoid confusion. # The resulting description provides correct line-drawing and function-keys -TD -teken|syscons with teken, +teken-2018|teken as of 2018, bw@, mir, xenl, acsc=0\333a\260f\370g\361h\261j\331k\277l\332m\300n\305q \304t\303u\264v\301w\302x\263y\363z\362~\371, @@ -2124,6 +2150,42 @@ teken|syscons with teken, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c, vpa=\E[%i%p1%dd, use=vt220+cvis, use=cons25, +teken-2022|teken as of 2022, + am, bce, eo, mir, msgr, npc, + colors#8, cols#80, it#8, lines#25, ncv#21, pairs#64, U8#1, + bold=\E[1m, cr=\r, cub1=^H, dim=\E[30;1m, ech=\E[%p1%dX, + ind=\E[S, kbs=^H, kent=\r, nel=\E[E, op=\E[x, rev=\E[7m, + ri=\E[T, rmso=\E[27m, rs2=\E[x\E[m\Ec, setab=\E[4%p1%dm, + setaf=\E[3%p1%dm, + sgr=\E[0%?%p1%t;2;7%;%?%p3%t;7%;%?%p5%t;30;1%;%?%p6%t;1%;m, + sgr0=\E[m, use=vt220+cvis, use=ecma+index, + use=ansi+arrows, use=ansi+csr, use=ansi+cup, + use=ansi+erase, use=ansi+idc, use=ansi+idl, + use=ansi+local, use=ansi+rca2, use=ansi+sgrso, + use=ansi+tabs, + +teken-vt+fkeys|teken's xterm special keys, + kdch1=\E[3~, kend=\E[F, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, + kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, + kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H, + kich1=\E[2~, knp=\E[6~, kpp=\E[5~, + +teken-sc+fkeys|teken's syscons special keys, + kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W, + kf12=\E[X, kf2=\E[N, kf3=\E[O, kf4=\E[P, kf5=\E[Q, kf6=\E[R, + kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H, kich1=\E[L, + knp=\E[G, kpp=\E[I, + +teken-sc|teken imitating syscons, + use=teken-sc+fkeys, use=teken-2022, + +teken|teken-vt|teken imitating xterm, + xenl, use=teken-vt+fkeys, use=xterm+x11mouse, + use=teken-2022, + +teken-16color|teken using 16 colors, + use=ibm+16color, use=teken, + #### 386BSD and BSD/OS Consoles # @@ -6054,12 +6116,24 @@ vte-2017|VTE 0.50.2, # 2018, respectively. Overline (Smol/Rmol) has been supported since December # 2017. vte-2018|VTE 0.51.2, - blink=\E[5m, enacs=\E(B\E)0, + AX, + blink=\E[5m, enacs=\E(B\E)0, nel=\EE, + rep=%p1%c\E[%p2%{1}%-%db, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t; 8%;%?%p1%p3%|%t;7%;m%?%p9%t\016%e\017%;, - Rmol=\E[55m, Smol=\E[53m, Smulx=\E[4:%p1%dm, - use=kitty+setal, use=vte-2017, - + Rmol=\E[55m, Se=\E[1 q, Smol=\E[53m, Smulx=\E[4:%p1%dm, + use=xterm+alt+title, use=xterm+tmux, use=kitty+setal, + use=vte-2017, + +# Summarizing as of March 2022, these terminfo-capabilities of xterm are +# absent from VTE: +# - DEC application keypad mode +# - DEC-compatible status-line +# - DEC left/right margin support +# - DEC printer controls +# - AT&T cursor-blinking +# - meta mode, as documented in terminfo(5) +# - xterm's extension to clear scrollback vte|VTE aka GNOME Terminal, use=vte-2018, @@ -27200,7 +27274,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # + add/use xterm+keypad in xterm-new (report by Alain D D Williams) -TD # + update terminator entry -TD # + remove hard-tabs from ti703 (report by Robert Clausecker) -# + add Smol/Rmol for tmux, vte-2018 -Nicholas Marriott +# + add Smol/Rmol for mintty, vte-2018 -Nicholas Marriott # # 2019-06-01 # + add rs1 to konsole, mlterm -TD @@ -27437,4 +27511,9 @@ v3220|LANPAR Vision II model 3220/3221/3222, # Robert Lange) # + add blink to vte-2018 (report by Robert Lange) # +# 2022-03-26 +# + update teken -TD +# + add teken-16color, teken-vt and teken-sc -TD +# + add a few missing details for vte-2018 (report by Robert Lange) -TD +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 78b5ad14..b5129deb 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220319) unstable; urgency=low +ncurses6 (6.3+20220326) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 19 Mar 2022 07:19:25 -0400 + -- Thomas E. Dickey Sat, 26 Mar 2022 07:02:20 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 78b5ad14..b5129deb 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220319) unstable; urgency=low +ncurses6 (6.3+20220326) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 19 Mar 2022 07:19:25 -0400 + -- Thomas E. Dickey Sat, 26 Mar 2022 07:02:20 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 3d817042..8b02c685 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220319) unstable; urgency=low +ncurses6 (6.3+20220326) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 19 Mar 2022 07:19:25 -0400 + -- Thomas E. Dickey Sat, 26 Mar 2022 07:02:20 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index f10f99d3..4336fc85 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.511 2022/03/19 11:19:25 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.512 2022/03/26 11:02:20 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "3" !define VERSION_YYYY "2022" -!define VERSION_MMDD "0319" +!define VERSION_MMDD "0326" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 8fbbc2fa..06e31a9a 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.3 -Release: 20220319 +Release: 20220326 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index b7654e46..d3013cb9 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.3 -Release: 20220319 +Release: 20220326 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index 1ab7378b..215bfb06 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.3 -Release: 20220319 +Release: 20220326 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz -- 2.44.0