revert to version 1.4--the newer xterm entry still has problems

1 files changed, 45 insertions, 65 deletions

diff --git a/share/termtypes/termtypes.master b/share/termtypes/termtypes.master
index dfc70d2a5cd..0a3a80c007f 100644
--- a/share/termtypes/termtypes.master
+++ b/share/termtypes/termtypes.master
@@ -1,7 +1,7 @@
 ######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
 #
 #	Version 10.2.5
-#	$Date: 1998/12/20 22:51:09 $
+#	$Date: 1999/01/18 03:43:10 $
 #	master syntax
 #
 #	Eric S. Raymond		(current maintainer)
@@ -1565,8 +1565,6 @@ x10term|vs100-x10|xterm terminal emulator (X10 window system),
 	smso=\E[7m, smul=\E[4m, 
 # Compatible with the R5 xterm 
 # (from the XFree86 3.2 distribution, <blink=@> removed)
-# added khome/kend, rmir/smir, rmul/smul based on the R5 xterm code - TD
-# corrected typos in rs2 string - TD
 xterm-r5|xterm R5 version, 
 	OTbs, am, km, msgr, xenl, 
 	cols#80, it#8, lines#24, 
@@ -1578,24 +1576,21 @@ xterm-r5|xterm R5 version,
 	el=\E[K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, 
 	il=\E[%p1%dL, il1=\E[L, ind=^J, kbs=^H, kcub1=\EOD, 
 	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, 
-	kdl1=\E[31~, kel=\E[8~, kend=\E[4~, kf0=\EOq, kf1=\E[11~, 
-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, 
-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, 
-	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~, 
-	kil1=\E[30~, knp=\E[6~, kpp=\E[5~, rc=\E8, rev=\E[7m, ri=\EM, 
-	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, 
-	rs2=\E>\E[?1;3;4;5;6l\E[4l\E[?7h\E[m\E[r\E[2J\E[H, 
-	sc=\E7, 
+	kdl1=\E[31~, kel=\E[8~, kf0=\EOq, kf1=\E[11~, kf10=\E[21~, 
+	kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, kf3=\E[13~, 
+	kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, 
+	kf9=\E[20~, khome=\E[7~, kich1=\E[2~, kil1=\E[30~, 
+	knp=\E[6~, kpp=\E[5~, rc=\E8, rev=\E[7m, ri=\EM, 
+	rmkx=\E[?1l\E>, rmso=\E[m, 
+	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, sc=\E7, 
 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m, 
-	sgr0=\E[m, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, 
-	smul=\E[4m, tbc=\E[3g, 
+	sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, tbc=\E[3g, 
 # Compatible with the R6 xterm
 # (from XFree86 3.2 distribution, <acsc> and <it> added, <blink@> removed)
-# added khome/kend - TD
 xterm-r6|xterm-old|xterm X11R6 version, 
 	OTbs, am, km, mir, msgr, xenl, 
 	cols#80, it#8, lines#24, 
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
 	bel=^G, bold=\E[1m, clear=\E[H\E[2J, 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, 
@@ -1605,25 +1600,24 @@ xterm-r6|xterm-old|xterm X11R6 version,
 	il1=\E[L, ind=^J, 
 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^H, 
 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 
-	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, 
-	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, 
-	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, 
-	kf19=\E[33~, kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, 
-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, 
-	kfnd=\E[1~, khome=\E[1~, kich1=\E[2~, kmous=\E[M, 
-	knp=\E[6~, kpp=\E[5~, kslt=\E[4~, meml=\El, memu=\Em,
-	rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[2J\E[?47l\E8, 
-	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, 
+	kdch1=\E[3~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, 
+	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, 
+	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, 
+	kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf5=\E[15~, 
+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, 
+	kich1=\E[2~, knp=\E[6~, kpp=\E[5~, kslt=\E[4~, meml=\El, 
+	memu=\Em, rev=\E[7m, ri=\EM, rmacs=^O, 
+	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E[?1l\E>, 
+	rmso=\E[m, rmul=\E[m, 
 	rs2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
 	sgr0=\E[m, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h, 
 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, 
-	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c, 
 # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up.
 # The name has been changed and some aliases have been removed.
 xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), 
 	OTbs, am, bce, km, mir, msgr, xenl, 
 	colors#8, cols#80, it#8, lines#24, pairs#64, 
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
 	bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, 
 	clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M, 
 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, 
@@ -1654,8 +1648,7 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, 
 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E7\E[?47h, 
 	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, 
-	tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c, 
-	vpa=\E[%i%p1%dd, 
+	tbc=\E[3g, vpa=\E[%i%p1%dd, 
 
 # This is the stock xterm entry supplied with XFree86 3.3, which uses VT100
 # codes for F1-F4 except while in VT220 mode.
@@ -1663,38 +1656,25 @@ xterm-xf86-v33|xterm terminal emulator (XFree86 3.3 Window System),
 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, 
 	use=xterm-xf86-v32, 
 
-# This version was released in XFree86 3.3.3 (November 1998).
+# This beta version will probably be released in XFree86 4.0 in 1998.
 # Besides providing printer support, it exploits a new feature that allows
 # xterm to use terminfo-based descriptions with the titeInhibit resource.
-xterm-xf86-v333|xterm terminal emulator (XFree86 3.3.3 Window System), 
+xterm-xf86-v40|xterm terminal emulator (XFree86 4.0 Window System), 
 	mc5i, 
-	blink=\E[5m, ich1@, invis=\E[8m, 
-	is2=\E[!p\E[?3;4l\E[4l\E>, kdch1=\E[3~, kend=\E[4~, 
-	khome=\E[1~, kll=\E[4~, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, 
-	rmcup=\E[?1047l\E[?1048l, rs1=\Ec, 
-	rs2=\E[!p\E[?3;4l\E[4l\E>, 
-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, 
-	smcup=\E[?1048h\E[?1047h, 
+	mc0=\E[i, mc4=\E[4i, mc5=\E[5i, rmcup=\E[?1047l\E[?1048l, 
+	rs1=\Ec, smcup=\E[?1048h\E[?1047h, 
 	use=xterm-xf86-v33, 
 
-# This beta version will probably be released in XFree86 4.0.
-xterm-xf86-v40|xterm terminal emulator (XFree86 4.0 Window System), 
-	rmcup=\E[?1049l, smcup=\E[?1049h, 
-	use=xterm-xf86-v333, 
-
-xterm-xfree86|xterm-new|xterm terminal emulator (XFree86 4.0 Window System), 
-	use=xterm-xf86-v40, 
-
 # From: David J. MacKenzie <djm@va.pubnix.com>, 14 Nov 1997
-xterm-xi|xterm on XI Graphics Accelerated X under BSD/OS 3.1, 
-	rmso=\E[m, rmul=\E[m, 
+xterm-xi|xterm on XI Graphics Accelerated X under BSD/OS 3.1,
+	rmso=\E[m, rmul=\E[m,
 	use=xterm-xf86-v33, 
 
-# This is one of the variants of XFree86 3.3 xterm, updated for 4.0 (T.Dickey)
+# This is one of the variants from XFree86 3.3 xterm, updated for 4.0
+# From Thomas S. Dickey <dickey@clark.net>, 11 May 1998
 xterm-16color|xterm with 16 colors like aixterm, 
 	colors#16, ncv#32, pairs#256, 
-	setab=\E[%?%p1%{8}%<%t%p1%{40}%+%e%p1%{92}%+%;%dm, 
-	setaf=\E[%?%p1%{8}%<%t%p1%{30}%+%e%p1%{82}%+%;%dm, 
+	setab@, setaf@, 
 	setb=%p1%{8}%/%{6}%*%{4}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m, 
 	setf=%p1%{8}%/%{6}%*%{3}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m, 
 	use=xterm-xf86-v40, 
@@ -1711,9 +1691,9 @@ xterm-16color|xterm with 16 colors like aixterm,
 xterm-8bit|xterm terminal emulator 8-bit controls (X Window System), 
 	OTbs, am, bce, km, mc5i, mir, msgr, xenl, 
 	colors#8, cols#80, it#8, lines#24, pairs#64, 
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
-	bel=^G, blink=\2335m, bold=\2331m, cbt=\233Z, 
-	civis=\233?25l, clear=\233H\2332J, cnorm=\233?25h, cr=^M, 
+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
+	bel=^G, bold=\2331m, cbt=\233Z, civis=\233?25l, 
+	clear=\233H\2332J, cnorm=\233?25h, cr=^M, 
 	csr=\233%i%p1%d;%p2%dr, cub=\233%p1%dD, cub1=^H, 
 	cud=\233%p1%dB, cud1=^J, cuf=\233%p1%dC, cuf1=\233C, 
 	cup=\233%i%p1%d;%p2%dH, cuu=\233%p1%dA, cuu1=\233A, 
@@ -1721,36 +1701,36 @@ xterm-8bit|xterm terminal emulator 8-bit controls (X Window System),
 	dl=\233%p1%dM, dl1=\233M, ech=\233%p1%dX, ed=\233J, 
 	el=\233K, el1=\2331K, enacs=\E(B\E)0, 
 	flash=\233?5h\233?5l, home=\233H, hpa=\233%i%p1%dG, 
-	ht=^I, hts=\210, ich=\233%p1%d@, il=\233%p1%dL, il1=\233L, 
-	ind=^J, invis=\2338m, 
+	ht=^I, hts=\210, ich=\233%p1%d@, ich1=\233@, il=\233%p1%dL, 
+	il1=\233L, ind=^J, 
 	is2=\E7\E G\233r\233m\233?7h\233?1;3;4;6l\2334l\E8\E>, 
 	ka1=\217w, ka3=\217u, kb2=\217y, kbeg=\217E, kbs=^H, 
 	kc1=\217q, kc3=\217s, kcub1=\217D, kcud1=\217B, 
-	kcuf1=\217C, kcuu1=\217A, kdch1=\2333~, kend=\2334~, 
+	kcuf1=\217C, kcuu1=\217A, kdch1=\2333~, kend=\217F, 
 	kent=\217M, kf1=\23311~, kf10=\23321~, kf11=\23323~, 
 	kf12=\23324~, kf13=\23325~, kf14=\23326~, kf15=\23328~, 
 	kf16=\23329~, kf17=\23331~, kf18=\23332~, kf19=\23333~, 
 	kf2=\23312~, kf20=\23334~, kf3=\23313~, kf4=\23314~, 
 	kf5=\23315~, kf6=\23317~, kf7=\23318~, kf8=\23319~, 
-	kf9=\23320~, kfnd=\2331~, khome=\2331~, kich1=\2332~, 
+	kf9=\23320~, kfnd=\2331~, khome=\217H, kich1=\2332~, 
 	kmous=\233M, knp=\2336~, kpp=\2335~, kslt=\2334~, 
 	mc0=\233i, mc4=\2334i, mc5=\2335i, meml=\El, memu=\Em, 
 	op=\23339;49m, rc=\E8, rev=\2337m, ri=\215, rmacs=^O, 
-	rmam=\233?7l, rmcup=\233?1049l, rmir=\2334l, 
+	rmam=\233?7l, rmcup=\2332J\233?47l\E8, rmir=\2334l, 
 	rmkx=\233?1l\E>, rmso=\23327m, rmul=\23324m, rs1=\Ec, 
 	rs2=\E7\E[62"p\E G\233r\233m\233?7h\233?1;3;4;6l\2334l\E8\E>, 
 	sc=\E7, setab=\2334%p1%dm, setaf=\2333%p1%dm, 
 	setb=\2334%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, 
 	setf=\2333%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, 
-	sgr=\2330%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, 
-	sgr0=\233m^O, smacs=^N, smam=\233?7h, smcup=\233?1049h, 
+	sgr=\2330%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, 
+	sgr0=\233m^O, smacs=^N, smam=\233?7h, smcup=\E7\233?47h, 
 	smir=\2334h, smkx=\233?1h\E=, smso=\2337m, smul=\2334m, 
-	tbc=\2333g, u6=\233[%i%d;%dR, u7=\E[6n, u8=\233[?1;2c, 
-	u9=\E[c, vpa=\233%i%p1%dd, 
+	tbc=\2333g, vpa=\233%i%p1%dd, 
 
-# This is xterm for ncurses.
-xterm|vs100|xterms|xterm terminal emulator (X Window System),
-	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
+# This is xterm for ncurses. It mainly adds mappings for more high-half
+# characters.  Note that these will only work for fixed-width fonts.
+xterm|vs100|xterms|xterm terminal emulator (X Window System), 
+	acsc=++\,\,--..00``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 
 	kmous=\E[M, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c, 
 	use=xterm-r6,