=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/share/termtypes/termtypes.master,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- src/share/termtypes/termtypes.master 2017/02/07 15:14:28 1.60 +++ src/share/termtypes/termtypes.master 2017/04/19 15:20:55 1.61 @@ -1,6 +1,6 @@ ######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE # -# $OpenBSD: termtypes.master,v 1.60 2017/02/07 15:14:28 nicm Exp $ +# $OpenBSD: termtypes.master,v 1.61 2017/04/19 15:20:55 nicm Exp $ # # OpenBSD local changes: # - add rxvt-unicode and rxvt-unicode-256color @@ -13,8 +13,8 @@ # Report bugs and new terminal descriptions to # bug-ncurses@gnu.org # -# $Revision: 1.60 $ -# $Date: 2017/02/07 15:14:28 $ +# $Revision: 1.61 $ +# $Date: 2017/04/19 15:20:55 $ # # 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 @@ -472,6 +472,9 @@ ecma+sgr|attribute capabilities for true ECMA-48 terminals, rmso=\E[27m, rmul=\E[24m, use=klone+sgr8, +ecma+strikeout|ECMA-48 strikeout/crossed-out, + rmxx=\E[29m, smxx=\E[9m, + # For comparison, here are all the capabilities implied by the Intel # Binary Compatibility Standard (level 2) that fit within terminfo. # For more detail on this rather pathetic standard, see the comments @@ -890,13 +893,13 @@ # nsterm*|Apple_Terminal - AppKit Terminal.app # -# Terminal.app is a Terminal emulator bundled with NeXT's NeXTStep and +# Terminal.app is a Terminal emulator bundled with NeXT's NeXTSTEP and # OPENSTEP/Mach operating systems, and with Apple's Rhapsody, Mac OS X # Server and Mac OS X operating systems. There is also a -# "terminal.app" in GNUStep, but I believe it to be an unrelated +# "terminal.app" in GNUstep, but I believe it to be an unrelated # codebase and I have not attempted to describe it here. # -# For NeXTStep, OPENSTEP/Mach, Rhapsody and Mac OS X Server 1.0, you +# For NeXTSTEP, OPENSTEP/Mach, Rhapsody and Mac OS X Server 1.0, you # are pretty much on your own. Use "nsterm-7-m" and hope for the best. # You might also try "nsterm-7" and "nsterm-old" if you suspect your # version supports color. @@ -949,19 +952,19 @@ # # The Mythology* of AppKit Terminal.app: # -# In the days of NeXTSTep 0.x and 1.x there were two incompatible +# In the days of NeXTSTEP 0.x and 1.x there were two incompatible # bundled terminal emulators, Shell and Terminal. Scott Hess wrote a # shareware replacement for Terminal called "Stuart" which NeXT bought -# and used as the basis for the Terminal.app in NeXTstep 2+, +# and used as the basis for the Terminal.app in NeXTSTEP 2+, # OPENSTEP/Mach, Apple Rhapsody, Mac OS X Server 1.0, and Mac OS X. I # don't know the TERM_PROGRAM and TERM_PROGRAM_VERSION settings or # capabilities for the early versions, but I believe that the # TERM_PROGRAM_VERSION may have been reset at some point. # # The early versions were tailored to the NeXT character set. Sometime -# after the Apple aquisition the encoding was swiched to MacRoman -# (initally with serious altcharset bugs due to incomplete conversion -# of the old NeXT code,) and then later to UTF-8. Alos sometime during +# after the Apple acquisition the encoding was switched to MacRoman +# (initially with serious altcharset bugs due to incomplete conversion +# of the old NeXT code,) and then later to UTF-8. Also sometime during # or just prior to the early days of Mac OS X, the Terminal grew ANSI # 8-color support (initially buggy when combined with attributes, but # that was later fixed.) More recently, around Mac OS X version 10.3 @@ -991,7 +994,7 @@ # "nsterm" to comply with the name length and case conventions and # limitations of various software packages [notably Solaris terminfo # and UNIX.] A single Apple_Terminal alias is retained for -# backwards-compatbility. +# backwards-compatibility. # # * Added function key support (F1-F4). These only work in Terminal.app # version 51, hopefully the capabilities won't cause problems for people @@ -1832,6 +1835,30 @@ initp@, kcbt@, oc@, op=\E[37;40m, rs1=\Ec, tsl=\E[?T, use=linux, +# FbTerm +# Another variant. There are two parts (src, src/lib) with the latter +# comprising the escape-sequence parsing. The copyright notice on that +# says it is based on GTerm by Timothy Miller. +# +# The original developer "dragchan" has left, but as of March 2017 there is +# (still dead) code from May 2015 here: +# https://github.com/izmntuk/fbterm +# +# The acsc string may be incorrect. +# +# Not used here, the program recognizes escapes for italic, underline and +# dim, rendering those as green, cyan and gray respectively. +fbterm|FbTerm for Linux with framebuffer, + colors#256, pairs#32767, + acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i + \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u + \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, + initc=\E[3;%p1%d;%p2%d;%p3%d;%p4%d}, rmacs=\E[10m, + setab=\E[2;%p1%d}, setaf=\E[1;%p1%d}, + sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5 + %t;2%;%?%p6%t;1%;%?%p9%t;11%;m, + sgr0=\E[0;10m, smacs=\E[11m, use=linux, + # 16-color linux console entry; this works with a 256-character # console font but bright background colors turn into dim ones when # you use a 512-character console font. This uses bold for bright @@ -2484,7 +2511,7 @@ cols#132, lines#50, use=arm100, # NetBSD/x68k console vt200 emulator. This port runs on a 68K machine -# manufactured by Sharp for the Japenese market. +# manufactured by Sharp for the Japanese market. # From Minoura Makoto , 12 May 1996 x68k|x68k-ite|NetBSD/x68k ITE, cols#96, lines#32, @@ -3047,7 +3074,7 @@ # | | | | | | | | # | | | Auto XON/XOFF 0-Off | | | Power 0-60 Hz # | | | 1-On | | | 1-50 Hz -# | | Ansi/VT52 0-VT52 | | Bits Per Char. 0-7 Bits +# | | ANSI/VT52 0-VT52 | | Bits Per Char. 0-7 Bits # | | 1-ANSI | | 1-8 Bits # | Keyclick 0-Off | Parity 0-Off # | 1-On | 1-On @@ -3066,26 +3093,34 @@ # # (vt100: I added / based on the init string, also . -- esr) vt100|vt100-am|dec vt100 (w/advanced video), - OTbs, am, mc5i, msgr, xenl, xon, - cols#80, it#8, lines#24, vt#3, + OTbs, mc5i, xenl, xon, + vt#3, + csr=\E[%i%p1%d;%p2%dr, kcub1=\EOD, kcud1=\EOB, + kcuf1=\EOC, kcuu1=\EOA, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, + mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rc=\E8, rmam=\E[?7l, + rmkx=\E[?1l\E>, rs2=\E<\E>\E[?3;4;5l\E[?7;8h\E[r, + sc=\E7, + sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 + %;m%?%p9%t\016%e\017%;$<2>, + smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m$<2>, + use=vt100+4bsd, use=vt100+fnkeys, +vt100+4bsd|dec vt100 from 4.0BSD, + am, msgr, + cols#80, it#8, lines#24, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, - clear=\E[H\E[J$<50>, cr=^M, 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$<2>, + clear=\E[H\E[J$<50>, cr=^M, cub=\E[%p1%dD, cub1=^H, + cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C$<2>, cup=\E[%i%p1%d;%p2%dH$<5>, cuu=\E[%p1%dA, cuu1=\E[A$<2>, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H, ht=^I, hts=\EH, ind=^J, kbs=^H, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, lf1=pf1, - lf2=pf2, lf3=pf3, lf4=pf4, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, - rc=\E8, rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmam=\E[?7l, - rmkx=\E[?1l\E>, rmso=\E[m$<2>, rmul=\E[m$<2>, - rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, + kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, + rev=\E[7m$<2>, ri=\EM$<5>, rmacs=^O, rmso=\E[m$<2>, + rmul=\E[m$<2>, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 %;m%?%p9%t\016%e\017%;$<2>, - sgr0=\E[m\017$<2>, smacs=^N, smam=\E[?7h, smkx=\E[?1h\E=, - smso=\E[7m$<2>, smul=\E[4m$<2>, tbc=\E[3g, - use=vt100+fnkeys, + sgr0=\E[m\017$<2>, smacs=^N, smso=\E[1;7m$<2>, + smul=\E[4m$<2>, tbc=\E[3g, vt100nam|vt100-nam|vt100 no automargins, am@, xenl@, rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h, use=vt100-am, @@ -4153,7 +4188,7 @@ npc, indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM, rin=\E[%p1%dT, use=ansi+enq, use=xterm+pcfkeys, - use=xterm+tmux, use=xterm-basic, + use=xterm+tmux, use=ecma+strikeout, use=xterm-basic, # This fragment is for people who cannot agree on what the backspace key # should send. @@ -4822,8 +4857,8 @@ xterm-pcolor|xterm with color used for highlights and status line, wsl#40, bold=\E[1;43m, rev=\E[7;34m, - sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1;43%;%?%p2%t;4;42%;%?%p1 - %t;7;31%;%?%p3%t;7;34%;%?%p4%t;5%;%?%p7%t;8%;m, + sgr=%?%p9%t\016%e\017%;\E[0%?%p6%t;1;43%;%?%p2%t;4;42%;%?%p1 + %t;7;31%;%?%p3%t;7;34%;m, smso=\E[7;31m, smul=\E[4;42m, use=xterm+sl, use=xterm-r6, # This describes the capabilities of color_xterm, an xterm variant from @@ -5011,7 +5046,7 @@ # GNOME terminal may automatically use the contents of the "xterm" terminfo to # supply key information which is not built into the program. With 2.22.3, -# this list is built into the program (which addresses the inadvertant use of +# this list is built into the program (which addresses the inadvertent use of # random terminfo data, though using a set of values which does not correspond # to any that xterm produces - still not solving the problem that GNOME # terminal hardcodes the $TERM variable as "xterm"). @@ -6536,8 +6571,8 @@ # xterm cursor bits. tmux|tmux terminal multiplexer, ritm=\E[23m, rmso=\E[27m, sitm=\E[3m, smso=\E[7m, - use=xterm+edit, use=xterm+pcfkeys, use=xterm+sl, - use=xterm+tmux, use=screen, + use=ecma+strikeout, use=xterm+edit, use=xterm+pcfkeys, + use=xterm+sl, use=xterm+tmux, use=screen, tmux-256color|tmux with 256 colors, use=xterm+256setaf, use=tmux, @@ -7254,7 +7289,7 @@ # kPRV [shifted prev key] not implemented # khome [home key] really is \E[1~ NOT \E[H # tbc [clear tab stops] not implemented -# xenl [newline ignnored after 80 cols] messes up last line? Ehud Karni +# xenl [newline ignored after 80 cols] messes up last line? Ehud Karni # smpch [Start PC charset] is \E[11m, same as smacs # rmpch [End PC charset] is \E[10m, same as rmacs # mir [move in insert mode] fails in tack? @@ -7596,7 +7631,7 @@ # From: Federico Bianchi # This is the entry for the OpenNT terminal. -# The ntconsole name is for backward compatability. +# The ntconsole name is for backward compatibility. # This is for OpenNT 2.0 and later. # Later OpenNT was renamed to Interix. # @@ -8258,7 +8293,7 @@ # # (hpex: removed memory-lock capabilities ":ml=\El:mu=\Em:", # moved here from hpsub -- esr) -hpex|hp extended capabilites, +hpex|hp extended capabilities, cr=^M, cud1=^J, cup=\E&a%p1%dy%p2%dC, ht=^I, ind=^J, kbs=^H, kcub1=^H, kcud1=^J, nel=^M^J, rmir=\ER, rmul=\E&d@, smir=\EQ, smul=\E&dD, vpa=\E&a%p1%dY, use=hpsub, @@ -8661,7 +8696,7 @@ # on off off Busy active on J5-19, CD disabled - Factory Set. # on off on Busy active on J5-19, CD enabled # -# sw4 Used in conjuction with S4 for comm interface control - Fact 0 +# sw4 Used in conjunction with S4 for comm interface control - Fact 0 # # sw5 Secondary Channel Control (Hardware implementation only) - Fact 0 # @@ -8763,7 +8798,7 @@ OTbs, OTpt, OTkn#4, if=/usr/share/tabset/vt100, - is2=\E<\E>\E[6;?2;?7;?8h\E[4;20;?1;?3;?4;?5;?6;?18;?19l, use=vt100, + is2=\E<\E>\E[6;?2;?7;?8h\E[4;20;?1;?3;?4;?5;?6;?18;?19l, use=vt100+4bsd, # (adm42: removed obsolete ":ma=^K^P:" -- esr) adm42|lsi adm42, OTbs, am, @@ -9136,7 +9171,7 @@ # (including some with magic cookies), fancy half-duplex mode, and # different bugs. # -# Some operations reqire truly incredible amounts of padding. The +# Some operations require truly incredible amounts of padding. The # insert_line () and delete_line () operations in particular # are so slow as to be nearly unusable. # @@ -10182,7 +10217,7 @@ ind=\ED, is1=\E>\E[?3l\E[?4l\E[?7h\E[?8h\E[1;24r, rev=\E[7m, ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m, tsl=\EP2~, - use=vt100, + use=vt100+4bsd, #### Wyse (wy) # @@ -10927,8 +10962,8 @@ # terminfo. At one point, I found some reference indicating that this # terminal bug (not sending \E[) was acknowledged by Wyse (so it's not just # me), but I can't find that and the server under my bookmark to "Wyse -# Technical" isn't responding. So there's the question of wether the wy85 -# terminfo should reflect the manufactuer's intended behaviour of the terminal +# Technical" isn't responding. So there's the question of whether the wy85 +# terminfo should reflect the manufacturer's intended behaviour of the terminal # or the actual." wy85-8bit|wyse85-8bit|wyse 85 in 8-bit mode, am, hs, mc5i, mir, msgr, xenl, xon, @@ -11650,7 +11685,7 @@ # These entries attempt to describe Avatar, a terminal emulation used with # MS-DOS bulletin-board systems. It was designed to give ANSI-like # capabilities, but with cheaper (shorter) control sequences. Messy design, -# excessively dependent on PC idiosyncracies, but apparently rather popular +# excessively dependent on PC idiosyncrasies, but apparently rather popular # in the BBS world. # # No color support. Avatar doesn't fit either of the Tektronix or HP color @@ -11692,7 +11727,7 @@ # ^V^Q%c -- query the driver # ^V^R -- driver reset # ^V^S -- Sound tone (PC-specific) -# ^V^T -- change highlight at current cursor poition to %c +# ^V^T -- change highlight at current cursor position to %c # ^V^U%p1%c%p2%c -- highlight window with attribute # ^V^V%p1%c%p2%c%p3%c%p4%c%p5%c # -- define window @@ -13179,7 +13214,7 @@ # Briefly, the settings are for the following modes: # (values are for bit set/clear with * indicating our preference # and the value used to test these termcaps) -# Note that many of these settings are irrelevent to the terminfo +# Note that many of these settings are irrelevant to the terminfo # and are just set to the default mode of the terminal as shipped # by the factory. # @@ -13608,7 +13643,7 @@ # Cursor forward FF # Cursor home RS # Cursor up VT -# Cursor supress ETB +# Cursor suppress ETB # Cursor enable CAN # Erase to end of line ESC,T # Erase to end of page ESC,Y @@ -13748,8 +13783,8 @@ # tset or setterm etc.) provided that the terminal has been manually set # up (and the setup saved with ^S) to be compatible with this termcap. To be # compatible it should be in ANSI mode (not VT52). A set-up that -# works is to set all the manually setable stuff to factory defaults -# by pressing ^D in set-up mode. Then increse the brighness with the +# works is to set all the manually settable stuff to factory defaults +# by pressing ^D in set-up mode. Then increase the brightness with the # up-arrow key since the factory default will likely be dim on an old # terminal. Then change any options you want (provided that they are # compatible with the termcap). For my terminal I set: Screen @@ -13871,7 +13906,7 @@ clear=^L, cuf1=^X, cup=\002%p2%{32}%+%c%p1%{32}%+%c, cuu1=^W, el=^K, home=^Y, kcub1=^H, kcud1=^J, kcuf1=^I, kcuu1=^W, khome=^Y, -cdc721ll|CDC Vikingll, +cdc721ll|CDC Viking with long lines, OTbs, am, cols#132, lines#24, clear=^L, cuf1=^X, cup=\002%p2%{32}%+%c%p1%{32}%+%c, @@ -14255,7 +14290,7 @@ # there is no way of knowing what it is that the program wants turned # off. # smul: The "underline" attribute is reconfigurable to an overline or -# strikethru, or (as done with \E[;3+} in is2=), to a line at the true +# strike-through, or (as done with \E[;3+} in is2=), to a line at the true # bottom of the character cell. This was done to allow for more readable # underlined characters, and to be able to distinguish between an # underlined space, an underscore, and an underlined underscore. @@ -14359,7 +14394,7 @@ # It's not made clear in the manuals, but based on other ansi/vt type # terminals, it's a good guess that this terminal is capable of both # "transparent print" (which doesn't copy data to the screen, and -# therefore needs mc5i: specified to say so) and "auxilliary print" +# therefore needs mc5i: specified to say so) and "auxiliary print" # (which does duplicate printed data on the screen, in which case mc4= # and mc5= should use the \E[?4i and \E[?5i strings instead). @@ -15350,7 +15385,7 @@ # # 2 Margin Bell 0=off 1=on # Keyclick 0=off 1=on -# Ansi/VT52 0=VT52 1=Ansi +# ANSI/VT52 0=VT52 1=ANSI # Xon/Xoff 0=Off 1=On # # 3 Shift3 0=Hash 1=UK Pound @@ -15378,7 +15413,7 @@ cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, ri=\EM, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smso=\E[7m, smul=\E[4m, - use=vt100, + use=vt100+4bsd, # except in 132 column mode, where it needs a little padding. # This is still less padding than the vt100, and you can always turn on # the ^S/^Q handshaking, so you can use vt100 flavors for things like @@ -16365,7 +16400,7 @@ #ctrl-A set SOM position at cursor position #ctrl-G Bell #ctrl-H Backspace -#ctrl-I Horiz tab +#ctrl-I Horizontal tab #ctrl-J Linefeed #ctrl-K Cursor up #ctrl-L Cursor right @@ -17272,7 +17307,7 @@ colors#8, pairs#64, op=\E[0m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=ncr260vt300pp, -# The Intecolor emulation of the NCR 2900/260C color terminal is basicly a +# The Intecolor emulation of the NCR 2900/260C color terminal is basically a # DEC vt200/300 with color capabilities added. ncr260intwpp|NCR Intecolor emulation of the 2900_260C with a PC+ keyboard in 132 column mode, colors#8, pairs#64, @@ -17513,7 +17548,7 @@ # 'setf' definition. The escape sequence to set color attributes is # ESC d y 1 # In addition, the background color can be changed through the desk accessories. -# The capablitiy 'op' sets colors to green on black (default combination). +# The capability 'op' sets colors to green on black (default combination). # # NOTE: The NCR Unix System Administrator's Shell will not function properly # if the 'pairs' capability is defined. Un-Comment the 'pairs' @@ -18533,7 +18568,7 @@ is2=\E%\E!0\EQD1\EUX03\EKA\ELBB2\ELCE0\ELI100\ELJ2\ELLB2 \ELM0\ELS1\ELX00\ELV1\E%\E!1\E>\E[?3l\E[?4l\E[?5l\E[?7h \E[?8h, - rc@, sc@, smkx=\E=, use=vt100, + rc@, sc@, smkx=\E=, use=vt100+4bsd, # From: # (tek4207: This was the termcap file's entry for the 4107/4207, but SCO @@ -18756,7 +18791,7 @@ # Steve Jacobson 8/85 pcplot|pc-plot terminal emulation program, xenl@, - csr@, dl@, dl1@, il@, il1@, rc@, sc@, use=vt100, + csr@, dl@, dl1@, il@, il1@, rc@, sc@, use=vt100+4bsd, # KayPro II from Richard G Turner # I've found that my KayPro II, running MDM730, continues to emulate an # ADM-3A terminal, just like I was running TERM.COM. On our 4.2 UNIX @@ -19022,7 +19057,7 @@ OTdN#30, blink@, dch1=\E[P$<7/>, ich1=\E[@$<9/>, ip=$<7/>, use=lisa, # Lisaterm in 132 column ("wide") mode. -mac-w|macterminal-w|Apple Macintosh with Macterminal in 132 column mode, +mac-w|macterminal-w|Apple Macintosh with MacTerminal in 132 column mode, cols#132, use=mac, #### Radio Shack/Tandy @@ -19746,10 +19781,10 @@ # 1. Using double-shapes for vt100 graphical chars (eg: mc). # 2. Native brown color corrected to good yellow color. # 3. Adding "Insert" and "Delete Line" keys as ESC Up and ESC Down arrow keys. -# 4. Suppressed inexistant underlined mode (normally as bright). +# 4. Suppressed nonexistent underlined mode (normally as bright). # 5. ich/ich1 not filled because of non-curses programs. #-- -# 6. Suppressed inexistant invisible mode. +# 6. Suppressed nonexistent invisible mode. #(7.)Adding forgotten "cub/cud/cuf/cuu" sequences deplacement. linux-m1b|Linux Minitel 1B "like" Monochrome (Gris/Blanc/Noir+Dim), @@ -19854,7 +19889,7 @@ # From: Alexandre Montaron, 19 Nov 2015, updated 19 Sep 2016 # # He comments: -# viewdata lacks a true cup capabilitie, +# viewdata lacks a true cup capability, # so I achieved it with home and cud1/cuf1 sequences only ! viewdata|prestel/viewdata terminals, am, bw, eslok, hz, @@ -20798,7 +20833,7 @@ # Approximate date of release was 1982 (early 80s, anyway), and it had several # evolutions including (limited) color versions such as the PS330C. PS300s # were effectively obsolete by the late 80s, replaced by raster graphics -# systems, although specialized applications like molecular modelling +# systems, although specialized applications like molecular modeling # hung onto them for a while longer. AFAIK all E&S vector graphics systems # are out of production, though of course E&S is very much alive (in 1996). # (ps300: changed ":pt@:" to "it@" -- esr) @@ -20806,7 +20841,7 @@ ps300|Picture System 300, xt, it@, - rmso@, rmul@, smso@, smul@, use=vt100, + rmso@, rmul@, smso@, smul@, use=vt100+4bsd, #### General Electric (ge) # @@ -20966,7 +21001,7 @@ # indicated by the name. kc -> key click, nkc -> no key click, uc -> underscore # cursor, bc -> block cursor. # From: Mike Meyers -# (z29a: replaced nonexistent befause +# (z29a: replaced nonexistent because # looks vt100-compatible -- esr) z29a|z29a-kc-bc|h29a-kc-bc|heath/zenith 29 in ansi mode, OTbs, OTpt, am, eslok, hs, mir, msgr, @@ -20988,7 +21023,7 @@ \E[11m, sc=\E[s, sgr0=\E[m, smcup=\E[?7l, smso=\E[7;2m, smul=\E[4m, tbc=\E[3g, tsl=\E[s\E[>5;1h\E[25;%i%dH\E[1K, -z29a-kc-uc|h29a-kc-uc|z29 ansi mode with keyckick and underscore cursor, +z29a-kc-uc|h29a-kc-uc|z29 ansi mode with keyclick and underscore cursor, rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11 m, use=z29a, @@ -21187,7 +21222,7 @@ is2=\E\^9;0s\E\^7;1s\E[3g\E\^11;9s\E\^11;17s\E\^11;25s\E\^11 ;33s\E\^11;41s\E\^11;49s\E\^11;57s\E\^11;65s\E\^11;73s \E\^11;81s\E\^11;89s, - rf@, ri=\EM\E[K$<5/>, use=vt100, + rf@, ri=\EM\E[K$<5/>, use=vt100+4bsd, # The GX-1000 manual is dated 1984. This looks rather like a VT-52. modgraph2|modgraph gx-1000 80x24 with keypad not enabled, am, da, db, @@ -21288,7 +21323,7 @@ #### Ramtek # # Ramtek was a vendor of high-end graphics terminals around 1979-1983; they -# were competition for things like the Tektronics 4025. +# were competition for things like the Tektronix 4025. # # Ramtek 6221 from BRL, probably by Doug Gwyn @@ -21506,7 +21541,8 @@ OTdN@, cols#80, lines#24, lm#96, cud1=^J, cup=\E[%i%p1%d;%p2%dH, dch1=\E[P, dl1=\E[M, il1=\E[L, is2=\E[?7h\E[?3l\E[?5l, kcub1=\E[D, kcud1=\E[B, - kcuu1=\E[A, rmir=\E[4l, rmkx@, smir=\E[4h, smkx@, use=vt100, + kcuu1=\E[A, rmir=\E[4l, rmkx@, smir=\E[4h, smkx@, + use=vt100+4bsd, tab132-w|tab132 in wide mode, cols#132, is2=\E[?7h\E[?3h\E[?5l, use=tab132, @@ -22239,7 +22275,7 @@ # Software (formerly Peripherals Computers & Supplies, Inc) of # 2457 Perkiomen Ave., Reading, PA 19606, 1-800-876-8376. They can # also be reached at support@synergy.com. -versaterm|versaterm vt100 emulator for the macintosh, +versaterm|versaterm vt100 emulator for the Macintosh, am, xenl, cols#80, it#8, lines#24, bel=^G, blink=\E[5m$<2/>, bold=\E[1m$<2/>, @@ -22446,7 +22482,7 @@ enacs@, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rmacs@, sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t; 1%;m$<2>, - sgr0=\E[0m$<2>, smacs@, use=vt100, + sgr0=\E[0m$<2>, smacs@, smso=\E[7m, use=vt100+4bsd, # These execuports were impact-printer ttys with a 30- or maybe 15-cps acoustic # coupler attached, the whole rig fitting in a suitcase and more or less # portable. Hot stuff for c.1977 :-) -- esr @@ -22579,7 +22615,7 @@ # You can obtain ECMA-48 for free by sending email to helpdesk@ecma.ch # requesting the standard(s) you want (i.e. ECMA-48, "Control Functions for # Coded Character Sets"), include your snail-mail address, and you should -# receive the document in due course. Don't expect an email acknowledgement. +# receive the document in due course. Don't expect an email acknowledgment. # # Related standards include "X3.4-1977: American National Standard Code for # Information Interchange" (the ASCII standard) and "X3.41.1974: @@ -22604,8 +22640,8 @@ # sequences. In the main table, \E stands for an escape (\033) character, # SPC for space. Pn stands for a single numeric parameter to be inserted # in decimal ASCII. Ps stands for a list of such parameters separated by -# semicolons. Parameter meanings for most parametrized sequences are -# decribed in the notes. +# semicolons. Parameter meanings for most parameterized sequences are +# described in the notes. # # Sequence Sequence Parameter or # Mnemonic Name Sequence Value Mode terminfo @@ -22613,7 +22649,7 @@ # APC Applicatn Program Command \E _ - Delim - # BEL Bell * ^G - - bel # BPH Break Permitted Here * \E B - * - -# BS Backpace * ^H - EF - +# BS BackSpace * ^H - EF - # CAN Cancel * ^X - - - (A) # CBT Cursor Backward Tab \E [ Pn Z 1 eF cbt # CCH Cancel Previous Character \E T - - - @@ -22791,9 +22827,14 @@ # (E) ECMA-48 calls this "Active Position Report" but preserves the CPR # abbreviation. # -# (F) CTC parameter values: 0 = set char tab, 1 = set line tab, 2 = clear -# char tab, 3 = clear line tab, 4 = clear all char tabs on current line, -# 5 = clear all char tabs, 6 = clear all line tabs. +# (F) CTC parameter values: +# 0 = set char tab, +# 1 = set line tab, +# 2 = clear char tab, +# 3 = clear line tab, +# 4 = clear all char tabs on current line, +# 5 = clear all char tabs, +# 6 = clear all line tabs. # # (G) CUP and HVP are identical in effect. Some ANSI.SYS versions accept # HVP, but always allow CUP as an alternate. ECMA-48 calls HVP "Character @@ -22802,12 +22843,19 @@ # (H) ECMA calls this "Cursor Line Tabulation" but preserves the CVT # abbreviation. # -# (I) DSR parameter values: 0 = ready, 1 = busy, 2 = busy, will send DSR -# later, 3 = malfunction, 4 = malfunction, will send DSR later, 5 = request -# DSR, 6 = request CPR response. +# (I) DSR parameter values: +# 0 = ready, +# 1 = busy, +# 2 = busy, will send DSR later, +# 3 = malfunction, +# 4 = malfunction, will send DSR later, +# 5 = request DSR, +# 6 = request CPR response. # -# (J) ECMA calls ED "Erase In Page". EA/ED/EL parameters: 0 = clear to end, -# 1 = clear from beginning, 2 = clear. +# (J) ECMA calls ED "Erase In Page". EA/ED/EL parameters: +# 0 = clear to end, +# 1 = clear from beginning, +# 2 = clear. # # (K) ECMA calls this "End of Guarded Area" but preserves the EPA abbreviation. # @@ -22820,20 +22868,57 @@ # (N) ECMA-48 calls this "Character Tabulation" but retains the HT # abbreviation. # -# (O) SGR parameter values: 0 = default mode (attributes off), 1 = bold, -# 2 = dim, 3 = italicized, 4 = underlined, 5 = slow blink, 6 = fast blink, -# 7 = reverse video, 8 = invisible, 9 = crossed-out (marked for deletion), -# 10 = primary font, 10 + n (n in 1..9) = nth alternative font, 20 = Fraktur, -# 21 = double underline, 22 = turn off 2, 23 = turn off 3, 24 = turn off 4, -# 25 = turn off 5, 26 = proportional spacing, 27 = turn off 7, 28 = turn off -# 8, 29 = turn off 9, 30 = black fg, 31 = red fg, 32 = green fg, 33 = yellow -# fg, 34 = blue fg, 35 = magenta fg, 36 = cyan fg, 37 = white fg, 38 = set -# fg color as in CCIT T.416, 39 = set default fg color, 40 = black bg -# 41 = red bg, 42 = green bg, 43 = yellow bg, 44 = blue bg, 45 = magenta bg, -# 46 = cyan bg, 47 = white bg, 48 = set bg color as in CCIT T.416, 39 = set -# default bg color, 50 = turn off 26, 51 = framed, 52 = encircled, 53 = -# overlined, 54 = turn off 51 & 52, 55 = not overlined, 56-59 = reserved, -# 61-65 = variable highlights for ideograms. +# (O) SGR parameter values: +# 0 = default mode (attributes off), +# 1 = bold, +# 2 = dim, +# 3 = italicized, +# 4 = underlined, +# 5 = slow blink, +# 6 = fast blink, +# 7 = reverse video, +# 8 = invisible, +# 9 = crossed-out (marked for deletion), +# 10 = primary font, +# 10 + n (n in 1..9) = nth alternative font, +# 20 = Fraktur, +# 21 = double underline, +# 22 = turn off 2, +# 23 = turn off 3, +# 24 = turn off 4, +# 25 = turn off 5, +# 26 = proportional spacing, +# 27 = turn off 7, +# 28 = turn off 8, +# 29 = turn off 9, +# 30 = black fg, +# 31 = red fg, +# 32 = green fg, +# 33 = yellow fg, +# 34 = blue fg, +# 35 = magenta fg, +# 36 = cyan fg, +# 37 = white fg, +# 38 = set fg color as in CCITT T.416, +# 39 = set default fg color, +# 40 = black bg +# 41 = red bg, +# 42 = green bg, +# 43 = yellow bg, +# 44 = blue bg, +# 45 = magenta bg, +# 46 = cyan bg, +# 47 = white bg, +# 48 = set bg color as in CCITT T.416, +# 49 = set default bg color, +# 50 = turn off 26, +# 51 = framed, +# 52 = encircled, +# 53 = overlined, +# 54 = turn off 51 & 52, +# 55 = not overlined, +# 56-59 = reserved, +# 61-65 = variable highlights for ideograms. # # (P) SI is also called LSO, Locking Shift Zero. # @@ -22843,11 +22928,15 @@ # use CUD for this function and ignore VPR. ECMA calls it `Line Position # Absolute' but retains the VPA abbreviation. # -# (S) MC parameters: 0 = start xfer to primary aux device, 1 = start xfer from -# primary aux device, 2 = start xfer to secondary aux device, 3 = start xfer -# from secondary aux device, 4 = stop relay to primary aux device, 5 = -# start relay to primary aux device, 6 = stop relay to secondary aux device, -# 7 = start relay to secondary aux device. +# (S) MC parameters: +# 0 = start xfer to primary aux device, +# 1 = start xfer from primary aux device, +# 2 = start xfer to secondary aux device, +# 3 = start xfer from secondary aux device, +# 4 = stop relay to primary aux device, +# 5 = start relay to primary aux device, +# 6 = stop relay to secondary aux device, +# 7 = start relay to secondary aux device. # # (T) ECMA-48 calls this "Partial Line Forward" but retains the PLD # abbreviation. @@ -22857,20 +22946,33 @@ # # (V) ECMA-48 calls this "Reverse Line Feed" but retains the RI abbreviation. # -# (W) RM/SM modes are as follows: 1 = Guarded Area Transfer Mode (GATM), -# 2 = Keyboard Action Mode (KAM), 3 = Control Representation Mode (CRM), -# 4 = Insertion Replacement Mode, 5 = Status Report Transfer Mode (SRTM), -# 6 = Erasure Mode (ERM), 7 = Line Editing Mode (LEM), 8 = Bi-Directional -# Support Mode (BDSM), 9 = Device Component Select Mode (DCSM), -# 10 = Character Editing Mode (HEM), 11 = Positioning Unit Mode (PUM), -# 12 = Send/Receive Mode, 13 = Format Effector Action Mode (FEAM), -# 14 = Format Effector Transfer Mode (FETM), 15 = Multiple Area Transfer -# Mode (MATM), 16 = Transfer Termination Mode, 17 = Selected Area Transfer -# Mode, 18 = Tabulation Stop Mode, 19 = Editing Boundary Mode, 20 = Line Feed -# New Line Mode (LF/NL), Graphic Rendition Combination Mode (GRCM), 22 = -# Zero Default Mode (ZDM). The EBM and LF/NL modes have actually been removed -# from ECMA-48's 5th edition but are listed here for reference. +# (W) RM/SM modes are as follows: +# 1 = Guarded Area Transfer Mode (GATM), +# 2 = Keyboard Action Mode (KAM), +# 3 = Control Representation Mode (CRM), +# 4 = Insertion Replacement Mode (IRM), +# 5 = Status Report Transfer Mode (SRTM), +# 6 = Erasure Mode (ERM), +# 7 = Line Editing Mode (LEM), +# 8 = Bi-Directional Support Mode (BDSM), +# 9 = Device Component Select Mode (DCSM), +# 10 = Character Editing Mode (HEM), +# 11 = Positioning Unit Mode (PUM), +# 12 = Send/Receive Mode (SRM), +# 13 = Format Effector Action Mode (FEAM), +# 14 = Format Effector Transfer Mode (FETM), +# 15 = Multiple Area Transfer Mode (MATM), +# 16 = Transfer Termination Mode (TTM), +# 17 = Selected Area Transfer Mode (SATM), +# 18 = Tabulation Stop Mode (TSM), +# 19 = Editing Boundary Mode (EBM), +# 20 = Line Feed New Line Mode (LF/NL), +# 21 = Graphic Rendition Combination Mode (GRCM), +# 22 = Zero Default Mode (ZDM). # +# The EBM and LF/NL modes have actually been removed from ECMA-48's 5th edition +# but are listed here for reference. +# # (X) Select Alternate Presentation Variants is used only for non-Latin # alphabets. # @@ -23202,7 +23304,7 @@ # # There is a set of nonstandard terminfos used by IBM's AIX operating system. # The AIX terminfo library diverged from SVr1 terminfo, and replaces all -# capabilities following prtr_non with the following special capabilties: +# capabilities following prtr_non with the following special capabilities: # box[12], batt[12], colb[0123456789], colf[0123456789], f[01234567], kbtab, # kdo, kcmd, kcpn, kend, khlp, knl, knpn, kppn, kppn, kquit, ksel, kscl, kscr, # ktab, kmpf[123456789], apstr, ksf1..ksf10, kf11...kf63, kact, topl, btml, @@ -23348,6 +23450,8 @@ # # gsbom/grbom are used to enable/disable real bold (not intensity bright) mode. # This was implemented for the Hurd. +# rmxx/smxx describes the ECMA-48 strikeout/crossed-out attributes, as an +# experimental feature of tmux. # 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. @@ -23427,7 +23531,7 @@ # 9.4.2 (Thu Mar 9 01:45:44 EST 1995): # * Merged in DEC's official entries for its terminals. The only old # entry I kept was Doug Gwyn's alternate vt100 (as vt100-avo). -# * Replaced the translated BBN Bitgraph entries with purpose-built +# * Replaced the translated BBN BitGraph entries with purpose-built # ones from AT&T's SVr3. # * Replaced the AT&T entries with AT&T's official terminfos. # * Added teleray 16, vc415, cops10. @@ -23613,7 +23717,7 @@ # * Corrected hpa/vpa in linux entry. They still fail the worm test. # * We can handle the HP meml/memu capability now. # * Added smacs to klone entries, just as documentation. -# * Carrected ansi.sys and cit-500 entries. +# * Corrected ansi.sys and cit-500 entries. # * Added z39, vt320-k311, v220c, and avatar entries. # * Make pcansi use the ansi.sys invis capability. # * Added DIP switch descriptions for vt100, adm31, tvi910, tvi920c, @@ -24033,7 +24137,7 @@ # * resolve ambiguity of kend/kll/kslt and khome/kfnd/kich1 strings in # xterm and ncsa entries by removing the unneeded ones. Note that # some entries will return kend & khome versus kslt and kfnd, for -# PC-style keyboards versus strict vt220 compatiblity - TD +# PC-style keyboards versus strict vt220 compatibility - TD # # 1999/3/13 # * adjust xterm-xfree86 khome/kend to match default PC-style keyboard @@ -24626,7 +24730,7 @@ # # 2009-12-19 # * add bw (auto-left-margin) to nsterm* entries (Benjamin Sittler) -# * rename minix to minix-1.7, add minix entry for Minux3 -TD +# * rename minix to minix-1.7, add minix entry for Minix3 -TD # # 2009-12-26 # * add bterm (bogl 0.1.18) -TD @@ -25052,5 +25156,25 @@ # (patch by Nicholas Marriott). # + uncancel Ms in tmux entry (Harry Gindi, Nicholas Marriott). # + add dumb-emacs-ansi -TD +# +# 2017-03-05 +# + correct a few spelling errors in comments -TD +# + add fbterm -TD +# +# 2017-03-11 +# + add vt100+4bsd building block, use that for older terminals rather +# than "vt100" which is now mostly used as a building block for +# terminal emulators -TD +# + modify vt100 rs2 string to reset vt52 mode and scrolling regions +# (report/analysis by Robert King) -TD +# +# 2017-04-01 +# + minor fixes for vt100+4bsd, e.g., delay in sgr for consistency -TD +# + add smso for env230, to match sgr -TD +# + remove p7/protect from sgr in fbterm -TD +# + drop setf/setb from fbterm; setaf/setab are enough -TD +# + make xterm-pcolor sgr consistent with other capabilities -TD +# + add rmxx/smxx ECMA-48 strikeout extension to tmux and xterm-basic +# (discussion with Nicholas Marriott) # ######## SHANTIH! SHANTIH! SHANTIH!