Fix xterm entry by fallback to vt220 entry,

also compact VT* is/rs capabilities to prevent overflowing

1 files changed, 31 insertions, 32 deletions

diff --git a/share/termcap/termcap.src b/share/termcap/termcap.src
index abfbc63..031c093 100644
--- a/share/termcap/termcap.src
+++ b/share/termcap/termcap.src
@@ -2303,18 +2303,18 @@ vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
 	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:\
 	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
 	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
+	:is=\E>\E[?1;3;4;5l\E[?7;8h\E[1;24r\E[24;1H:\
 	:if=/usr/share/tabset/vt100:nw=2\EE:\
 	:as=2\E(0:ae=2\E(B:ac=llmmkkjjuuttvvwwqqxxnnoosspprr``aaffgg~~..--++,,hhII00yyzz:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
+	:rs=\E>\E[?1;3;4;5l\E[?7;8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
 	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=\177:\
 	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
 	:sc=2\E7:rc=2\E8:cs=5\E[%i%d;%dr:UP=2\E[%dA:DO=2\E[%dB:RI=2\E[%dC:\
 	:LE=2\E[%dD:ct=2\E[3g:st=2\EH:ta=^I:ms:bl=^G:cr=^M:eo:it#8:ut:
 vt100-nam|dec-vt100-nam|vt100nam|vt100 w/no am:\
 	:am@:xn@:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h:\
+	:is=\E>\E[?1;3;4;5;7l\E[?8h\E[1;24r\E[24;1H:\
+	:rs=\E>\E[?1;3;4;5;7l\E[?8h:\
 	:tc=vt100-am:
 vt100-np|dec-vt100-np|vt100 with no padding (for psl games):\
 	:do=\E[B:cl=\E[H\E[J:sf=\ED:as=\E(0:ae=\E(B:\
@@ -2389,13 +2389,13 @@ vt100-nav|dec-vt100-nav|dec vt100 132 cols 14 lines (w/o advanced video option):
 	:li#14:tc=vt100-w:
 vt100-w|dec-vt100-w|dec vt100 132 cols (w/advanced video):\
 	:if=/usr/share/tabset/vt100-w:\
-	:is=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
-	:rs=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:is=\E>\E[?1;4;5l\E[?3;7;8h\E[1;24r\E[24;1H:\
+	:rs=\E>\E[?1;4;5l\E[?3;7;8h:\
 	:co#132:tc=vt100-am:
 vt100-w-nam|dec-vt100-w-nam|dec vt100 132 cols (w/advanced video), no am:\
 	:if=/usr/share/tabset/vt100-w:\
-	:is=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H:\
-	:rs=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h:\
+	:is=\E>\E[?1;4;5;7l\E[?3;8h\E[1;24r\E[24;1H:\
+	:rs=\E>\E[?1;4;5;7l\E[?3;8h:\
 	:co#132:vt@:tc=vt100-nam:
 vt102|dec-vt102-am|vt102am|vt100 w/adv. video:\
 	:al=\E[L:dl=\E[M:im=\E[4h:ei=\E[4l:mi:dc=\E[P:\
@@ -2405,14 +2405,19 @@ vt102|dec-vt102-am|vt102am|vt100 w/adv. video:\
 	:AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:tc=vt100-np:
 vt102-nam|dec-vt102-nam|vt102nam|vt102 w/no am:\
 	:am@:xn@:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h:\
+	:is=\E>\E[?1;3;4;5;7l\E[?8h\E[1;24r\E[24;1H:\
+	:rs=\E>\E[?1;3;4;5;7l\E[?8h:\
 	:tc=vt102am:
 vt102-w|dec vt102 132 cols (w/advanced video):\
 	:if=/usr/share/tabset/vt100-w:\
-	:is=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
-	:rs=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:is=\E>\E[?1;4;5l\E[?3;7;8h\E[1;24r\E[24;1H:\
+	:rs=\E>\E[?1;4;5l\E[?3;7;8h:\
 	:co#132:vt@:tc=vt102:
+vt102-w-nam|dec-vt102-w-nam|dec vt102 132 cols (w/advanced video), no am:\
+	:if=/usr/share/tabset/vt100-w:\
+	:is=\E>\E[?1;4;5;7l\E[?3;8h\E[1;24r\E[24;1H:\
+	:rs=\E>\E[?1;4;5;7l\E[?3;8h:\
+	:co#132:vt@:tc=vt102-nam:
 vt52|dec-vt52|dec vt52:\
 	:do=^J:le=^H:bs:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :co#80:li#24:\
 	:nd=\EC:pt:sr=\EI:up=\EA:ku=\EA:kd=\EB:kr=\EC:kl=\ED:kb=^H:
@@ -2448,37 +2453,31 @@ vt200-nam|dec-vt200-nam|vt200nam|vt200 w/no am:\
 	:tc=vt220nam:
 vt220-nam|dec-vt220-nam|vt220nam|vt220 w/no am:\
 	:am@:xn@:\
-	:is=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h:\
+	:is=\E>\E[?1;3;4;5;7l\E[?8h\E[1;24r\E[24;1H:\
+	:rs=\E>\E[?1;3;4;5;7l\E[?8h:\
 	:tc=vt220am:
 vt200-ss|vt220-ss|dec-vt220-ss|dec vt200 series with smooth scroll:\
-	:is=\E>\E[?3l\E[?4h\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
-	:rs=\E>\E[?3l\E[?4h\E[?5l\E[?7h\E[?8h:\
+	:is=\E>\E[?1;3;5l\E[?4;7;8h\E[1;24r\E[24;1H:\
+	:rs=\E>\E[?1;3;5l\E[?4;7;8h:\
 	:tc=vt200:
 vt200-w|vt220-w|dec-vt220-w|vt200-wj|vt220-wj|dec vt200 series; 132 col.; jump scroll:\
-	:is=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
-	:rs=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h:\
+	:is=\E>\E[?1;4;5l\E[?3;7;8h\E[1;24r\E[24;1H:\
+	:rs=\E>\E[?1;4;5l\E[?3;7;8h:\
 	:co#132:vt@:tc=vt200:
 vt200-ws|vt220-ws|dec-vt220-ws|dec vt200 series; 132 col.; smooth scroll:\
-	:is=\E>\E[?3h\E[?4h\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H:\
-	:rs=\E>\E[?3h\E[?4h\E[?5l\E[?7h\E[?8h:\
+	:is=\E>\E[?1;5l\E[?3;4;7;8h\E[1;24r\E[24;1H:\
+	:rs=\E>\E[?1;5l\E[?3;4;7;8h:\
 	:co#132:vt@:tc=vt200:
 # @(#)termcap	X10/6.6	11/7/86, minus alternate screen, plus :cs
 xterm|vs100|xterm terminal emulator (X window system):\
-	:do=^J:le=^H:ho=\E[H:\
-	:co#80:li#65:cl=\E[H\E[2J:bs:am:cm=\E[%i%d;%dH:nd=\E[C:up=\E[A:\
-	:ce=\E[K:cd=\E[J:so=\E[7m:se=\E[m:us=\E[4m:ue=\E[m:\
-	:md=\E[1m:mr=\E[7m:me=\E[m:\
-	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
-	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sf=\n:sr=\EM:\
-	:al=\E[L:dl=\E[M:im=\E[4h:ei=\E[4l:mi:dc=\E[P:\
-	:MT:ks=\E[?1h\E=:ke=\E[?1l\E>:xn:\
-	:AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:\
+	:li#65:\
 	:hs:ts=\E[?E\E[?%i%dT:fs=\E[?F:es:ds=\E[?E:\
-	:is=\E\E[m\E[?7h\E[?1;4l:cs=\E[%i%d;%dr:\
-	:rs=\E[r\E<\E[m\E[H\E[2J\E[?7h\E[?1;3;4;6l:
+	:is=\E>\E[?1;3;4;5l\E[?7;8h\E[1;65r\E[65;1H:\
+	:rs=\E>\E[?1;3;4;5l\E[?7;8h:\
+	:as@:ae@:ac@:tc=vt220:
 xterms|vs100s|xterm terminal emulator (small)(X window system):\
-	:co#80:li#24:tc=xterm:
+	:is=\E>\E[?1;3;4;5l\E[?7;8h\E[1;24r\E[24;1H:\
+	:li#24:tc=xterm:
 # vs100 emulator using tsim	(from lai@decwrl)
 vs100t|tsim|vs100-tsim:\
 	:bs:cm=\EM%+ %+ :ho=\EH:do=^J:up=^K:cl=\EE:ce=\EL:cs=\ES%+ %+ :\