Update to xterm 271. Tested by shadchin@ and ajacoutot@

1 files changed, 610 insertions, 86 deletions

diff --git a/app/xterm/terminfo b/app/xterm/terminfo
index 2583be46d..5d1b297cf 100644
--- a/app/xterm/terminfo
+++ b/app/xterm/terminfo
@@ -1,12 +1,12 @@
-# $XTermId: terminfo,v 1.133 2006/08/01 00:55:47 tom Exp $
+# $XTermId: terminfo,v 1.156 2011/07/04 11:11:43 tom Exp $
 #
 # $XFree86: xc/programs/xterm/terminfo,v 3.59 2006/02/13 01:14:59 dickey Exp $
 #
-# XFree86 updates/notes/new entries (including xterm-8bit, xterm-16color)
+# Updates/notes/new entries (e.g., xterm-8bit, xterm-16color, xterm-256color)
 # - Thomas E. Dickey
 #
 #------------------------------------------------------------------------------
-# Copyright 1996-2005,2006 by Thomas E. Dickey
+# Copyright 1996-2007,2011 by Thomas E. Dickey
 #
 #                         All Rights Reserved
 #
@@ -132,43 +132,47 @@
 xterm-new|modern xterm terminal emulator,
 	npc,
 	indn=\E[%p1%dS,
-	kDC=\E[3;2~,
-	kEND=\E[1;2F,
-	kHOM=\E[1;2H,
-	kIC=\E[2;2~,
-	kLFT=\E[1;2D,
-	kNXT=\E[6;2~,
-	kPRV=\E[5;2~,
-	kRIT=\E[1;2C,
 	kb2=\EOE,
 	kcbt=\E[Z,
-	kcub1=\EOD,
-	kcud1=\EOB,
-	kcuf1=\EOC,
-	kcuu1=\EOA,
-	kend=\EOF,
 	kent=\EOM,
-	khome=\EOH,
-	kich1=\E[2~,
-	kind=\E[1;2B,
-	knp=\E[6~,
-	kpp=\E[5~,
-	kri=\E[1;2A,
 	rin=\E[%p1%dT,
 	use=xterm+pcfkeys,
+	use=xterm+tmux,
 	use=xterm-basic,
 #
-# Encode modifiers using parameters (see ctlseqs.msg).
+# Encode modifiers using parameters (see "Xterm Control Sequences" ctlseqs.ms).
 # Note that this is unrelated to PCTERM.
 #
-# Some names are extensions allowed by ncurses:
+# Some names are extensions allowed by ncurses, e.g.,
 #	kDN, kDN5, kDN6, kLFT5, kLFT6, kRIT5, kRIT6, kUP, kUP5, kUP6
-# The numbers correspond to the modifier parameters, e.g., 5=control,
-# 6=control/shift.
+#
+# The uppercase names are made up, since there are no standards that apply.
+# If they were limited to two characters, they could in principle be translated
+# to termcap.  However, termcap sizes are limited to 1023 bytes, so there is
+# little point in ensuring that extended key names can be translated to
+# termcap.  A terminfo file can be up to 4096 bytes; using all extended keys
+# that xterm can generate would in fact exceed that limit.
+#
+# The numbers correspond to the modifier parameters documented in Xterm
+# Control Sequences:
+#
+#	2	Shift
+#	3	Alt
+#	4	Shift + Alt
+#	5	Control
+#	6	Shift + Control
+#	7	Alt + Control
+#	8	Shift + Alt + Control
+#
+# X/Open Curses defines some shift combinations, which are also used here
+# where applicable.  Since it does define some shift combinations, no number
+# (2) is used for suffixing the made-up names.  Some combinations are not
+# useful, e.g., they may reboot your computer, or they may require too many
+# fingers.  I stopped at modifier 7, just to keep things simple -TD
 #
 # XTerm resources:
 # ---------------
-# The xterm-pcfn, xterm-pcf0, xterm-pcf1, xterm-pcf2 and xterm-pcf3 fragments
+# The xterm+pcfn, xterm+pcf0, xterm+pcf1, xterm+pcf2 and xterm+pcf3 fragments
 # correspond to default resource settings for xterm on a 104-key PC keyboard
 # with 12 function-keys:
 #
@@ -191,10 +195,37 @@ xterm-new|modern xterm terminal emulator,
 # an application that required it.
 #
 xterm+pcfkeys|fragment for PC-style keys,
-	use=xterm+pcf0,
+	use=xterm+app,
+	use=xterm+pcf2,
+	use=xterm+pce2,
 	use=xterm+pcc2,
-#
-# The ctrlFKeys resource is only relevant to the xterm-pcfn and xterm-pcfN
+
+# This chunk is based on suggestions by Ailin Nemui and Nicholas Marriott, who
+# asked for some of xterm's advanced features to be added to its terminfo
+# entry.  It defines extended capabilities not found in standard terminfo or
+# termcap.  These are useful in tmux, for instance, hence the name.
+#
+# One caveat in adding extended capabilities in ncurses is that if the names
+# are longer than two characters, then they will not be visible through the
+# termcap interface.
+#
+# Ms modifies the selection/clipboard.  Its parameters are
+#	p1 = the storage unit (clipboard, selection or cut buffer)
+#	p2 = the base64-encoded clipboard content.
+# 
+# Ss is used to set the cursor style as described by the DECSCUSR
+#	function to a block or underline.
+# Se resets the cursor style to the terminal power-on default.
+#  
+# Cs and Ce set and reset the cursor colour.
+xterm+tmux|advanced xterm features used in tmux,
+	Cr=\E]112\007,
+	Cs=\E]12;%p1%s\007,
+	Ms=\E]52;%p1%s;%p2%s\007,
+	Se=\E[2 q,
+	Ss=\E[%p1%d q,
+#
+# The ctrlFKeys resource is only relevant to the xterm+pcfn and xterm+pcfN
 # entries, since the modifyFunctionKeys resource overrides ctrlFKeys when it is
 # positive.  A different choice of ctrlFKeys would give a different set of
 # function-key strings.
@@ -369,12 +400,9 @@ xterm+pcf0|fragment with modifyFunctionKeys:0,
 	kf8=\E[19~,
 	kf9=\E[20~,
 
-# This is the same as xterm+pcf2 because the unmodified keys all happen to
-# have a pattern that forces the modifier to the same position.
+# This is almost the same as xterm+pcf2 because the unmodified keys all happen
+# to have a pattern that forces the modifier to the same position.
 xterm+pcf1|fragment with modifyFunctionKeys:1,
-	use=xterm+pcf2,
-
-xterm+pcf2|fragment with modifyFunctionKeys:2,
 	kf1=\EOP,
 	kf10=\E[21~,
 	kf11=\E[23~,
@@ -439,15 +467,80 @@ xterm+pcf2|fragment with modifyFunctionKeys:2,
 	kf8=\E[19~,
 	kf9=\E[20~,
 
+xterm+pcf2|fragment with modifyFunctionKeys:2,
+	kf1=\EOP,
+	kf10=\E[21~,
+	kf11=\E[23~,
+	kf12=\E[24~,
+	kf13=\E[1;2P,
+	kf14=\E[1;2Q,
+	kf15=\E[1;2R,
+	kf16=\E[1;2S,
+	kf17=\E[15;2~,
+	kf18=\E[17;2~,
+	kf19=\E[18;2~,
+	kf2=\EOQ,
+	kf20=\E[19;2~,
+	kf21=\E[20;2~,
+	kf22=\E[21;2~,
+	kf23=\E[23;2~,
+	kf24=\E[24;2~,
+	kf25=\E[1;5P,
+	kf26=\E[1;5Q,
+	kf27=\E[1;5R,
+	kf28=\E[1;5S,
+	kf29=\E[15;5~,
+	kf3=\EOR,
+	kf30=\E[17;5~,
+	kf31=\E[18;5~,
+	kf32=\E[19;5~,
+	kf33=\E[20;5~,
+	kf34=\E[21;5~,
+	kf35=\E[23;5~,
+	kf36=\E[24;5~,
+	kf37=\E[1;6P,
+	kf38=\E[1;6Q,
+	kf39=\E[1;6R,
+	kf4=\EOS,
+	kf40=\E[1;6S,
+	kf41=\E[15;6~,
+	kf42=\E[17;6~,
+	kf43=\E[18;6~,
+	kf44=\E[19;6~,
+	kf45=\E[20;6~,
+	kf46=\E[21;6~,
+	kf47=\E[23;6~,
+	kf48=\E[24;6~,
+	kf49=\E[1;3P,
+	kf5=\E[15~,
+	kf50=\E[1;3Q,
+	kf51=\E[1;3R,
+	kf52=\E[1;3S,
+	kf53=\E[15;3~,
+	kf54=\E[17;3~,
+	kf55=\E[18;3~,
+	kf56=\E[19;3~,
+	kf57=\E[20;3~,
+	kf58=\E[21;3~,
+	kf59=\E[23;3~,
+	kf6=\E[17~,
+	kf60=\E[24;3~,
+	kf61=\E[1;4P,
+	kf62=\E[1;4Q,
+	kf63=\E[1;4R,
+	kf7=\E[18~,
+	kf8=\E[19~,
+	kf9=\E[20~,
+
 xterm+pcf3|fragment with modifyFunctionKeys:3,
 	kf1=\EOP,
 	kf10=\E[21~,
 	kf11=\E[23~,
 	kf12=\E[24~,
-	kf13=\E[2P,
-	kf14=\E[2Q,
-	kf15=\E[2R,
-	kf16=\E[2S,
+	kf13=\E[>1;2P,
+	kf14=\E[>1;2Q,
+	kf15=\E[>1;2R,
+	kf16=\E[>1;2S,
 	kf17=\E[>15;2~,
 	kf18=\E[>17;2~,
 	kf19=\E[>18;2~,
@@ -457,10 +550,10 @@ xterm+pcf3|fragment with modifyFunctionKeys:3,
 	kf22=\E[>21;2~,
 	kf23=\E[>23;2~,
 	kf24=\E[>24;2~,
-	kf25=\E[5P,
-	kf26=\E[5Q,
-	kf27=\E[5R,
-	kf28=\E[5S,
+	kf25=\E[>1;5P,
+	kf26=\E[>1;5Q,
+	kf27=\E[>1;5R,
+	kf28=\E[>1;5S,
 	kf29=\E[>15;5~,
 	kf3=\EOR,
 	kf30=\E[>17;5~,
@@ -470,11 +563,11 @@ xterm+pcf3|fragment with modifyFunctionKeys:3,
 	kf34=\E[>21;5~,
 	kf35=\E[>23;5~,
 	kf36=\E[>24;5~,
-	kf37=\E[6P,
-	kf38=\E[6Q,
-	kf39=\E[6R,
+	kf37=\E[>1;6P,
+	kf38=\E[>1;6Q,
+	kf39=\E[>1;6R,
 	kf4=\EOS,
-	kf40=\E[6S,
+	kf40=\E[>1;6S,
 	kf41=\E[>15;6~,
 	kf42=\E[>17;6~,
 	kf43=\E[>18;6~,
@@ -483,11 +576,11 @@ xterm+pcf3|fragment with modifyFunctionKeys:3,
 	kf46=\E[>21;6~,
 	kf47=\E[>23;6~,
 	kf48=\E[>24;6~,
-	kf49=\E[3P,
+	kf49=\E[>1;3P,
 	kf5=\E[15~,
-	kf50=\E[3Q,
-	kf51=\E[3R,
-	kf52=\E[3S,
+	kf50=\E[>1;3Q,
+	kf51=\E[>1;3R,
+	kf52=\E[>1;3S,
 	kf53=\E[>15;3~,
 	kf54=\E[>17;3~,
 	kf55=\E[>18;3~,
@@ -497,9 +590,9 @@ xterm+pcf3|fragment with modifyFunctionKeys:3,
 	kf59=\E[>23;3~,
 	kf6=\E[17~,
 	kf60=\E[>24;3~,
-	kf61=\E[4P,
-	kf62=\E[4Q,
-	kf63=\E[4R,
+	kf61=\E[>1;4P,
+	kf62=\E[>1;4Q,
+	kf63=\E[>1;4R,
 	kf7=\E[18~,
 	kf8=\E[19~,
 	kf9=\E[20~,
@@ -523,55 +616,277 @@ xterm+pcf3|fragment with modifyFunctionKeys:3,
 # modifyCursorKeys resource.  These fragments list the modified cursor-keys
 # that might apply to xterm+pcfkeys with different values of that resource.
 xterm+pcc3|fragment with modifyCursorKeys:3,
+	kLFT=\E[>1;2D,
+	kRIT=\E[>1;2C,
+	kind=\E[>1;2B,
+	kri=\E[>1;2A,
 	kDN=\E[>1;2B,
+	kDN3=\E[>1;3B,
+	kDN4=\E[>1;4B,
 	kDN5=\E[>1;5B,
 	kDN6=\E[>1;6B,
+	kDN7=\E[>1;7B,
+	kLFT3=\E[>1;3D,
+	kLFT4=\E[>1;4D,
 	kLFT5=\E[>1;5D,
 	kLFT6=\E[>1;6D,
+	kLFT7=\E[>1;7D,
+	kRIT3=\E[>1;3C,
+	kRIT4=\E[>1;4C,
 	kRIT5=\E[>1;5C,
 	kRIT6=\E[>1;6C,
+	kRIT7=\E[>1;7C,
 	kUP=\E[>1;2A,
+	kUP3=\E[>1;3A,
+	kUP4=\E[>1;4A,
 	kUP5=\E[>1;5A,
 	kUP6=\E[>1;6A,
+	kUP7=\E[>1;7A,
 
 xterm+pcc2|fragment with modifyCursorKeys:2,
+	kLFT=\E[1;2D,
+	kRIT=\E[1;2C,
+	kind=\E[1;2B,
+	kri=\E[1;2A,
 	kDN=\E[1;2B,
+	kDN3=\E[1;3B,
+	kDN4=\E[1;4B,
 	kDN5=\E[1;5B,
 	kDN6=\E[1;6B,
+	kDN7=\E[1;7B,
+	kLFT3=\E[1;3D,
+	kLFT4=\E[1;4D,
 	kLFT5=\E[1;5D,
 	kLFT6=\E[1;6D,
+	kLFT7=\E[1;7D,
+	kRIT3=\E[1;3C,
+	kRIT4=\E[1;4C,
 	kRIT5=\E[1;5C,
 	kRIT6=\E[1;6C,
+	kRIT7=\E[1;7C,
 	kUP=\E[1;2A,
+	kUP3=\E[1;3A,
+	kUP4=\E[1;4A,
 	kUP5=\E[1;5A,
 	kUP6=\E[1;6A,
+	kUP7=\E[1;7A,
 
 xterm+pcc1|fragment with modifyCursorKeys:1,
+	kLFT=\E[2D,
+	kRIT=\E[2C,
+	kind=\E[2B,
+	kri=\E[2A,
 	kDN=\E[2B,
+	kDN3=\E[3B,
+	kDN4=\E[4B,
 	kDN5=\E[5B,
 	kDN6=\E[6B,
+	kDN7=\E[7B,
+	kLFT3=\E[3D,
+	kLFT4=\E[4D,
 	kLFT5=\E[5D,
 	kLFT6=\E[6D,
+	kLFT7=\E[7D,
+	kRIT3=\E[3C,
+	kRIT4=\E[4C,
 	kRIT5=\E[5C,
 	kRIT6=\E[6C,
+	kRIT7=\E[7C,
 	kUP=\E[2A,
+	kUP3=\E[3A,
+	kUP4=\E[4A,
 	kUP5=\E[5A,
 	kUP6=\E[6A,
+	kUP7=\E[7A,
 
 xterm+pcc0|fragment with modifyCursorKeys:0,
+	kLFT=\EO2D,
+	kRIT=\EO2C,
+	kind=\EO2B,
+	kri=\EO2A,
 	kDN=\EO2B,
+	kDN3=\EO3B,
+	kDN4=\EO4B,
 	kDN5=\EO5B,
 	kDN6=\EO6B,
+	kDN7=\EO7B,
+	kLFT3=\EO3D,
+	kLFT4=\EO4D,
 	kLFT5=\EO5D,
 	kLFT6=\EO6D,
+	kLFT7=\EO7D,
+	kRIT3=\EO3C,
+	kRIT4=\EO4C,
 	kRIT5=\EO5C,
 	kRIT6=\EO6C,
+	kRIT7=\EO7C,
 	kUP=\EO2A,
+	kUP3=\EO3A,
+	kUP4=\EO4A,
 	kUP5=\EO5A,
 	kUP6=\EO6A,
+	kUP7=\EO7A,
+
+# The home/end keys on the editing keypad are also treated as cursor keys.
+xterm+pce3|fragment with modifyCursorKeys:3,
+	kDC=\E[>3;2~,
+	kEND=\E[>1;2F,
+	kHOM=\E[>1;2H,
+	kIC=\E[>2;2~,
+	kNXT=\E[>6;2~,
+	kPRV=\E[>5;2~,
+	kDC3=\E[>3;3~,
+	kDC4=\E[>3;4~,
+	kDC5=\E[>3;5~,
+	kDC6=\E[>3;6~,
+	kDC7=\E[>3;7~,
+	kEND3=\E[>1;3F,
+	kEND4=\E[>1;4F,
+	kEND5=\E[>1;5F,
+	kEND6=\E[>1;6F,
+	kEND7=\E[>1;7F,
+	kHOM3=\E[>1;3H,
+	kHOM4=\E[>1;4H,
+	kHOM5=\E[>1;5H,
+	kHOM6=\E[>1;6H,
+	kHOM7=\E[>1;7H,
+	kIC3=\E[>2;3~,
+	kIC4=\E[>2;4~,
+	kIC5=\E[>2;5~,
+	kIC6=\E[>2;6~,
+	kIC7=\E[>2;7~,
+	kNXT3=\E[>6;3~,
+	kNXT4=\E[>6;4~,
+	kNXT5=\E[>6;5~,
+	kNXT6=\E[>6;6~,
+	kNXT7=\E[>6;7~,
+	kPRV3=\E[>5;3~,
+	kPRV4=\E[>5;4~,
+	kPRV5=\E[>5;5~,
+	kPRV6=\E[>5;6~,
+	kPRV7=\E[>5;7~,
+	use=xterm+pce0,
+
+xterm+pce2|fragment with modifyCursorKeys:2,
+	kDC=\E[3;2~,
+	kEND=\E[1;2F,
+	kHOM=\E[1;2H,
+	kIC=\E[2;2~,
+	kNXT=\E[6;2~,
+	kPRV=\E[5;2~,
+	kDC3=\E[3;3~,
+	kDC4=\E[3;4~,
+	kDC5=\E[3;5~,
+	kDC6=\E[3;6~,
+	kDC7=\E[3;7~,
+	kEND3=\E[1;3F,
+	kEND4=\E[1;4F,
+	kEND5=\E[1;5F,
+	kEND6=\E[1;6F,
+	kEND7=\E[1;7F,
+	kHOM3=\E[1;3H,
+	kHOM4=\E[1;4H,
+	kHOM5=\E[1;5H,
+	kHOM6=\E[1;6H,
+	kHOM7=\E[1;7H,
+	kIC3=\E[2;3~,
+	kIC4=\E[2;4~,
+	kIC5=\E[2;5~,
+	kIC6=\E[2;6~,
+	kIC7=\E[2;7~,
+	kNXT3=\E[6;3~,
+	kNXT4=\E[6;4~,
+	kNXT5=\E[6;5~,
+	kNXT6=\E[6;6~,
+	kNXT7=\E[6;7~,
+	kPRV3=\E[5;3~,
+	kPRV4=\E[5;4~,
+	kPRV5=\E[5;5~,
+	kPRV6=\E[5;6~,
+	kPRV7=\E[5;7~,
+	use=xterm+pce0,
+
+xterm+pce1|fragment with modifyCursorKeys:1,
+	kDC=\E[3;2~,
+	kEND=\E[2F,
+	kHOM=\E[2H,
+	kIC=\E[2;2~,
+	kNXT=\E[6;2~,
+	kPRV=\E[5;2~,
+	kDC3=\E[3;3~,
+	kDC4=\E[3;4~,
+	kDC5=\E[3;5~,
+	kDC6=\E[3;6~,
+	kDC7=\E[3;7~,
+	kEND3=\E[3F,
+	kEND4=\E[4F,
+	kEND5=\E[5F,
+	kEND6=\E[6F,
+	kEND7=\E[7F,
+	kHOM3=\E[3H,
+	kHOM4=\E[4H,
+	kHOM5=\E[5H,
+	kHOM6=\E[6H,
+	kHOM7=\E[7H,
+	kIC3=\E[2;3~,
+	kIC4=\E[2;4~,
+	kIC5=\E[2;5~,
+	kIC6=\E[2;6~,
+	kIC7=\E[2;7~,
+	kNXT3=\E[6;3~,
+	kNXT4=\E[6;4~,
+	kNXT5=\E[6;5~,
+	kNXT6=\E[6;6~,
+	kNXT7=\E[6;7~,
+	kPRV3=\E[5;3~,
+	kPRV4=\E[5;4~,
+	kPRV5=\E[5;5~,
+	kPRV6=\E[5;6~,
+	kPRV7=\E[5;7~,
+	use=xterm+pce0,
+
+xterm+pce0|fragment with modifyCursorKeys:0,
+	kDC=\E[3;2~,
+	kEND=\EO2F,
+	kHOM=\EO2H,
+	kIC=\E[2;2~,
+	kNXT=\E[6;2~,
+	kPRV=\E[5;2~,
+	kDC3=\E[3;3~,
+	kDC4=\E[3;4~,
+	kDC5=\E[3;5~,
+	kDC6=\E[3;6~,
+	kDC7=\E[3;7~,
+	kEND3=\EO3F,
+	kEND4=\EO4F,
+	kEND5=\EO5F,
+	kEND6=\EO6F,
+	kEND7=\EO7F,
+	kHOM3=\EO3H,
+	kHOM4=\EO4H,
+	kHOM5=\EO5H,
+	kHOM6=\EO6H,
+	kHOM7=\EO7H,
+	kIC3=\E[2;3~,
+	kIC4=\E[2;4~,
+	kIC5=\E[2;5~,
+	kIC6=\E[2;6~,
+	kIC7=\E[2;7~,
+	kNXT3=\E[6;3~,
+	kNXT4=\E[6;4~,
+	kNXT5=\E[6;5~,
+	kNXT6=\E[6;6~,
+	kNXT7=\E[6;7~,
+	kPRV3=\E[5;3~,
+	kPRV4=\E[5;4~,
+	kPRV5=\E[5;5~,
+	kPRV6=\E[5;6~,
+	kPRV7=\E[5;7~,
+	use=xterm+edit,
 #
 # This chunk is used for building the VT220/Sun/PC keyboard variants.
 xterm-basic|modern xterm terminal emulator - common,
+	OTbs,
 	am,
 	bce,
 	km,
@@ -625,7 +940,6 @@ xterm-basic|modern xterm terminal emulator - common,
 	invis=\E[8m,
 	is2=\E[!p\E[?3;4l\E[4l\E>,
 	kbs=^H,
-	kdch1=\E[3~,
 	kmous=\E[M,
 	mc0=\E[i,
 	mc4=\E[4i,
@@ -688,10 +1002,6 @@ xterm-vt220|xterm emulating vt220,
 	kc1=\EOq,
 	kc3=\EOs,
 	kcbt=\E[Z,
-	kcub1=\EOD,
-	kcud1=\EOB,
-	kcuf1=\EOC,
-	kcuu1=\EOA,
 	kend=\E[4~,
 	kent=\EOM,
 	kf1=\EOP,
@@ -718,6 +1028,12 @@ xterm-vt220|xterm emulating vt220,
 	kich1=\E[2~,
 	knp=\E[6~,
 	kpp=\E[5~,
+	ka2=\EOx,
+	kb1=\EOt,
+	kb3=\EOv,
+	kc2=\EOr,
+	use=xterm+app,
+	use=xterm+edit,
 	use=xterm-basic,
 #
 xterm-vt52|xterm emulating dec vt52,
@@ -872,12 +1188,7 @@ xterm-hp|xterm with hpterm function keys,
 #
 xterm-sco|xterm with SCO function keys,
 	kbeg=\E[E,
-	kcub1=\E[D,
-	kcud1=\E[B,
-	kcuf1=\E[C,
-	kcuu1=\E[A,
 	kdch1=\177,
-	kend=\E[F,
 	kf1=\E[M,
 	kf10=\E[V,
 	kf11=\E[W,
@@ -926,28 +1237,28 @@ xterm-sco|xterm with SCO function keys,
 	kf7=\E[S,
 	kf8=\E[T,
 	kf9=\E[U,
-	khome=\E[H,
 	kich1=\E[L,
 	kmous=\E[>M,
 	knp=\E[G,
 	kpp=\E[I,
+	use=xterm+noapp,
 	use=xterm-basic,
 #
-# Other variants:
+# Other variants (these are all very old entries, from X11R5):
 xterm-24|xterms|vs100|xterm terminal emulator (X Window System),
 	lines#24,
-	use=xterm,
+	use=xterm-old,
 xterm-65|xterm with tall window 65x80 (X Window System),
 	lines#65,
-	use=xterm,
+	use=xterm-old,
 xterm-bold|xterm with bold instead of underline (X Window System),
 	smso=\E[7m,
 	smul=\E[1m,
-	use=xterm,
+	use=xterm-old,
 xterm-boldso|xterm with bold for standout (X Window System),
 	rmso=\E[m,
 	smso=\E[1m,
-	use=xterm,
+	use=xterm-old,
 xterm-mono|monochrome xterm,
 	bce@,
 	colors@,
@@ -959,7 +1270,7 @@ xterm-mono|monochrome xterm,
 	setb@,
 	setf@,
 	sgr@,
-	use=xterm,
+	use=xterm-old,
 #
 # VTxxx terminals are usually set up so that full-screen applications will use
 # the cursor application mode strings.  This is good for full-screen
@@ -992,15 +1303,57 @@ xterm-mono|monochrome xterm,
 #		programs are "smart" and disable these.
 #
 xterm-noapp|xterm with cursor keys in normal mode,
-	kcub1=\E[D,
-	kcud1=\E[B,
-	kcuf1=\E[C,
-	kcuu1=\E[A,
 	rmcup@,
 	rmkx=\E>,
 	smcup@,
 	smkx=\E=,
+	use=xterm+noapp,
 	use=xterm,
+
+xterm+noapp|fragment with cursor keys in normal mode,
+	kcub1=\E[D,
+	kcud1=\E[B,
+	kcuf1=\E[C,
+	kcuu1=\E[A,
+	use=xterm+noapp+pc,
+
+xterm+app|fragment with cursor keys in application mode,
+	kcub1=\EOD,
+	kcud1=\EOB,
+	kcuf1=\EOC,
+	kcuu1=\EOA,
+	use=xterm+app+pc,
+
+xterm+noapp+pc|fragment for noapp pc-style home/end,
+	kend=\E[F,
+	khome=\E[H,
+
+xterm+app+pc|fragment for app pc-style home/end,
+	kend=\EOF,
+	khome=\EOH,
+
+xterm+edit|fragment for 6-key editing-keypad,
+	kdch1=\E[3~,
+	kich1=\E[2~,
+	knp=\E[6~,
+	kpp=\E[5~,
+	use=xterm+pc+edit,
+
+xterm+decedit|fragment for vt220 6-key editing-keypad,
+	kdch1=\E[3~,
+	kich1=\E[2~,
+	knp=\E[6~,
+	kpp=\E[5~,
+	use=xterm+vt+edit,
+
+xterm+pc+edit|fragment for pc-style editing keypad,
+	kend=\E[4~,
+	khome=\E[1~,
+
+xterm+vt+edit|fragment for vt220-style editing keypad,
+	kfnd=\E[1~,
+	kslt=\E[4~,
+
 #
 # This should work for the commonly used "color xterm" variations (XFree86
 # xterm, color_xterm, nxterm, rxvt).  Note that it does not set 'bce', so for
@@ -1097,6 +1450,7 @@ xterm-88color|xterm with 88 colors,
 #	CSI	\E [	\233
 #
 xterm-8bit|xterm terminal emulator with 8-bit controls (X Window System),
+	OTbs,
 	am,
 	bce,
 	km,
@@ -1105,6 +1459,7 @@ xterm-8bit|xterm terminal emulator with 8-bit controls (X Window System),
 	msgr,
 	npc,
 	xenl,
+	AX,
 	colors#8,
 	cols#80,
 	it#8,
@@ -1228,6 +1583,180 @@ xterm-8bit|xterm terminal emulator with 8-bit controls (X Window System),
 	u9=\E[c,
 	vpa=\233%i%p1%dd,
 #
+xterm-xf86-v44|xterm terminal emulator (XFree86 4.4 Window System),
+	OTbs,
+	am,
+	bce,
+	km,
+	mc5i,
+	mir,
+	msgr,
+	npc,
+	xenl,
+	AX,
+	colors#8,
+	cols#80,
+	it#8,
+	lines#24,
+	pairs#64,
+	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+	bel=^G,
+	blink=\E[5m,
+	bold=\E[1m,
+	cbt=\E[Z,
+	civis=\E[?25l,
+	clear=\E[H\E[2J,
+	cnorm=\E[?12l\E[?25h,
+	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,
+	cup=\E[%i%p1%d;%p2%dH,
+	cuu=\E[%p1%dA,
+	cuu1=\E[A,
+	cvvis=\E[?12;25h,
+	dch=\E[%p1%dP,
+	dch1=\E[P,
+	dl=\E[%p1%dM,
+	dl1=\E[M,
+	ech=\E[%p1%dX,
+	ed=\E[J,
+	el=\E[K,
+	el1=\E[1K,
+	enacs=\E(B\E)0,
+	flash=\E[?5h$<100/>\E[?5l,
+	home=\E[H,
+	hpa=\E[%i%p1%dG,
+	ht=^I,
+	hts=\EH,
+	ich=\E[%p1%d@,
+	il=\E[%p1%dL,
+	il1=\E[L,
+	ind=^J,
+	indn=\E[%p1%dS,
+	invis=\E[8m,
+	is2=\E[!p\E[?3;4l\E[4l\E>,
+	kDC=\E[3;2~,
+	kEND=\E[1;2F,
+	kHOM=\E[1;2H,
+	kIC=\E[2;2~,
+	kLFT=\E[1;2D,
+	kNXT=\E[6;2~,
+	kPRV=\E[5;2~,
+	kRIT=\E[1;2C,
+	kb2=\EOE,
+	kbs=^H,
+	kcbt=\E[Z,
+	kcub1=\EOD,
+	kcud1=\EOB,
+	kcuf1=\EOC,
+	kcuu1=\EOA,
+	kdch1=\E[3~,
+	kend=\EOF,
+	kent=\EOM,
+	kf1=\EOP,
+	kf10=\E[21~,
+	kf11=\E[23~,
+	kf12=\E[24~,
+	kf13=\EO2P,
+	kf14=\EO2Q,
+	kf15=\EO2R,
+	kf16=\EO2S,
+	kf17=\E[15;2~,
+	kf18=\E[17;2~,
+	kf19=\E[18;2~,
+	kf2=\EOQ,
+	kf20=\E[19;2~,
+	kf21=\E[20;2~,
+	kf22=\E[21;2~,
+	kf23=\E[23;2~,
+	kf24=\E[24;2~,
+	kf25=\EO5P,
+	kf26=\EO5Q,
+	kf27=\EO5R,
+	kf28=\EO5S,
+	kf29=\E[15;5~,
+	kf3=\EOR,
+	kf30=\E[17;5~,
+	kf31=\E[18;5~,
+	kf32=\E[19;5~,
+	kf33=\E[20;5~,
+	kf34=\E[21;5~,
+	kf35=\E[23;5~,
+	kf36=\E[24;5~,
+	kf37=\EO6P,
+	kf38=\EO6Q,
+	kf39=\EO6R,
+	kf4=\EOS,
+	kf40=\EO6S,
+	kf41=\E[15;6~,
+	kf42=\E[17;6~,
+	kf43=\E[18;6~,
+	kf44=\E[19;6~,
+	kf45=\E[20;6~,
+	kf46=\E[21;6~,
+	kf47=\E[23;6~,
+	kf48=\E[24;6~,
+	kf5=\E[15~,
+	kf6=\E[17~,
+	kf7=\E[18~,
+	kf8=\E[19~,
+	kf9=\E[20~,
+	khome=\EOH,
+	kich1=\E[2~,
+	kmous=\E[M,
+	knp=\E[6~,
+	kpp=\E[5~,
+	mc0=\E[i,
+	mc4=\E[4i,
+	mc5=\E[5i,
+	meml=\El,
+	memu=\Em,
+	op=\E[39;49m,
+	rc=\E8,
+	rev=\E[7m,
+	ri=\EM,
+	rin=\E[%p1%dT,
+	rmacs=^O,
+	rmam=\E[?7l,
+	rmcup=\E[?1049l,
+	rmir=\E[4l,
+	rmkx=\E[?1l\E>,
+	rmso=\E[27m,
+	rmul=\E[24m,
+	rs1=\Ec,
+	rs2=\E[!p\E[?3;4l\E[4l\E>,
+	sc=\E7,
+	setab=\E[4%p1%dm,
+	setaf=\E[3%p1%dm,
+	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+	sgr0=\E[m\017,
+	smacs=^N,
+	smam=\E[?7h,
+	smcup=\E[?1049h,
+	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,
+	ka2=\EOx,
+	kb1=\EOt,
+	kb3=\EOv,
+	kc2=\EOr,
+xterm-xfree86|xterm terminal emulator (XFree86 4.4 Window System),
+	use=xterm-xf86-v44,
+#
 # Compatible with the R6 xterm, with the following changes:
 #	+ added acsc (perhaps some versions of tic assume the standard vt100
 #	  alternate character set)
@@ -1235,6 +1764,7 @@ xterm-8bit|xterm terminal emulator with 8-bit controls (X Window System),
 #	+ added kmous string for ncurses.
 #	+ added khome/kend strings (which conflict with kfnd/kslt, see note).
 xterm-r6|xterm-old|xterm X11R6 version,
+	OTbs,
 	am,
 	km,
 	mir,
@@ -1245,7 +1775,6 @@ xterm-r6|xterm-old|xterm X11R6 version,
 	lines#24,
 	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G,
-	blink@,
 	bold=\E[1m,
 	clear=\E[H\E[2J,
 	cr=^M,
@@ -1278,8 +1807,7 @@ xterm-r6|xterm-old|xterm X11R6 version,
 	kcud1=\EOB,
 	kcuf1=\EOC,
 	kcuu1=\EOA,
-	kdch1=\177,
-	kend=\E[4~,
+	kdch1=\E[3~,
 	kf1=\E[11~,
 	kf10=\E[21~,
 	kf11=\E[23~,
@@ -1300,11 +1828,7 @@ xterm-r6|xterm-old|xterm X11R6 version,
 	kf7=\E[18~,
 	kf8=\E[19~,
 	kf9=\E[20~,
-	khome=\E[1~,
-	kich1=\E[2~,
 	kmous=\E[M,
-	knp=\E[6~,
-	kpp=\E[5~,
 	meml=\El,
 	memu=\Em,
 	rc=\E8,
@@ -1330,6 +1854,7 @@ xterm-r6|xterm-old|xterm X11R6 version,
 	u7=\E[6n,
 	u8=\E[?1;2c,
 	u9=\E[c,
+	use=xterm+decedit,
 #
 # Compatible with the R5 xterm, with the following changes:
 #	+ changed 'blink=@', to 'blink@' (the former meant that "@" would start
@@ -1344,6 +1869,7 @@ xterm-r6|xterm-old|xterm X11R6 version,
 #	+ added u6, u7, u8, u9 strings for Daniel Weaver's tack program.
 #	+ added kmous string for ncurses.
 xterm-r5|xterm R5 version,
+	OTbs,
 	am,
 	km,
 	msgr,
@@ -1352,7 +1878,6 @@ xterm-r5|xterm R5 version,
 	it#8,
 	lines#24,
 	bel=^G,
-	blink@,
 	bold=\E[1m,
 	clear=\E[H\E[2J,
 	cr=^M,
@@ -1385,7 +1910,7 @@ xterm-r5|xterm R5 version,
 	kcud1=\EOB,
 	kcuf1=\EOC,
 	kcuu1=\EOA,
-	kdch1=\177,
+	kdch1=\E[3~,
 	kdl1=\E[31~,
 	kel=\E[8~,
 	kend=\E[4~,
@@ -1429,9 +1954,8 @@ xterm-r5|xterm R5 version,
 	u8=\E[?1;2c,
 	u9=\E[c,
 #
+#
 # Customization begins here.
-xterm-xfree86|xterm terminal emulator (XFree86),
-	use=xterm-new,
 #
 # This is the only entry which you should have to customize, since "xterm"
 # is widely used for a variety of incompatible terminal emulations including