Wed May 16 18:09:55 PDT 2001 Michael Jennings <mej@eterm.org>

I made several corrections to the terminfo entry noted by Thomas
	Dickey <dickey@herndon4.his.com>:

	 - Removed cvvis.  It wasn't actually supported and thus conflicted
	   with cnorm.
	 - Removed kf0, which conflicted with kf10.
	 - Added the CPR (u6) capability which I inadvertantly omitted.

	I also removed the extraneous identities, keeping only "Eterm" and
	"Eterm-color".

	In a similar vein, I enabled the u8/u9 handshake while keeping the
	ENQ (^E) response disabled.


SVN revision: 4773
This commit is contained in:
Michael Jennings 2001-05-17 01:50:12 +00:00
parent a722c163f7
commit ff68bdd1c9
6 changed files with 53 additions and 152 deletions

View File

@ -4140,3 +4140,20 @@ Wed May 9 23:03:20 PDT 2001 Michael Jennings <mej@eterm.org>
the pointer move along with the menu when a move is necessary.
-------------------------------------------------------------------------------
Wed May 16 18:09:55 PDT 2001 Michael Jennings <mej@eterm.org>
I made several corrections to the terminfo entry noted by Thomas
Dickey <dickey@herndon4.his.com>:
- Removed cvvis. It wasn't actually supported and thus conflicted
with cnorm.
- Removed kf0, which conflicted with kf10.
- Added the CPR (u6) capability which I inadvertantly omitted.
I also removed the extraneous identities, keeping only "Eterm" and
"Eterm-color".
In a similar vein, I enabled the u8/u9 handshake while keeping the
ENQ (^E) response disabled.
-------------------------------------------------------------------------------

View File

@ -1,130 +1,18 @@
# termcap for Eterm. Needs to be downsized to fit in < 1023 bytes.
# Generated by infocmp -C -r -sc -T <term>
Eterm-base|Eterm basic terminal capabilities:\
:5i:am:bw:eo:km:mi:ms:ut:xn:xo:\
:co#80:it#8:li#24:\
:#2=\E[7$:#4=\E[d:%1=\E[28~:%c=\E[6$:%e=\E[5$:%i=\E[c:\
:*4=\E[3$:*6=\E[4~:*7=\E[8$:@0=\E[1~:@1=\EOu:@7=\E[8~:\
:@8=\EOM:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\
:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
:IC=\E[%d@:K1=\E[7~:K2=\EOu:K3=\E[5~:K4=\E[8~:K5=\E[6~:\
:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
:ae=^O:al=\E[L:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
:ch=\E[%i%dG:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
:cs=\E[%i%d;%dr:ct=\E[3g:cv=\E[%i%dd:dc=\E[P:dl=\E[M:\
:do=\E[B:eA=\E)0:ec=\E[%dX:ei=\E[4l:ho=\E[H:\
:i1=\E[?47l\E>\E[?1l:ic=\E[@:im=\E[4h:\
:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
:k0=\E[21~:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\
:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
:k;=\E[21~:kB=\E[Z:kD=\E[3~:\
:kE=\E[8\014rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H:\
Eterm|Eterm-color|Eterm with xterm-style color support (X Window System):\
:am:bw:eo:km:mi:ms:xn:xo:\
:co#80:it#8:li#24:lm#0:\
:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
:K1=\E[7~:K2=\EOu:K3=\E[5~:K4=\E[8~:K5=\E[6~:LE=\E[%dD:\
:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\
:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:\
:ec=\E[%dX:ei=\E[4l:ho=\E[H:i1=\E[?47l\E>\E[?1l:ic=\E[@:\
:im=\E[4h:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l:\
:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[3~:\
:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=:kh=\E[7~:\
:kl=\E[D:kr=\E[C:ks=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
:mr=\E[7m:nd=\E[C:pf=\E[4i:po=\E[5i:\
:r2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>:\
:rc=\E8:sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:u7=\E[6n:u8=\E[?1;2c:\
:u9=\E[c:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:\
:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
Eterm-ansi|Eterm with ANSI color (X Window System):\
:5i:am:bw:eo:km:mi:ms:ut:xn:xo:\
:co#80:it#8:li#24:\
:#2=\E[7$:#4=\E[d:%1=\E[28~:%c=\E[6$:%e=\E[5$:%i=\E[c:\
:*4=\E[3$:*6=\E[4~:*7=\E[8$:@0=\E[1~:@1=\EOu:@7=\E[8~:\
:@8=\EOM:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\
:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
:IC=\E[%d@:K1=\E[7~:K2=\EOu:K3=\E[5~:K4=\E[8~:K5=\E[6~:\
:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
:ae=^O:al=\E[L:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
:ch=\E[%i%dG:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
:cs=\E[%i%d;%dr:ct=\E[3g:cv=\E[%i%dd:dc=\E[P:dl=\E[M:\
:do=\E[B:eA=\E)0:ec=\E[%dX:ei=\E[4l:ho=\E[H:\
:i1=\E[?47l\E>\E[?1l:ic=\E[@:im=\E[4h:\
:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
:k0=\E[21~:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\
:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
:k;=\E[21~:kB=\E[Z:kD=\E[3~:\
:kE=\E[8\014rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H:\
:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=:kh=\E[7~:\
:kl=\E[D:kr=\E[C:ks=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
:me=\E[m\017:mr=\E[7m:nd=\E[C:pf=\E[4i:po=\E[5i:\
:r2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>:\
:rc=\E8:\
:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
:me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:\
:sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:u7=\E[6n:u8=\E[?1;2c:\
:u9=\E[c:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:\
:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
Eterm-mouse|Eterm with X11 mouse reporting:\
:5i:am:bw:eo:km:mi:ms:ut:xn:xo:\
:co#80:it#8:li#24:\
:#2=\E[7$:#4=\E[d:%1=\E[28~:%c=\E[6$:%e=\E[5$:%i=\E[c:\
:*4=\E[3$:*6=\E[4~:*7=\E[8$:@0=\E[1~:@1=\EOu:@7=\E[8~:\
:@8=\EOM:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\
:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
:IC=\E[%d@:K1=\E[7~:K2=\EOu:K3=\E[5~:K4=\E[8~:K5=\E[6~:\
:Km=\E[M:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:\
:UP=\E[%dA:\
:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
:ae=^O:al=\E[L:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
:ch=\E[%i%dG:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
:cs=\E[%i%d;%dr:ct=\E[3g:cv=\E[%i%dd:dc=\E[P:dl=\E[M:\
:do=\E[B:eA=\E)0:ec=\E[%dX:ei=\E[4l:ho=\E[H:\
:i1=\E[?47l\E>\E[?1l:ic=\E[@:im=\E[4h:\
:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
:k0=\E[21~:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\
:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
:k;=\E[21~:kB=\E[Z:kD=\E[3~:\
:kE=\E[8\014rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H:\
:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=:kh=\E[7~:\
:kl=\E[D:kr=\E[C:ks=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
:me=\E[m\017:mr=\E[7m:nd=\E[C:pf=\E[4i:po=\E[5i:\
:r2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>:\
:rc=\E8:\
:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
:sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:u7=\E[6n:u8=\E[?1;2c:\
:u9=\E[c:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:\
:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
Eterm|Eterm-color|eterm|Eterm with xterm-style color support (X Window System):\
:5i:am:bw:eo:km:mi:ms:ut:xn:xo:\
:Co#8:co#80:it#8:li#24:pa#64:\
:#2=\E[7$:#4=\E[d:%1=\E[28~:%c=\E[6$:%e=\E[5$:%i=\E[c:\
:*4=\E[3$:*6=\E[4~:*7=\E[8$:@0=\E[1~:@1=\EOu:@7=\E[8~:\
:@8=\EOM:AB=\E[%p1%{40}%+%dm:AF=\E[%p1%{30}%+%dm:\
:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\E[23~:\
:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:F6=\E[29~:\
:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:IC=\E[%d@:\
:K1=\E[7~:K2=\EOu:K3=\E[5~:K4=\E[8~:K5=\E[6~:Km=\E[M:\
:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\
:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
:ae=^O:al=\E[L:as=^N:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:\
:ch=\E[%i%dG:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
:cs=\E[%i%d;%dr:ct=\E[3g:cv=\E[%i%dd:dc=\E[P:dl=\E[M:\
:do=\E[B:eA=\E)0:ec=\E[%dX:ei=\E[4l:ho=\E[H:\
:i1=\E[?47l\E>\E[?1l:ic=\E[@:im=\E[4h:\
:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
:k0=\E[21~:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\
:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
:k;=\E[21~:kB=\E[Z:kD=\E[3~:\
:kE=\E[8\014rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H:\
:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=:kh=\E[7~:\
:kl=\E[D:kr=\E[C:ks=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
:me=\E[m\017:mr=\E[7m:nd=\E[C:op=\E[39;49m:pf=\E[4i:\
:po=\E[5i:\
:r2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>:\
:rc=\E8:\
:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
:sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:u7=\E[6n:u8=\E[?1;2c:\
:u9=\E[c:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:\
:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:\
:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:

View File

@ -1,10 +1,11 @@
# Eterm terminfo file
Eterm-base|Eterm basic terminal capabilities,
Eterm|Eterm-color|Eterm with xterm-style color support (X Window System),
# FIXME: xterm does not specify bce, bw, eo, or xon. Should we?
am, bw, bce, km, mir, msgr, xenl, xon, eo, mc5i,
cols#80, lines#24, it#8, lm#0, btns#5,
cr=\r, bel=^G,
colors#8, pairs#64,
# Scroll text down/up one line
ind=\n, ri=\eM,
@ -36,8 +37,8 @@ Eterm-base|Eterm basic terminal capabilities,
# Turn on/off auto margins
smam=\e[?7h, rmam=\e[?7l,
# Make cursor invisible, normal, bold (not supported)
civis=\e[?25l, cnorm=\e[?25h, cvvis=\e[?25h,
# Make cursor invisible, normal (bold cursor cvvis not supported)
civis=\e[?25l, cnorm=\e[?25h,
# Save/restore cursor position
sc=\e7, rc=\e8,
@ -83,8 +84,6 @@ Eterm-base|Eterm basic terminal capabilities,
kf6=\e[17~, kf7=\e[18~, kf8=\e[19~, kf9=\e[20~, 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~, kf20=\e[34~,
# F0, same as F10
kf0=\e[21~,
# Find, Insert, Delete, Select, Prior (PgUp), Next (PgDn). The first set of
# sequences are accurate. The second set lets Find/Select act like Home/End.
@ -111,10 +110,10 @@ Eterm-base|Eterm basic terminal capabilities,
# Reset terminal, turn off all attributes
rs1=\e>\e[1;3;4;5;6l\e[?7h\e[m\e[r\e[2J\e[H,
rs2=\e[r\e[m\e[2J\e[H\e[?7h\e[?1;3;4;6l\e[4l\e>,
rs2=\e[r\e[m\e[2J\e[H\e[?7h\e[?1;3;4;6l\e>,
# Init terminal
is1=\e[?47l\e>\e[?1l,
is2=\e[r\e[m\e[2J\e[H\e[?7h\e[?1;3;4;6l\e[4l,
is2=\e[r\e[m\e[2J\e[H\e[?7h\e[?1;3;4;6l,
# Enter/leave cursor address mode. The 1st set uses the
# secondary screen. The 2nd one doesn't.
@ -125,29 +124,24 @@ Eterm-base|Eterm basic terminal capabilities,
mc4=\e[4i, mc5=\e[5i,
# User-defined string capabilities
# Report current screen position
# Cursor Position Report (CPR)
u6=\e[%i%d;%dR,
# Report current screen position (DSR 6) (replies with u6)
u7=\e[6n,
# vt100 answerback
u8=\e[?1;2c,
# Request identity (replies with u8)
# Request identity (replies with u8) If VT100_ANS is enabled, use
# the first value. If ENQ_ANS is enabled, use the second value.
u9=\e[c,
## u9=^E,
###### Add ANSI color support
Eterm-ansi|Eterm with ANSI color (X Window System),
use=Eterm-base,
# Add ANSI color support
sgr=\e[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t^N%e^O%;,
## sgr=\e[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m,
###### Add mouse reporting
Eterm-mouse|Eterm with X11 mouse reporting,
use=Eterm-ansi,
# Mouse info packet introducer
kmous=\e[M,
###### Add xterm-style color sequences.
Eterm|Eterm-color|Eterm with xterm-style color support (X Window System),
use=Eterm-mouse, colors#8, pairs#64,
# Revert to the original foreground/background pair
op=\e[39;49m,
# Set foreground color, background color

View File

@ -12,6 +12,7 @@ Eterm.1.html: Eterm.1
install-data-hook:
$(TIC) Eterm.ti || (mkinstalldirs $(HOME)/.terminfo && $(TIC) -o$(HOME)/.terminfo Eterm.ti) || :
-infocmp -C -sc Eterm | sed -e '/Reconstructed/d' -e '/\.\.sa=/d' > Eterm.tcap.new && mv Eterm.tcap.new Eterm.tcap || rm -f Eterm.tcap.new
EXTRA_DIST = Eterm.1.in Eterm_reference.html Eterm.tcap Eterm.ti Makefile.am Makefile.in

View File

@ -2687,7 +2687,7 @@ main_loop(void)
scr_add_lines(str, nlines, (cmdbuf_ptr - str));
} else {
switch (ch) {
# ifdef NO_VT100_ANS
# ifdef NO_ENQ_ANS
case 005:
break;
# else

View File

@ -209,12 +209,13 @@
/* To control what the Eterm detection sequence, ESC-Z, replies with */
/* #define ESCZ_ANSWER "\033[?1;2C" */
/* Comment this out to allow printing of the VT100_ANS sequence. See
* command.c. I have no idea what this is supposed to do, but disabling
* it will prevent your terminal from getting garbage when ^E (ctrl-E)
* is printed on it.
/* Defining NO_ENQ_ANS disables the response to the ENQ (Ctrl-E) character. I
* don't believe xterm answers this one, so neither will we by default. xterm
* does, however, answer the ANSI/ECMA-48 DA sequence \e[c (the u9 capability),
* so we will too.
*/
#define NO_VT100_ANS
#define NO_ENQ_ANS
/* #define NO_VT100_ANS */
/* Allow changing of the foreground and background colors with "\E]39;color^G" */
#define XTERM_COLOR_CHANGE