[xorg-commit-diffs] xc/programs/xterm termcap, 1.1.4.2.6.1,
1.1.4.2.6.1.4.1 terminfo, 1.1.4.2.6.1, 1.1.4.2.6.1.4.1
Keith Packard
xorg-commit at pdx.freedesktop.org
Mon Mar 29 11:50:12 PST 2004
Committed by: keithp
Index: termcap
===================================================================
RCS file: /cvs/xorg/xc/programs/xterm/termcap,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.4.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.4.1
--- a/termcap 4 Mar 2004 17:49:19 -0000 1.1.4.2.6.1
+++ b/termcap 29 Mar 2004 19:50:09 -0000 1.1.4.2.6.1.4.1
@@ -1,5 +1,11 @@
# $Xorg: termcap,v 1.3 2000/08/17 19:55:10 cpqbld Exp $
#
+# This termcap file was shipped by the X.Org Foundation
+# it originally came from XFree86 4.4 RC2
+#
+# X.Org name changes
+# - Keith Packard
+#
# 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
@@ -17,7 +23,10 @@
#
# $XFree86: xc/programs/xterm/termcap,v 3.30 2003/10/13 00:58:22 dickey Exp $
#
-xf|xterm-xfree86|XFree86 xterm:\
+# This termcap entry came from XFree86 4.4 rc2 where it was
+# called 'xterm-xfree86'
+#
+xf|xterm-xorg|X.Org 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~:\
@@ -26,7 +35,7 @@
: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.
-xb|xterm-basic|xterm common (XFree86):\
+xb|xterm-basic|xterm common (X.Org):\
:li#24:co#80:am:kn#12:km:mi:ms:xn: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:\
@@ -39,7 +48,7 @@
: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:\
-# The xterm-xfree86 description has all of the features, but is not completely
+# The xterm-xorg 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
@@ -81,13 +90,13 @@
# the extra features, but termcap applications still want the names. Note that
# AF/AB really should be Sf/Sb, but there are applications which expect the
# former. The terminfo contains both strings.
-x1|xterm-16color|xterm alias:tc=xterm-xfree86:
+x1|xterm-16color|xterm alias:tc=xterm-xorg:
x2|xterm-88color|xterm alias:\
:Co#88:pa#88:tc=xterm-256color:
x3|xterm-256color|xterm alias:\
- :Co#256:pa#256:AF=\E[38;5;%dm:AB=\E[48;5;%dm:tc=xterm-xfree86:
+ :Co#256:pa#256:AF=\E[38;5;%dm:AB=\E[48;5;%dm:tc=xterm-xorg:
xn|xterm-nrc|xterm alias:tc=xterm:
xr|xterm-rep|xterm alias:tc=xterm:
@@ -191,5 +200,12 @@
# is widely used for a variety of incompatible terminal emulations including
# color_xterm and rxvt.
v0|xterm|X11 terminal emulator:\
- :tc=xterm-xfree86:
+ :tc=xterm-xorg:
# :tc=xterm-r6:
+
+#
+# Add an alias in case people have environments which set TERM to
+# xterm-xfree86
+#
+xf|xterm-xfree86:\
+ :tc=xterm-xorg:
Index: terminfo
===================================================================
RCS file: /cvs/xorg/xc/programs/xterm/terminfo,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.4.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.4.1
--- a/terminfo 4 Mar 2004 17:49:19 -0000 1.1.4.2.6.1
+++ b/terminfo 29 Mar 2004 19:50:09 -0000 1.1.4.2.6.1.4.1
@@ -2,9 +2,16 @@
#
# meml locks memory above the cursor; memu unlocks (ala HP terminals)
#
+# This terminfo file was shipped by the X.Org Foundation
+# it originally came from XFree86 4.4 RC2
+#
+# X.Org name changes
+# - Keith Packard
+#
# XFree86 updates/notes/new entries (including xterm-8bit, xterm-16color)
# - Thomas E. Dickey
#
+#
# $XFree86: xc/programs/xterm/terminfo,v 3.48 2003/10/20 00:58:55 dickey Exp $
#
# Special Capabilities:
@@ -21,7 +28,7 @@
# embed a \E[2J in the rmcup string. However, that behavior cannot
# be disabled via titeInhibit, making that resource not function as
# intended on systems with terminfo.
-# rs2/is2 are shorter with XFree86 xterm because it supports DECSTR. We
+# rs2/is2 are shorter with X.Org xterm because it supports DECSTR. We
# use the shorter sequence for compatibility with the termcap, which
# is trimmed to keep it shorter than 1023 characters. It (escape \E[!p)
# replaces these in the conventional vt100 reset-string:
@@ -32,11 +39,11 @@
# \E[?1l - reset application cursor keys (DECCKM)
# \E[?6l - reset origin mode (DECOM)
# \E8 - restore cursor
-# DECSTR is recognized by XFree86 xterm even in vt52 mode.
+# DECSTR is recognized by X.Org xterm even in vt52 mode.
#
# Editing Keypad:
# --------------
-# XFree86 xterm emulates vt220 if the decTerminalID resource is set to 200 or
+# X.Org xterm emulates vt220 if the decTerminalID resource is set to 200 or
# higher. Otherwise it emulates a vt100 or vt52 depending on the value of the
# resource. When emulating a vt220, we support the editing keypad. Sun and PC
# keyboards have an editing keypad which is similar to the vt220:
@@ -101,7 +108,10 @@
# PageUp and PageDown, which correspond to terminfo kIC, kEND, kPRV and kNXT
# respectively.
#
-xterm-xfree86|xterm-new|xterm terminal emulator (XFree86),
+# This terminfo entry came from XFree86 4.4 rc2 where it was
+# called 'xterm-xfree86'
+#
+xterm-xorg|xterm-new|xterm terminal emulator (X.Org),
npc,
indn=\E[%p1%dS,
kDC=\E[3;2~,
@@ -177,7 +187,7 @@
use=xterm-basic,
#
# This chunk is used for building the VT220/Sun/PC keyboard variants.
-xterm-basic|xterm terminal emulator - common (XFree86),
+xterm-basic|xterm terminal emulator - common (X.Org),
am,
bce,
km,
@@ -271,7 +281,7 @@
u9=\E[c,
vpa=\E[%i%p1%dd,
#
-# The xterm-xfree86 description has all of the features, but is not completely
+# The xterm-xorg 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
@@ -284,7 +294,7 @@
# keys by using the shift-modifier in the translations resource. However, that
# interferes with the DECUDK functionality.
#
-xterm-vt220|XFree86 xterm emulating vt220,
+xterm-vt220|X.Org xterm emulating vt220,
ka1=\EOw,
ka3=\EOy,
kbeg=\EOu,
@@ -324,7 +334,7 @@
kpp=\E[5~,
use=xterm-basic,
#
-xterm-vt52|XFree86 xterm emulating dec vt52,
+xterm-vt52|X.Org xterm emulating dec vt52,
cols#80,
it#8,
lines#24,
@@ -353,7 +363,7 @@
smacs=\EF,
#
# kf30-kf45 are keysyms XK_R1 through XK_R15 on the Sun keyboard.
-xterm-sun|XFree86 xterm with sun function keys,
+xterm-sun|X.Org xterm with sun function keys,
kb2=\E[218z,
kcpy=\E[197z,
kcub1=\EOD,
@@ -402,7 +412,7 @@
kund=\E[195z,
use=xterm-basic,
#
-xterm-hp|XFree86 xterm with hpterm function keys,
+xterm-hp|X.Org xterm with hpterm function keys,
kclr=\EJ,
kcub1=\ED,
kcud1=\EB,
@@ -423,7 +433,7 @@
knp=\ES,
kpp=\ET,
use=xterm-basic,
-xterm-sco|XFree86 xterm with SCO function keys,
+xterm-sco|X.Org xterm with SCO function keys,
kcub1=\E[D,
kcud1=\E[B,
kcuf1=\E[C,
@@ -538,9 +548,9 @@
smkx=\E=,
use=xterm,
#
-# This should work for the commonly used "color xterm" variations (XFree86
+# This should work for the commonly used "color xterm" variations (X.Org
# xterm, color_xterm, nxterm, rxvt). Note that it does not set 'bce', so for
-# XFree86 and and rxvt, some applications that use colors will be less
+# X.Org and and rxvt, some applications that use colors will be less
# efficient, and in a few special cases (with "smart" optimization) the wrong
# color will be painted in spots.
xterm-color|generic "ANSI" color xterm (X Window System),
@@ -566,14 +576,14 @@
# to ncurses).
xterm-xmc|xterm with magic-cookie glitch,
xmc#1,
- use=xterm-xfree86,
+ use=xterm-xorg,
#
# This one also is primarily for testing ncurses; while the ISO 6429 defines
# the REP control, none of the DEC VTxxx terminals (VT52 through VT420) support
# it.
xterm-rep|xterm with repeat-character control,
rep=%p1%c\E[%p2%{1}%-%db,
- use=xterm-xfree86,
+ use=xterm-xorg,
#
# This is mainly for testing xterm; the real VT220 will not let you switch
# character sets without first altering the keyboard language in the setup
@@ -583,7 +593,7 @@
xterm-nrc|xterm with VT220 national replacement character sets,
csnm=%?%p1%{1}%=%tNorth American%e%p1%{2}%=%tBritish%e%p1%{3}%=%tFlemish%e%p1%{4}%=%tFrench Canadian%e%p1%{5}%=%tDanish%e%p1%{6}%=%tFinnish%e%p1%{7}%=%tGerman%e%p1%{8}%=%tDutch%e%p1%{9}%=%tItalian%e%p1%{10}%=%tSwiss (French)%e%p1%{11}%=%tSwiss (German)%e%p1%{12}%=%tSwedish%e%p1%{13}%=%tNorwegian%e%p1%{14}%=%tFrench/Belgian%e%p1%{15}%=%tSpanish%;,
scs=%?%p1%{1}%=%t\E(B%e%p1%{2}%=%t\E(A%e%p1%{3}%=%t\E(R%e%p1%{4}%=%t\E(9%e%p1%{5}%=%t\E(E%e%p1%{6}%=%t\E(5%e%p1%{7}%=%t\E(K%e%p1%{8}%=%t\E(4%e%p1%{9}%=%t\E(Y%e%p1%{10}%=%t\E(=%e%p1%{11}%=%t\E(=%e%p1%{12}%=%t\E(7%e%p1%{13}%=%t\E(E%e%p1%{14}%=%t\E(R%e%p1%{15}%=%t\E(Z%;,
- use=xterm-xfree86,
+ use=xterm-xorg,
#
# Foreground 0-15 maps (with toggles) into 30-37 & 90-97
# Background 0-15 maps (with toggles) into 40-47 & 100-107
@@ -603,7 +613,7 @@
setaf=\E[%?%p1%{8}%<%t%p1%{30}%+%e%p1%{82}%+%;%dm,
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-xfree86,
+ use=xterm-xorg,
#
# OPT_PC_MODE should be settable with OSC, and the init for this
# should turn it off; then ncv could be 0.
@@ -618,7 +628,7 @@
setaf=\E[38;5;%p1%dm,
setb=\E[48;5;%p1%dm,
setf=\E[38;5;%p1%dm,
- use=xterm-xfree86,
+ use=xterm-xorg,
xterm-88color|xterm with 88 colors,
colors#88,
pairs#88,
@@ -965,10 +975,12 @@
u7=\E[6n,
u8=\E[?1;2c,
u9=\E[c,
+xterm-xfree86|Xterm alias for XFree86 environments,
+ use=xterm-xorg,
#
# This is the only entry which you should have to customize, since "xterm"
# is widely used for a variety of incompatible terminal emulations including
# color_xterm and rxvt.
xterm|X11 terminal emulator,
- use=xterm-xfree86,
+ use=xterm-xorg,
# use=xterm-r6,
More information about the xorg-commit-diffs
mailing list