X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2Fterminfo.src;h=83b490af24fa23593b1cf31c3ee31141c9b6ce15;hp=70047be7f615793b87123e1c7c19b343a54936b8;hb=460005b642d978c6d4b48810803514bd36a6245b;hpb=c55d387cebf1cee4757ca2c2ef4fbeae59ee4175 diff --git a/misc/terminfo.src b/misc/terminfo.src index 70047be7..83b490af 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.779 $ -# $Date: 2020/01/19 01:09:38 $ +# $Revision: 1.795 $ +# $Date: 2020/05/02 23:39:49 $ # # 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 @@ -1131,7 +1131,17 @@ fbterm|FbTerm for Linux with framebuffer, # (but nonstandard) SGR 21, which was supported in the Linux console since 1992 # as an equivalent for SGR 22. Long after (early 2018), someone modified the # console driver to make it ignore SGR 21 because the ECMA-48 standard -# suggested a different use for that particular code. +# suggested a different use for that particular code: +# +# https://github.com/torvalds/linux/commit/65d9982d7e523a1a8e7c9af012da0d166f72fc56#diff-7da3c215d12c9f6b88e1a37d38b116f0 +# +# Two years later, someone (unfamiliar with ECMA-48 this time) documented it: +# +# https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/man4/console_codes.4?id=a133a6bc03d751a424fe0a4adea2198757599615 +# +# For background, refer to the report on bug-ncurses: +# +# https://lists.gnu.org/archive/html/bug-ncurses/2019-10/msg00059.html linux-16color|linux console with 16 colors, colors#16, ncv#42, pairs#0x100, setab=\E[4%p1%{8}%m%d%?%p1%{7}%>%t;5%e;25%;m, @@ -2168,12 +2178,19 @@ bsdos-ppc|PowerPC BSD/OS Console, # to a crude plotting feature) -TD vt52|dec vt52, OTbs, + it#8, lines#24, + acsc=+h.k0affggolpnqprrss, home=\EH, kbs=^H, nel=\r\n, + ri=\EI, rmacs=\EG, rmkx=\E>, smacs=\EF, smkx=\E=, u8=\E/[KL], + use=vt50h, + +# This is more likely the "vt52" that you would see in emulation, i.e., no +# keypad, no graphics. +vt52-basic|vt52 for emulators, cols#80, it#8, lines#24, - acsc=+h.k0affggolpnqprrss, bel=^G, clear=\EH\EJ, cr=\r, - cub1=\ED, cud1=\EB, cuf1=\EC, - cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, - el=\EK, home=\EH, ht=^I, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB, - kcuf1=\EC, kcuu1=\EA, nel=\r\n, ri=\EI, rmacs=\EG, smacs=\EF, + bel=^G, clear=\EH\EJ, cr=\r, cub1=\ED, cud1=\EB, cuf1=\EC, + cup=\EY%p1%' '%+%c%p2%' '%+%c, cuu1=\EA, ed=\EJ, el=\EK, + home=\EH, ht=^I, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB, + kcuf1=\EC, kcuu1=\EA, nel=\r\n, ri=\EI, #### DEC VT100 and compatibles # @@ -3857,16 +3874,22 @@ crt|crt-vt220|CRT 2.3 emulating VT220, # Control responses, wrapping and tabs are buggy, failing a couple of # screens in vttest. # -# xterm mouse support is not implemented (unrelease version may). +# xterm mouse support is not implemented (unreleased version may). # # Several features such as backspace/delete are optional; this entry documents -# the default behavior -TD +# the default behavior. None of the combinations of keyboard settings match +# those used for xterm -TD # # PuTTY recognizes xterm's 1049 mode for switching to/from alternate screen, # but implements it incorrectly as mentioned here: # http://stackoverflow.com/questions/24613237/terminal-retains-bg-color-after-closing-vim-using-color-scheme-and-putty-256co/37869114#37869114 -# PuTTY recognized xterm's 1006 mode since late 2015; subsequent release was +# +# PuTTY recognized xterm's 1006 mouse mode in late 2015; subsequent release was # in 2017 (0.70) -TD +# +# PuTTY 0.71 (March 2019) provided a workable "rep" capability. It also +# changed longstanding keypad assignments, so that these no longer apply: +# kLFT=\E[D, kRIT=\E[C, kb2=\E[G, putty|PuTTY terminal emulator, am, bce, bw, ccc, mir, msgr, xenl, xon, XT, colors#8, it#8, ncv#22, pairs#64, U8#1, @@ -3890,13 +3913,13 @@ putty|PuTTY terminal emulator, initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/ %02x%p4%{255}%*%{1000}%/%02x, is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R, - kLFT=\E[D, kRIT=\E[C, kb2=\E[G, kbs=^?, kcbt=\E[Z, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~, - kind=\E[B, knp=\E[6~, kpp=\E[5~, kri=\E[A, kspd=^Z, nel=\r\n, - oc=\E]R, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, - rmam=\E[?7l, rmcup=\E[2J\E[?47l, rmir=\E[4l, - rmkx=\E[?1l\E>, rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m, + kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, + kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, khome=\E[1~, + kich1=\E[2~, kind=\E[B, knp=\E[6~, kpp=\E[5~, kri=\E[A, + kspd=^Z, nel=\r\n, oc=\E]R, op=\E[39;49m, rc=\E8, rev=\E[7m, + ri=\EM, rmacs=^O, rmam=\E[?7l, rmcup=\E[2J\E[?47l, + rmir=\E[4l, rmkx=\E[?1l\E>, rmpch=\E[10m, rmso=\E[27m, + rmul=\E[24m, rs2=\E<\E["p\E[50;6"p\Ec\E[?3l\E]R\E[?1000l, s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m, sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, @@ -3906,7 +3929,7 @@ putty|PuTTY terminal emulator, smir=\E[4h, smkx=\E[?1h\E=, smpch=\E[11m, smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3J, use=ecma+index, use=xterm+sm+1006, use=putty+fnkeys, - use=vt102+enq, use=xterm+sl, + use=vt102+enq, use=xterm+sl, use=vt100+fnkeys, vt100-putty|Reset PuTTY to pure vt100, rs2=\E<\E["p\Ec\E[?3l\E]R\E[40"p\E[61"p\E[50;1;2"p, use=vt100, @@ -3989,8 +4012,8 @@ putty+fnkeys+sco|SCO fn-keys for PuTTY, # https://github.com/mintty/mintty # # Originally a fork (and reduction) of PuTTY, this has grown from 15ksloc in -# 2013 to 38ksloc in 2019. That is still smaller than PuTTY (160ksloc), but -# larger than rxvt (31ksloc). +# 2013 to 41ksloc in 2020. That is still smaller than PuTTY (160ksloc), but +# larger than rxvt (31ksloc) and slightly smaller than rxvt-unicode (42ksloc). # # Version 3.0 responds to DA as a VT400, however it does not implement the # application keypad. The assignment of cursor-keys versus modifiers differs @@ -4860,7 +4883,7 @@ xterm-88color|xterm with 88 colors, # for numeric capabilities provided in ncurses 6.1: xterm+direct2|xterm with direct-color indexing, RGB, - colors#0x1000000, pairs#0x10000, + colors#0x1000000, pairs#0x10000, CO#8, initc@, op=\E[39;49m, setab=\E[%?%p1%{8}%<%t4%p1%d%e48\:2\:%p1%{65536}%/%d\:%p1 %{256}%/%{255}%&%d\:%p1%{255}%&%d%;m, @@ -4875,7 +4898,7 @@ xterm-direct2|xterm with direct-color indexing (old), # identifier" parameter. This version provides for that parameter: xterm+direct|xterm with direct-color indexing, RGB, - colors#0x1000000, pairs#0x10000, + colors#0x1000000, pairs#0x10000, CO#8, initc@, op=\E[39;49m, setab=\E[%?%p1%{8}%<%t4%p1%d%e48\:2\:\:%p1%{65536}%/%d\:%p1 %{256}%/%{255}%&%d\:%p1%{255}%&%d%;m, @@ -4914,7 +4937,7 @@ vte-direct|vte with direct-color indexing, nsterm-direct|nsterm with direct-color indexing, use=xterm+indirect, use=nsterm, -# As for others: +# As for others (commenting at the time of release for ncurses 6.1): # + Apple's Terminal.app does not recognize either form of the direct-color # sequences. # + Cygwin's mintty recognizes xterm's original implementation, does okay with @@ -4926,6 +4949,36 @@ nsterm-direct|nsterm with direct-color indexing, # + terminology 0.91 recognizes xterm's original implementation, but does # nothing useful with it. +# 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. + +xterm+direct16|xterm with direct-color indexing, + CO#16, + setab=\E[%?%p1%{8}%<%t4%p1%d%e%?%p1%{16}%<%t%p1%{92}%+%e48\: + 2\:\:%p1%{65536}%/%d\:%p1%{256}%/%{255}%&%d\:%p1%{255} + %&%d%;%;m, + setaf=\E[%?%p1%{8}%<%t3%p1%d%e%?%p1%{16}%<%t%p1%'R'%+%e38\:2 + \:\:%p1%{65536}%/%d\:%p1%{256}%/%{255}%&%d\:%p1%{255} + %&%d%;%;m, + setb@, setf@, use=xterm+direct, + +xterm-direct16|xterm with direct-colors and 16 indexed colors, + use=xterm, use=xterm+direct16, + +xterm+direct256|xterm with direct-color indexing, + CO#0x100, + setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e%? + %p1%{256}%<%t48;5;%p1%d%e48\:2\:\:%p1%{65536}%/%d\:%p1 + %{256}%/%{255}%&%d\:%p1%{255}%&%d%;%;m, + setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e%? + %p1%{256}%<%t38;5;%p1%d%e38\:2\:\:%p1%{65536}%/%d\:%p1 + %{256}%/%{255}%&%d\:%p1%{255}%&%d%;%;m, + setb@, setf@, use=xterm+direct, + +xterm-direct256|xterm with direct-colors and 256 indexed colors, + use=xterm, use=xterm+direct256, + #### XTERM Features # This chunk is based on suggestions by Ailin Nemui and Nicholas Marriott, who @@ -5052,7 +5105,7 @@ xterm-vt52|xterm emulating dec vt52, cup=\EY%p1%' '%+%c%p2%' '%+%c, cuu1=\EA, ed=\EJ, el=\EK, home=\EH, ht=^I, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=\r\n, ri=\EI, rmacs=\EG, smacs=\EF, - use=xterm+kbs, + use=xterm+kbs, use=vt52+keypad, xterm-noapp|xterm with cursor keys in normal mode, rmcup@, rmkx=\E>, smcup@, smkx=\E=, use=xterm+noapp, @@ -9451,7 +9504,7 @@ gator|HP 9000 model 237 emulating AAA, rep=%p1%c\E[%p2%db$<1*/>, rev=\E[7m, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m, gator-52|HP 9000 model 237 emulating VT52, - cols#128, lines#47, use=vt52, + cols#128, lines#47, use=vt52-basic, gator-52t|HP 9000 model 237 emulating extra-tall VT52, lines#94, use=gator-52, @@ -16983,8 +17036,8 @@ hz1520-noesc|hazeltine 1520, # Be sure the auto lf/cr switch is set to cr. hz1552|hazeltine 1552, OTbs, - cud1=\n, dl1=\EO, il1=\EE, kf1=\EP, kf2=\EQ, kf3=\ER, lf1=blue, - lf2=red, lf3=green, use=vt52, + cud1=\n, dl1=\EO, il1=\EE, lf1=blue, lf2=red, lf3=green, + use=vt52, hz1552-rv|hazeltine 1552 reverse video, cud1=\n, rmso=\ET, smso=\ES, use=hz1552, # Note: h2000 won't work well because of a clash between upper case and ~'s. @@ -21693,11 +21746,41 @@ dp8242|datapoint 8242, #### DEC terminals (Obsolete types: DECwriter and vt40/42/50) # -# These entries are DEC's official terminfos for its older terminals. -# Contact Bill Hedberg of Terminal Support -# Engineering for more information. Updated terminfos and termcaps -# are kept available at ftp://gatekeeper.dec.com/pub/DEC/termcaps. +# These entries came from DEC's official terminfos for its older terminals +# (which happen to be identical to the AT&T/SCO terminal descriptions), +# Bill Hedberg of Terminal Support Engineering +# may have had more information. Updated terminfos and termcaps were available +# at ftp://gatekeeper.dec.com/pub/DEC/termcaps. + +# DEC's terminfos did not describe the auxiliary keypad. +# +# DECScope of course had no "function keys", but this building block assigns +# the three blank keys at the top of the auxiliary (numeric) keypad, using +# the same analogy as vt100 (also lacking function-keys). # +# These assignments use the same layout for 0-9 as vt100+keypad; the vt52 +# keypad had its cursor-keys on the right-column as shown -TD +# _______________________________________ +# | PF1 | PF2 | PF3 | c-up | +# | \EP | \EQ | \ER | \EA | +# |_kf1__k1_|_kf2__k2_|_kf3__k3_|kcuu1_k4_| +# | 7 8 9 c-down | +# | \E?w | \E?x | \E?y | \EB | +# |_kf9__k9_|_kf10_k;_|_kf0__k0_|kcud1____| +# | 4 | 5 | 6 | c-right | +# | \E?t | \E?u | \E?v | \EC | +# |_kf5__k5_|_kf6__k6_|_kf7__k7_|kcuf1_k8_| +# | 1 | 2 | 3 | c-left | +# | \E?q | \E?r | \E?s | \ED | +# |_ka1__K1_|_kb2__K2_|_ka3__K3_|kcub1____| +# | 0 | . | enter | +# | \E?p | \E?n | \E?M | +# |___kc1_______K4____|_kc3__K5_|_kent_@8_| +# +vt52+keypad|DECScope auxiliary keypad, + ka1=\E?q, ka3=\E?s, kb2=\E?r, kc1=\E?p, kc3=\E?n, kf0=\E?y, + kf1=\EP, kf2=\EQ, kf3=\ER, kf5=\E?t, kf6=\E?u, kf7=\E?v, + kf8=\E?w, kf9=\E?x, gt40|dec gt40, OTbs, os, @@ -21707,17 +21790,17 @@ gt42|dec gt42, OTbs, os, cols#72, lines#40, bel=^G, cr=\r, cub1=^H, cud1=\n, + vt50|dec vt50, OTbs, cols#80, lines#12, bel=^G, clear=\EH\EJ, cr=\r, cub1=^H, cud1=\n, cuf1=\EC, - cuu1=\EA, ed=\EJ, el=\EK, ht=^I, ind=\n, + cuu1=\EA, ed=\EJ, el=\EK, ht=^I, ind=\n, u8=\E/A, u9=\EZ, vt50h|dec vt50h, - OTbs, - cols#80, lines#12, - bel=^G, clear=\EH\EJ, cr=\r, cub1=^H, cud1=\n, cuf1=\EC, - cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, - el=\EK, ht=^I, ind=\n, ri=\EI, + cub1=\ED, cud1=\EB, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, + kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, u8=\E/[HJ], + use=vt52+keypad, use=vt50, + # (vt61: there's a BSD termcap that claims , ) vt61|vt-61|vt61.5|dec vt61, cols#80, lines#24, @@ -24502,6 +24585,8 @@ v3220|LANPAR Vision II model 3220/3221/3222, # This was implemented for the Hurd. # rmxx/smxx describes the ECMA-48 strikeout/crossed-out attributes, as an # experimental feature of tmux. +# CO gives the number of indexed ("ANSI") colors which overlay an RGB color +# space. # E3 clears the terminal's scrollback buffer. This was implemented in the # Linux 3.0 kernel as a security feature. It matches a feature which was # added in xterm patch #107. @@ -26435,4 +26520,18 @@ v3220|LANPAR Vision II model 3220/3221/3222, # + spelling fixes per codespell -TD # + improve xm example for xterm+x11mouse, xterm+sm+1006 -TD # +# 2020-02-22 +# + improve vt50h and vt52 based on DECScope manual -TD +# + add/use vt52+keypad and vt52-basic -TD +# +# 2020-04-18 +# + use vt52+keypad in xterm-vt52, from xterm #354 -TD +# +# 2020-04-25 +# + use vt100+fnkeys in putty -TD +# +# 2020-05-02 +# + add details on the change to Linux SGR 21 in 2018 -TD +# + add xterm-direct16 and xterm-direct256 -TD +# ######## SHANTIH! SHANTIH! SHANTIH!