- save work; patches updates(2 FIXME left); some obsolete ptches dropped

[packages/X11.git] / X11-XTerm.ad.patch

diff --git a/X11-XTerm.ad.patch b/X11-XTerm.ad.patch
index 440251be1d1aaf742c3c3bb1af0694dcd8b0e343..aee481ff64dc4bbddc49d937cde83eba7211cee9 100644 (file)
--- a/X11-XTerm.ad.patch
+++ b/X11-XTerm.ad.patch
@@ -1,22 +1,20 @@
 --- xc/programs/xterm/XTerm-col.ad.orig        2003-09-25 13:06:59.000000000 +0200
 +++ xc/programs/xterm/XTerm-col.ad     2003-10-01 20:48:30.453913496 +0200
-@@ -11,8 +11,8 @@
- !*VT100*background: black
+@@ -24,7 +24,7 @@
+ !*SimpleMenu*borderColor: gray15
  
  ! Uncomment this to use color for underline attribute
 -!*VT100*colorULMode: on
--!*VT100*underLine: off
 +*VT100*colorULMode: on
-+*VT100*underLine: on
+ *VT100*colorUL: yellow
  
- ! Uncomment this to use color for the bold attribute
- !*VT100*colorBDMode: on
+ !*VT100*italicULMode: on
 --- xc/programs/xterm/XTerm.ad.orig    2003-09-25 13:06:59.000000000 +0200
 +++ xc/programs/xterm/XTerm.ad 2003-10-01 20:49:35.565015104 +0200
-@@ -110,3 +110,180 @@
- *tek4014*font2: 8x13
+@@ -118,6 +118,170 @@
  *tek4014*font3: 6x13
  *tek4014*fontSmall: 6x10
+ 
 +
 +! This file causes when loaded using xrdb correct behaviour of xterm
 +! if you are using enclosed xterm.tcap and xterm.ti.
@@ -90,40 +88,32 @@
 +      Ctrl<Key>Page_Down: string(0x1b) string("[6;5~")\n\
 +      ~Meta<Key>Page_Down: string(0x1b) string("[6~")\n\
 +      Meta<Key>Page_Down: string(0x1b) string(0x1b) string("[6~")\n\
-+      ~Meta<Key>BackSpace: string(0x08)\n\
++      ~Meta<Key>BackSpace: string(0x7f)\n\
 +      Meta<Key>BackSpace: string(0x1b) string(0x08)\n\
 +      Ctrl Shift<Key>Up: string(0x1b) string("[1;6A")\n\
 +      Ctrl<Key>Up: string(0x1b) string("[1;5A")\n\
-+      Shift<Key>Up: string(0x1b) string("O2A")\n\
-+      ~Meta<Key>Up: string(0x1b) string("OA")\n\
-+      Meta<Key>Up: string(0x1b) string(0x1b) string("OA")\n\
++      Shift<Key>Up: string(0x1b) string("[1;2A")\n\
++      Meta<Key>Up: string(0x1b) string("[1;3A")\n\
 +      Ctrl Shift<Key>Down: string(0x1b) string("[1;6B")\n\
 +      Ctrl<Key>Down: string(0x1b) string("[1;5B")\n\
-+      Shift<Key>Down: string(0x1b) string("O2B")\n\
-+      ~Meta<Key>Down: string(0x1b) string("OB")\n\
-+      Meta<Key>Down: string(0x1b) string(0x1b) string("OB")\n\
++      Shift<Key>Down: string(0x1b) string("[1;2B")\n\
++      Meta<Key>Down: string(0x1b) string("[1;3B")\n\
 +      Ctrl Shift<Key>Left: string(0x1b) string("[1;6D")\n\
 +      Ctrl<Key>Left: string(0x1b) string("[1;5D")\n\
-+      Shift<Key>Left: string(0x1b) string("O2D")\n\
++      Shift<Key>Left: string(0x1b) string("[1;2D")\n\
 +      Mod5<Key>Left: string(0x1b) string("b")\n\
-+      ~Meta<Key>Left: string(0x1b) string("OD")\n\
-+      Meta<Key>Left: string(0x1b) string(0x1b) string("OD")\n\
++      Meta<Key>Left: string(0x1b) string("[1;3D")\n\
 +      Ctrl Shift<Key>Right: string(0x1b) string("[1;6C")\n\
 +      Ctrl<Key>Right: string(0x1b) string("[1;5C")\n\
-+      Shift<Key>Right: string(0x1b) string("O2C")\n\
++      Shift<Key>Right: string(0x1b) string("[1;2C")\n\
 +      Mod5<Key>Right: string(0x1b) string("f")\n\
-+      ~Meta<Key>Right: string(0x1b) string("OC")\n\
-+      Meta<Key>Right: string(0x1b) string(0x1b) string("OC")\n\
++      Meta<Key>Right: string(0x1b) string("[1;3C")\n\
 +      ~Meta<Key>Return: string(0x0d)\n\
 +      Meta<Key>Return: string(0x1b) string(0x0d)\n\
 +      Ctrl<Key>Tab: string(0x1b) string(0x09)\n\
 +      Mod5<Key>Tab: string(0x1b) string(0x09)\n\
 +      ~Meta<Key>Tab: string(0x09)\n\
 +      Meta<Key>Tab: string(0x1b) string(0x09)\n\
-+      ~s<Key>F1: string(0x1b) string("[11~")\n\
-+      ~s<Key>F2: string(0x1b) string("[12~")\n\
-+      ~s<Key>F3: string(0x1b) string("[13~")\n\
-+      ~s<Key>F4: string(0x1b) string("[14~")\n\
 +      ~s<Key>F5: string(0x1b) string("[15~")\n\
 +      ~s<Key>F6: string(0x1b) string("[17~")\n\
 +      ~s<Key>F7: string(0x1b) string("[18~")\n\
@@ -140,18 +130,12 @@
 +      <Key>F18: string(0x1b) string("[32~")\n\
 +      <Key>F19: string(0x1b) string("[33~")\n\
 +      <Key>F20: string(0x1b) string("[34~")\n\
-+      s<Key>F1: string(0x1b) string("[23~")\n\
-+      s<Key>F2: string(0x1b) string("[24~")\n\
-+      s<Key>F3: string(0x1b) string("[25~")\n\
-+      s<Key>F4: string(0x1b) string("[26~")\n\
 +      s<Key>F5: string(0x1b) string("[28~")\n\
 +      s<Key>F6: string(0x1b) string("[29~")\n\
 +      s<Key>F7: string(0x1b) string("[31~")\n\
 +      s<Key>F8: string(0x1b) string("[32~")\n\
 +      s<Key>F9: string(0x1b) string("[33~")\n\
 +      s<Key>F10: string(0x1b) string("[34~")\n\
-+      a<Key>Return: string(0x1b) string(0x0d)\n\
-+      a<Key>Tab: string(0x1b) string(0x09)\n\
 +      a<Key>space: string(0x1b) string(" ")\n\
 +      a s<Key>question: string(0x1b) string("?")\n\
 +      a s<Key>exclam: string(0x1b) string("!")\n\
@@ -194,3 +178,7 @@
 +      a<Key>x: string(0x1b) string("x")\n\
 +      a<Key>y: string(0x1b) string("y")\n\
 +      a<Key>z: string(0x1b) string("z")
++
+ ! If xterm is built with a toolbar, the widget hierarchy looks like this,
+ ! showing widget name / class names.  The complete menu hierarchy is built
+ ! at startup because it is needed to make the layout work for the menubar: