X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2Fterminfo.src;h=8078639c796da75e3ecd91db12db9db2816041e1;hp=dccf9b92e09d94892b3cf177d063d70e522c44ae;hb=6be6b9d9202ba34ee545955dc66e355d9855353a;hpb=34d602f272c394e9a980438e636e1ce4d355f83b diff --git a/misc/terminfo.src b/misc/terminfo.src index dccf9b92..8078639c 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.494 $ -# $Date: 2014/05/24 16:04:53 $ +# $Revision: 1.508 $ +# $Date: 2014/06/14 21:16:34 $ # # 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 @@ -1052,26 +1052,26 @@ nsterm+7|AppKit Terminal.app v41+ basic capabilities w/ASCII charset, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, - home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=^J, - invis=\E[8m, kbs=\177, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, - kcuu1=\EOA, kent=\EOM, rc=\E8, rev=\E[7m, ri=\EM, + dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, + el1=\E[1K, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, + ind=^J, invis=\E[8m, kbs=\177, kcub1=\EOD, kcud1=\EOB, + kcuf1=\EOC, kcuu1=\EOA, kent=\EOM, rc=\E8, rev=\E[7m, ri=\EM, rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, - sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m, sgr0=\E[m, smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq, use=vt100+pfkeys, nsterm+acs|AppKit Terminal.app v41+ basic capabilities w/VT100 alternate-charset, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, enacs=\E(B\E)0, rmacs=^O, - sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, use=nsterm+7, nsterm+mac|AppKit Terminal.app v41+ basic capabilities w/MacRoman alternate-charset, acsc=+\335\,\334-\366.\3770#`\327a\:f\241g\261h#i\360jjkkllmmnno\370p\370q\321rrssttuuvvwwxxy\262z\263{\271|\255}\243~\245, enacs=\E(B\E)0, rmacs=^O, - sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, use=nsterm+7, # compare with xterm+sl-twm @@ -1246,10 +1246,11 @@ nsterm|Apple_Terminal|AppKit Terminal.app, # # NOTE: When tack tests (csr) + (nel) iTerm.app crashes, so (csr) is # disabled. -iTerm.app|iTerm.app terminal emulator for Mac OS X, +iTerm.app|iterm|iTerm.app terminal emulator for Mac OS X, bce, bw@, - csr@, kend=\EOF, khome=\EOH, use=xterm+256setaf, - use=nsterm-16color, + csr@, dim@, kend=\EOF, khome=\EOH, + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, + use=xterm+256setaf, use=nsterm-16color, # xnuppc - Darwin PowerPC Console (a.k.a. "darwin") # @@ -3426,7 +3427,7 @@ vt525|DEC VT525, # # In trying to get the function keys to work, I had to cobble my own # terminfo.src entry, since the existing vt520 entry doesn't include most of -# the function keys.  If I blend the entries for "vt420f" and "vt220+keypad" +# the function keys. If I blend the entries for "vt420f" and "vt220+keypad" # I seem to get them all -Mike Gran vt520ansi|Boundless VT520 ANSI, use=ansi+rca, use=vt420f, use=vt220+keypad, @@ -4087,24 +4088,25 @@ xterm-basic|modern xterm terminal emulator - common, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, - flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, - ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, - ind=^J, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, - kmous=\E[M, meml=\El, memu=\Em, op=\E[39;49m, rc=\E8, - rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, - rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>, - rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, - rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, setab=\E[4%p1%dm, - setaf=\E[3%p1%dm, + cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, + dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, + el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, home=\E[H, + hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, + il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m, + is2=\E[!p\E[?3;4l\E[4l\E>, kmous=\E[M, meml=\El, + memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, + ritm=\E[23m, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l, + rmir=\E[4l, rmkx=\E[?1l\E>, rmm=\E[?1034l, rmso=\E[27m, + rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, + setab=\E[4%p1%dm, setaf=\E[3%p1%dm, setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, - sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, - sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h, - smir=\E[4h, smkx=\E[?1h\E=, smm=\E[?1034h, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3;J, - use=ansi+pp, use=xterm+kbs, use=vt100+enq, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, + sgr0=\E(B\E[m, sitm=\E[3m, smacs=\E(0, smam=\E[?7h, + smcup=\E[?1049h, smir=\E[4h, smkx=\E[?1h\E=, + smm=\E[?1034h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, + vpa=\E[%i%p1%dd, E3=\E[3;J, use=ansi+pp, use=xterm+kbs, + use=vt100+enq, # From: David J. MacKenzie , 14 Nov 1997 # In retrospect, something like xterm-r6 was intended here -TD @@ -4610,7 +4612,10 @@ gnome-2008|GNOME Terminal snapshot 2.22.3, # # Testing with tack shows that flash does not/has not worked -TD vte-2012|VTE 0.34.1, - flash@, ritm=\E[23m, sitm=\E[3m, use=vte-2008, + ncv#16, + dim=\E[2m, flash@, invis=\E[8m, ritm=\E[23m, + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p7%t;8%;%?%p1%p3%|%t;7%;m%?%p9%t\016%e\017%;, + sitm=\E[3m, use=vte-2008, # Version 3.6.1 sets TERM to xterm-256color (still hardcoded), which has # 61 differences from a correct entry for gnome terminal. gnome-2012|GNOME Terminal 3.6.0, @@ -4712,6 +4717,9 @@ kvt|KDE terminal, # Updated for konsole 1.6.6: # add control-key modifiers for function-keys, etc. # +# Updated for konsole 2.12.4: +# add sitm/ritm +# # vttest menu 1 shows that both konsole and gnome terminal do wrapping # different from xterm (and vt100's). They have the same behavior in this # detail, but it is unclear which copies the other. @@ -4723,11 +4731,11 @@ konsole-base|KDE console window, hpa=\E[%i%p1%dG, indn=\E[%p1%dS, kbs=\177, kdch1=\E[3~, kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@, - kf9@, kfnd@, khome=\E[1~, kslt@, rin=\E[%p1%dT, rmam=\E[?7l, - rmso=\E[27m, rmul=\E[24m, + kf9@, kfnd@, khome=\E[1~, kslt@, rin=\E[%p1%dT, ritm=\E[23m, + rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, - sgr0=\E[0m\017, smam=\E[?7h, vpa=\E[%i%p1%dd, + sgr0=\E[0m\017, sitm=\E[3m, smam=\E[?7h, vpa=\E[%i%p1%dd, use=ecma+color, use=xterm-r6, konsole-linux|KDE console window with linux keyboard, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13@, @@ -4780,8 +4788,8 @@ mlterm|multi lingual terminal emulator, # mlterm.ti; this entry is based on testing with tack and vttest -TD mlterm3|multi lingual terminal emulator, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, - use=xterm+app, use=xterm+pcf0, use=xterm+pcc2, - use=xterm+pce2, use=mlterm2, + ritm=\E[23m, sitm=\E[3m, use=xterm+app, use=xterm+pcf0, + use=xterm+pcc2, use=xterm+pce2, use=mlterm2, # This is mlterm 2.9.3's mlterm.ti, with some additions/corrections -TD # @@ -5294,9 +5302,11 @@ decansi|ANSI emulation with DEC compatibility hacks, u7=\E[6n, vpa=\E[%i%p1%dd, #### VWM +# http://vwm.sourceforge.net/ # -# vwmterm is a terminal emulator written for the VWM console window manager -# +# VWM 2.0.2 (2009-05-01) +# vwmterm is a terminal emulator written for the VWM console window manager. +# This version is obsolete, replaced by libvterm in 2.1.0 (2009-10-23). vwmterm|(vwm term), am, bce, ccc, mir, msgr, npc, xenl, xon, colors#8, pairs#64, @@ -5472,7 +5482,7 @@ st-256color|stterm-256color|simpleterm with 256 colors, use=xterm+256color, use=st, #### TERMINATOR -# http://software.jessies.org/terminator/ +# https://code.google.com/p/jessies/ # Tested using their Debian package org.jessies.terminator 6.104.3256 on 64-bit # Debian/current -TD (2011/8/20) # @@ -5676,7 +5686,56 @@ eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, # S0 (str) Switch charset 'G0' to the specified charset. # E0 (str) Switch charset 'G0' back to standard charset. # -# tested with screen 3.09.08 +# Initially tested with screen 3.09.08 +# +# According to its manual page +# +# Screen is a full-screen window manager that multiplexes a physical +# terminal between several processes (typically interactive shells). Each +# virtual terminal provides the functions of a DEC VT100 terminal and, in +# addition, several control functions from the ISO 6429 (ECMA 48, ANSI +# X3.64) and ISO 2022 standards (e.g. insert/delete line and support for +# multiple character sets). +# +# However, there is a design error in its support for video highlights. The +# program uses a table (rendlist) which equates the SGR codes to terminal +# capabilities. That, and color-decoding are hardcoded in screen; its behavior +# is modified only by the presence or absence of the corresponding capabilities. +# Not by their values. +# +# If screen sets the TERMCAP variable, it uses hardcoded strings which +# correspond to the rendlist table. +# +# The table gives this information: +# +# SGR capability +# --- --------- +# 1 bold +# 2 dim +# 3 standout +# 4 underline +# 5 blink +# - (unused 6) +# 7 reverse +# - (unused 8-21) +# 22 reset bold, standout and dim +# 23 reset standout +# 24 reset underline +# 25 reset blink +# - (unused 26) +# 27 reset reverse +# +# ECMA-48 differs from this: 3 and 23 set and reset italics, respectively. +# ECMA-48 does not define "standout" - that is a termcap/terminfo abstraction. +# Without some redesign of screen, it is not possible to extend the set of +# capabilities. Substitution would be possible, e.g., sending italics in +# place of underline. +# +# Because screen uses hard-coded parsing, it does not check if two capabilities +# use the same value. For example, changing standout to be the same as any of +# the other capabilities will confuse screen. Curses applications which use +# sgr are not impacted (because that usually resets all capabilities before +# setting any), but termcap applications do not use sgr -TD screen|VT 100/ANSI X3.64 virtual terminal, OTbs, OTpt, am, km, mir, msgr, xenl, G0, colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1, @@ -5761,6 +5820,12 @@ screen-256color-bce-s|GNU Screen with 256 colors, BCE, and status line, screen+fkeys|function-keys according to screen, kend=\E[4~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kfnd@, khome=\E[1~, kslt@, + +# See explanation before "screen" entry. Cancel italics so that applications +# do not assume screen supports the feature. Add this tweak to entries which +# extend screen for terminals which do support italics. +screen+italics|screen cannot support italics, + ritm@, sitm@, # # Here are a few customized entries which are useful -TD # @@ -5781,8 +5846,8 @@ screen+fkeys|function-keys according to screen, screen.xterm-xfree86|screen.xterm-new|screen customized for modern xterm, bce@, bw, invis@, kIC@, kNXT@, kPRV@, meml@, memu@, - sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m, - E3@, use=screen+fkeys, use=xterm-new, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;m, + E3@, use=screen+italics, use=screen+fkeys, use=xterm-new, # xterm-r6 does not really support khome/kend unless it is propped up by # the translations resource. screen.xterm-r6|screen customized for X11R6 xterm, @@ -5804,11 +5869,11 @@ screen.Eterm|screen in Eterm, screen.mrxvt|screen in mrxvt, use=screen+fkeys, use=mrxvt, screen.vte|screen in any VTE-based terminal, - use=screen+fkeys, use=vte, + use=screen+italics, use=screen+fkeys, use=vte, screen.gnome|screen in GNOME Terminal, - use=screen+fkeys, use=gnome, + use=screen+italics, use=screen+fkeys, use=gnome, screen.konsole|screen in KDE console window, - use=screen+fkeys, use=konsole, + use=screen+italics, use=screen+fkeys, use=konsole, # fix the backspace key screen.linux|screen in linux console, bw, @@ -5831,7 +5896,7 @@ screen.mlterm|screen in mlterm, # defbce on screen-bce.xterm-new|screen optimized for modern xterm, bce, - ech@, use=screen.xterm-new, + ech@, use=screen+italics, use=screen.xterm-new, screen-bce.rxvt|screen optimized for rxvt, bce, ech@, use=screen.rxvt, @@ -5843,10 +5908,10 @@ screen-bce.mrxvt|screen optimized for mrxvt, ech@, use=screen.mrxvt, screen-bce.gnome|screen optimized for GNOME-Terminal, bce, - ech@, use=screen.gnome, + ech@, use=screen+italics, use=screen.gnome, screen-bce.konsole|screen optimized for KDE console window, bce, - ech@, use=screen.konsole, + ech@, use=screen+italics, use=screen.konsole, screen-bce.linux|screen optimized for linux console, bce, ech@, use=screen.linux, @@ -18142,7 +18207,7 @@ osexec|Osborne executive, # # See -# http://www.minix3.org/manpages/man4/console.4.html +# http://www.minix3.org/manpages/html4/console.html minix|minix console (v3), acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376, kdch1=\177, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~, @@ -23309,4 +23374,24 @@ v3220|LANPAR Vision II model 3220/3221/3222, # * correct ti924-8 which had confused padding versus octal escapes -TD # * correct padding in sbi entry -TD # +# 2014-06-07 +# * update xterm-new to patch #305 -TD +# + change screen's smso to use SGR 7 (ECMA-80 reverse) rather than SGR 3 +# (italic). This was a long-ago typo in screen 3.1.1 which was +# overlooked until a few terminal emulators implemented the feature -TD +# +# 2014-06-09 +# > fix regression in screen terminfo entries (reports by Christian +# Ebert, Gabriele Balducci) -TD +# + revert the change to screen; see notes for why this did not work -TD +# + cancel sitm/ritm for entries which extend "screen", to work around +# screen's hardcoded behavior for SGR 3 -TD +# +# 2014-06-14 +# + modify sgr for screen.xterm-new to support dim capability -TD +# + add dim capability to nsterm+7 -TD +# + cancel dim capability for iterm -TD +# + add dim, invis capabilities to vte-2012 -TD +# + add sitm/ritm to konsole-base and mlterm3 -TD +# ######## SHANTIH! SHANTIH! SHANTIH!