* Ed Schouten e...@80386.nl wrote:
I just tried the patch, but when I run `make' in share/termcap, I get
the following:
| gzip -cn termcap.5 termcap.5.gz
| TERM=dumb TERMCAP=dumb: ex -
/store/home/ed/projects/freebsd-head/share/termcap/termcap.src
/store/home/ed/projects/freebsd-head/share/termcap/reorder
| script, 36: Pattern not found
| script, 36: Ex command failed: pending commands discarded
| *** Error code 1
|
| Stop in /store/home/ed/projects/freebsd-head/share/termcap.
The attached patch should bring the entries up-to-date. Unfortunately it
still seems the issue with Apple's Terminal.app is present, but that's
just Apple's fault. Because of that, I don't see a reason (yet) to MFC
this.
Any testers, before I commit this patch to HEAD?
--
Ed Schouten e...@80386.nl
WWW: http://80386.nl/
Index: share/termcap/termcap.src
===
--- share/termcap/termcap.src (revision 200186)
+++ share/termcap/termcap.src (working copy)
@@ -2784,48 +2784,46 @@
:ts=\E_:fs=\E\\:ds=\E_\E\\:tc=screen:
SW|screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols:\
:co#132:tc=screen:
-# $Xorg: termcap,v 1.3 2000/08/17 19:55:10 cpqbld Exp $
+# $XTermId: termcap,v 1.78 2009/11/09 00:24:26 tom Exp $
#
# Note:
# termcap format is limited to 1023 characters. This set of descriptions
# is a subset of the terminfo, since not all features can be fit into
# that limit. The 'xterm' description supports color. The monochrome
-# 'xtermm' drops color in favor of additional function keys. If you need
-# both, use terminfo.
+# 'xterm-mono' drops color in favor of additional function keys. If you
+# need both, use terminfo.
#
# The 1023-character limit applies to each entry after resolving the
# tc= strings. Some implementations may discount all or part of the
# formatting characters in the entry (i.e., the backslash newline tab
# colon). GNU termcap does not have this limit.
#
-# I checked the limits using ncurses captoinfo -CrTv, which prints
+# I checked the limits using ncurses captoinfo -CrTUvx, which prints
# the resolved length of each entry in a comment at the end - T.Dickey
#
-# $XFree86: xc/programs/xterm/termcap,v 3.28 2001/01/17 23:46:39 dawes Exp $
+xterm-new|modern xterm:\
+ :*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\
+ :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\
+ :k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kH=\EOF:kI=\E[2~:\
+ :kN=\E[6~:kP=\E[5~:kd=\EOB:kh=\EOH:kl=\EOD:kr=\EOC:ku=\EOA:\
+ :tc=xterm-basic:
#
-xterm-xfree86|XFree86 xterm:\
- :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
- :k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
- :k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\
- :@7=\EOF:@8=\EOM:kI=\E[2~:\
- :kh=\EOH:kP=\E[5~:kN=\E[6~:\
- :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:Km=\E[M:tc=xterm-basic:
-#
# This chunk is used for building the VT220/Sun/PC keyboard variants.
-xterm-basic|xterm common (XFree86):\
- :li#24:co#80:am:kn#12:km:mi:ms:xn:AX:bl=^G:\
- :is=\E[!p\E[?3;4l\E[4l\E:rs=\E[!p\E[?3;4l\E[4l\E:le=^H:\
- :AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:al=\E[L:dc=\E[P:dl=\E[M:\
- :UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
- :ho=\E[H:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:\
- :im=\E[4h:ei=\E[4l:ks=\E[?1h\E=:ke=\E[?1l\E:kD=\E[3~:kb=^H:\
- :sf=\n:sr=\EM:st=\EH:ct=\E[3g:sc=\E7:rc=\E8:\
- :eA=\E(B\E)0:as=\E(0:ae=\E(B:ml=\El:mu=\Em:up=\E[A:nd=\E[C:\
- :md=\E[1m:me=\E[m:mr=\E[7m:so=\E[7m:se=\E[27m:us=\E[4m:ue=\E[24m:\
- :ti=\E[?1049h:te=\E[?1049l:vi=\E[?25l:ve=\E[?25h:\
- :ut:Co#8:pa#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm:
+xterm-basic|modern xterm common:\
+ :am:bs:km:mi:ms:ut:xn:AX:\
+ :Co#8:co#80:kn#12:li#24:pa#64:\
+ :AB=\E[4%dm:AF=\E[3%dm:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
+ :DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=\E(B:al=\E[L:\
+ :as=\E(0:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
+ :cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:\
+ :ei=\E[4l:ho=\E[H:im=\E[4h:is=\E[!p\E[?3;4l\E[4l\E:\
+ :kD=\E[3~:kb=^H:ke=\E[?1l\E:ks=\E[?1h\E=:le=^H:md=\E[1m:\
+ :me=\E[m:ml=\El:mr=\E[7m:mu=\Em:nd=\E[C:op=\E[39;49m:\
+ :rc=\E8:rs=\E[!p\E[?3;4l\E[4l\E:sc=\E7:se=\E[27m:sf=^J:\
+ :so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\
+ :ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?12l\E[?25h:vi=\E[?25l:vs=\E[?12;25h:
-# The xterm-xfree86 description has all of the features, but is not completely
+# The xterm-new description has all of the features, but is not completely
# compatible with vt220. If you are using a Sun or PC keyboard, set the
# sunKeyboard resource to true:
# + maps the editing keypad
@@ -2835,68 +2833,91 @@
# + uses DEC-style control sequences for the application keypad.
#
xterm-vt220|xterm emulating vt220:\
- :kH=\E[4~::@7=\E[4~:*6=\E[4~:kh=\E[1~:Km=\E[M:tc=xterm-basic:
+ :*6=\E[4~:@7=\E[4~:K2=\EOu:Km=\E[M:kH=\E[4~:kh=\E[1~:\
+ :tc=xterm-basic:
xterm-24|xterms|vs100|24x80 xterm:\
- :li#24:\
- :tc=xterm:
+ :li#24:tc=xterm-old:
xterm-65|65x80 xterm:\
- :li#65:tc=xterm:
+ :li#65:tc=xterm-old:
xterm-bold|xterm
