# ------------------------------------------------------------------------------
# input.c | 2 +-
# termcap | 39 ++++++++++++++++++++-------------------
# terminfo | 21 ++++++++++++++-------
# version.h | 2 +-
# xterm.log.html | 15 +++++++++++++++
# 5 files changed, 51 insertions, 28 deletions
# ------------------------------------------------------------------------------
Index: input.c
--- xterm-79+/input.c Sun Jun 28 21:09:17 1998
+++ xterm-80/input.c Mon Jun 29 22:41:40 1998
@@ -188,7 +188,7 @@
VT52_CURSOR_KEYS
unparseseq(&reply, pty);
key = TRUE;
-#if OPT_SUNPC_KBD
+#if 0 /* OPT_SUNPC_KBD should suppress - but only for vt220 compatibility */
} else if (sunKeyboard
&& screen->old_fkeys == False
&& screen->ansi_level <= 1
Index: termcap
--- xterm-79+/termcap Sun Jun 28 23:06:02 1998
+++ xterm-80/termcap Mon Jun 29 22:39:38 1998
@@ -13,24 +13,22 @@
:rs=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:\
:AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:DO=\E[%dB:UP=\E[%dA:\
:LE=\E[%dD:RI=\E[%dC:\
- :al=\E[L:am:\
- :bl=^G:\
+ :al=\E[L:am:bl=^G:\
:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:co#80:\
:cs=\E[%i%d;%dr:ct=\E[3g:\
- :dc=\E[P:dl=\E[M:\
- :ho=\E[H:\
+ :dc=\E[P:dl=\E[M:ho=\E[H:\
:im=\E[4h:ei=\E[4l:mi:\
:ks=\E[?1h\E=:ke=\E[?1l\E>:\
: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~:\
:kn#12:\
- :@7=\EOF:kh=\EOH:\
+ :@7=\E[4~:kh=\E[1~:\
:@0=\E[1~:kI=\E[2~:kD=\E[3~:\
:*6=\E[4~:kP=\E[5~:kN=\E[6~:\
:km:\
:kb=^H:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:\
- :li#24:md=\E[1m:me=\E[m:mr=\E[7m:ms:nd=\E[C:\
+ :li#24:md=\E[1m:me=\E[m^O:mr=\E[7m:ms:nd=\E[C:\
:eA=\E)0:as=^N:ae=^O:\
:ml=\El:mu=\Em:\
:sc=\E7:rc=\E8:sf=\n:so=\E[7m:se=\E[27m:sr=\EM:\
@@ -38,7 +36,7 @@
:ti=\E7\E[?47h:te=\E[2J\E[?47l\E8:\
:vi=\E[?25l:ve=\E[?25h:\
:up=\E[A:us=\E[4m:ue=\E[24m:xn:\
- :ut:Co#8:op=\E[39m\E49m:AB=\E[4%dm:AF=\E[3%dm:\
+ :ut:Co#8:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm:\
:pa#64:Sf=\E[3%dm:Sb=\E[4%dm:
v1|xterm-24|xterms|vs100|xterm terminal emulator (X Window System):\
:li#24:\
@@ -54,14 +52,17 @@
:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
:kn#20:\
:st@:ut@:Co@:NC@:op@:AB@:AF@:pa@:Sf@:Sb@:tc=xterm:
+#
+# This should work for the commonly used "color xterm" variations (XFree86
+# xterm, color_xterm, nxterm, rxvt):
+vc|xterm-color|generic "ANSI" color xterm (X Window System):\
+ :Co#8:NC@:pa#64:op=\E[m:AB=\E[4%dm:AF=\E[3%dm:tc=xterm-r6:
vt|xterm-vt220|xterm emulating vt220:\
- :k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\
- :tc=xterm:
+ :tc=xterm-xfree86:
#
-# vi may work better with this entry, because vi
-# doesn't use insert mode much
+# vi may work better with this entry, because vi doesn't use insert mode much.
vi|xterm-ic|xterm-vi|xterm with insert character instead of insert mode:\
- :im=:ei=:mi@:ic=\E[@:IC=\E[%d@:tc=xterm:
+ :im@:ei@:mi@:ic=\E[@:IC=\E[%d@:tc=xterm:
#
# Compatible with the R6 xterm
r6|xterm-r6|xterm-old|xterm X11R6 version:\
@@ -69,14 +70,12 @@
:rs=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:\
:AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:DO=\E[%dB:UP=\E[%dA:\
:LE=\E[%dD:RI=\E[%dC:\
- :al=\E[L:am:\
- :bl=^G:\
+ :al=\E[L:am:bl=^G:\
:bs:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:co#80:\
- :cs=\E[%i%d;%dr:ct=\E[3g:\
- :dc=\E[P:dl=\E[M:\
- :ho=\E[H:\
+ :cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:ho=\E[H:\
:im=\E[4h:ei=\E[4l:mi:\
:ks=\E[?1h\E=:ke=\E[?1l\E>:\
+ :@7=\E[4~:kh=\E[1~:\
: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~:\
@@ -99,14 +98,15 @@
:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:UP=\E[%dA:\
:al=\E[L:am:\
:bs:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:co#80:\
- :cs=\E[%i%d;%dr:ct=\E[3k:\
+ :cs=\E[%i%d;%dr:ct=\E[3g:\
:dc=\E[P:dl=\E[M:\
:im=\E[4h:ei=\E[4l:mi:\
:ho=\E[H:\
:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
:rs=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E<:\
- :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
+ :k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
:kl=\EOD:km:kn#4:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:\
+ :@7=\E[4~:kh=\E[1~:\
:li#24:md=\E[1m:me=\E[m:mr=\E[7m:ms:nd=\E[C:pt:\
:sc=\E7:rc=\E8:sf=\n:so=\E[7m:se=\E[m:sr=\EM:\
:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:\
@@ -117,3 +117,4 @@
# color_xterm and rxvt.
v0|xterm|X Windows terminal emulator:\
:tc=xterm-xfree86:
+# :tc=xterm-r6:
Index: terminfo
--- xterm-79+/terminfo Sun Jun 28 22:25:31 1998
+++ xterm-80/terminfo Mon Jun 29 22:56:43 1998
@@ -119,7 +119,7 @@
kcuf1=\EOC,
kcuu1=\EOA,
kdch1=\E[3~,
- kend=\EOF,
+ kend=\E[4~,
kent=\EOM,
kf1=\EOP,
kf10=\E[21~,
@@ -142,7 +142,7 @@
kf8=\E[19~,
kf9=\E[20~,
kfnd=\E[1~,
- khome=\EOH,
+ khome=\E[1~,
kich1=\E[2~,
kmous=\E[M,
knp=\E[6~,
@@ -211,7 +211,8 @@
lines#65,
use=xterm,
xterm-bold|xterm with bold instead of underline (X Window System),
- smso=\E[1m,
+ smso=\E[7m,
+ smul=\E[1m,
use=xterm,
xtermm|monochrome xterm (X Window System),
colors@,
@@ -366,7 +367,7 @@
kcuf1=\217C,
kcuu1=\217A,
kdch1=\2333~,
- kend=\217F,
+ kend=\2174~,
kent=\217M,
kf1=\23311~,
kf10=\23321~,
@@ -389,7 +390,7 @@
kf8=\23319~,
kf9=\23320~,
kfnd=\2331~,
- khome=\217H,
+ khome=\2171~,
kich1=\2332~,
kmous=\233M,
knp=\2336~,
@@ -439,6 +440,7 @@
# alternate character set)
# + added u6, u7, u8, u9 strings for Daniel Weaver's tack program.
# + added kmous string for ncurses.
+# + added khome/kend strings.
xterm-r6|xterm-old|xterm X11R6 version,
am,
km,
@@ -483,6 +485,7 @@
kcuf1=\EOC,
kcuu1=\EOA,
kdch1=\E[3~,
+ kend=\E[4~,
kf1=\EOP,
kf10=\E[21~,
kf11=\E[23~,
@@ -504,6 +507,7 @@
kf8=\E[19~,
kf9=\E[20~,
kfnd=\E[1~,
+ khome=\E[1~,
kich1=\E[2~,
kmous=\E[M,
knp=\E[6~,
@@ -541,6 +545,8 @@
# + changed kf1 through kf4 to correspond with actual usage. Though X
# supports keypad symbols for PF1 to PF4, and xterm interprets these
# correctly, the F1 to F4 codes are commonly (but incorrectly) used.
+# + moved reset string from rs1 to rs2, to correlate better with termcap.
+# + make khome consistent with other entries.
xterm-r5|xterm R5 version,
am,
km,
@@ -586,6 +592,7 @@
kdch1=\E[3~,
kdl1=\E[31~,
kel=\E[8~,
+ kend=\E[4~,
kf0=\EOq,
kf1=\E[11~,
kf10=\E[21~,
@@ -599,7 +606,7 @@
kf7=\E[18~,
kf8=\E[19~,
kf9=\E[20~,
- khome=\E[7~,
+ khome=\E[1~,
kich1=\E[2~,
kil1=\E[30~,
knp=\E[6~,
@@ -609,7 +616,7 @@
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,
+ rs2=\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,
Index: version.h
--- xterm-79+/version.h Sun Jun 28 22:50:49 1998
+++ xterm-80/version.h Mon Jun 29 22:40:33 1998
@@ -6,4 +6,4 @@
* version of xterm has been built. The number in parentheses is my patch
* number (T.Dickey).
*/
-#define XTERM_VERSION "XFree86 3.9Ai(79)"
+#define XTERM_VERSION "XFree86 3.9Ai(80)"
Index: xterm.log.html
--- xterm-79+/xterm.log.html Sun Jun 28 23:15:19 1998
+++ xterm-80/xterm.log.html Mon Jun 29 23:06:17 1998
@@ -41,6 +41,7 @@
xc/programs/Xserver/hw/xfree86).
<UL>
+<LI><A HREF="#xterm_80">Patch #80 - 1998/6/29 - XFree86 3.9Ai</A>
<LI><A HREF="#xterm_79">Patch #79 - 1998/6/28 - XFree86 3.9Ai</A>
<LI><A HREF="#xterm_78">Patch #78 - 1998/6/3 - XFree86 3.9Ah and 3.3.2</A>
<LI><A HREF="#xterm_77">Patch #77 - 1998/5/26 - XFree86 3.9Ah and 3.3.2</A>
@@ -121,6 +122,20 @@
<LI><A HREF="#xterm_02">Patch #2 - 1996/1/7</A>
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+
+<H1><A NAME="xterm_80">Patch #80 - 1998/6/29 - XFree86 3.9Ai</A></H1>
+This fixes a couple of items leftover or introduced by patch 79:
+<ul>
+ <li>take out the logic that suppresses editing-keypad in vt100 mode
+ (those keys are too valuable to give up for a fine point of
+ emulation).
+
+ <li>corrected a couple of places in terminfo where I missed using the
+ vt220-style editing-keypad codes for Find/Select (mapped to Home/End).
+
+ <li>checked termcap file against terminfo, fix several places where it
+ was inconsistent.
+</ul>
<H1><A NAME="xterm_79">Patch #79 - 1998/6/28 - XFree86 3.9Ai</A></H1>