- added ctrl-{home,end,insert,delete,up,down,left,right,page_up,page_down},

- added shift-{home,end,insert,delete,up,down,left,right},
- commented out Meta-? and Meta-! - depends on keyboard layout,
- typo,
- file is not a place for changelog.

Changed files:
    XFree86-XTerm.ad.patch -> 1.7
    XTerm.ad-pl -> 1.9

diff --git a/XFree86-XTerm.ad.patch b/XFree86-XTerm.ad.patch
index 21944ecfa2abbe3da9d733b3173fe2066754846a..01685429f1d5fc05d74031ceb44343952c6922f9 100644 (file)
--- a/XFree86-XTerm.ad.patch
+++ b/XFree86-XTerm.ad.patch
@@ -12,13 +12,13 @@ diff -urN xc.orig/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad
  
  ! Uncomment this to use color for the bold attribute
  !*VT100*colorBDMode: on
-@@ -142,3 +142,150 @@
+@@ -142,3 +142,166 @@
  *VT100*color15: white
  *VT100*colorUL: yellow
  *VT100*colorBD: white
 +
 +! This file causes when loaded using xrdb correct behaviour of xterm
-+! is you are using enclosed xterm.tcap and xterm.ti.
++! if you are using enclosed xterm.tcap and xterm.ti.
 +! Some keys would never normally work if they weren't here (like Alt
 +! something), some key definitions differ from one termcap/terminfo
 +! to the other. You may delete any line if you find out that mc
@@ -63,34 +63,54 @@ diff -urN xc.orig/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad
 +      <Key>KP_Equal: string(=)\n\
 +      <Key>KP_Multiply: string(*)\n\
 +      <Key>KP_Subtract: string(-)\n\
++      Shift<Key>KP_Home: scroll-back(100,page)\n\
++      Shift<Key>KP_End: scroll-forw(100,page)\n\
++      <Key>KP_Home: string(0x1b) string("[1~")\n\
++      <Key>KP_End: string(0x1b) string("[4~")\n\
 +      Shift<Key>Prior:scroll-back(1,page)\n\
 +      Shift<Key>Next:scroll-forw(1,page)\n\
 +      <Key>F16: start-extend() select-end(PRIMARY, CUT_BUFFER0, CLIPBOARD)\n\
 +      <Key>F18: insert-selection(PRIMARY, CLIPBOARD)\n\
 +      <Key>F27: scroll-back(100,page)\n\
 +      <Key>R13: scroll-forw(100,page)\n\
-+      <Key>KP_Home: string(0x1b) string("[1~")\n\
-+      <Key>KP_End: string(0x1b) string("[4~")\n\
++      Ctrl<Key>Home: string(0x1b) string("[1;5H")\n\
++      Shift<Key>Home: string(0x1b) string("[1;2H")\n\
 +      ~Meta<Key>Home: string(0x1b) string("[1~")\n\
 +      Meta<Key>Home: string(0x1b) string(0x1b) string("[1~")\n\
++      Ctrl<Key>End: string(0x1b) string("[1;5F")\n\
++      Shift<Key>End: string(0x1b) string("[1;2F")\n\
 +      ~Meta<Key>End: string(0x1b) string("[4~")\n\
 +      Meta<Key>End: string(0x1b) string(0x1b) string("[4~")\n\
++      Ctrl<Key>Insert: string(0x1b) string("[2;5~")\n\
++      Shift<Key>Insert: string(0x1b) string("[2;2~")\n\
 +      ~Meta<Key>Insert: string(0x1b) string("[2~")\n\
 +      Meta<Key>Insert: string(0x1b) string(0x1b) string("[2~")\n\
++      Ctrl<Key>Delete: string(0x1b) string("[3;5~")\n\
++      Shift<Key>Delete: string(0x1b) string("[3;2~")\n\
 +      ~Meta<Key>Delete: string(0x1b) string("[3~")\n\
 +      Meta<Key>Delete: string(0x1b) string(0x1b) string("[3~")\n\
++      Ctrl<Key>Page_Up: string(0x1b) string("[5;5~")\n\
 +      ~Meta<Key>Page_Up: string(0x1b) string("[5~")\n\
 +      Meta<Key>Page_Up: string(0x1b) string(0x1b) string("[5~")\n\
++      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(0x1b) string(0x08)\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\
++      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\
++      Ctrl<Key>Left: string(0x1b) string("[1;5D")\n\
++      Shift<Key>Left: string(0x1b) string("O2D")\n\
 +      ~Meta<Key>Left: string(0x1b) string("OD")\n\
 +      Meta<Key>Left: string(0x1b) string(0x1b) string("OD")\n\
++      Ctrl<Key>Right: string(0x1b) string("[1;5C")\n\
++      Shift<Key>Right: string(0x1b) string("O2C")\n\
 +      ~Meta<Key>Right: string(0x1b) string("OC")\n\
 +      Meta<Key>Right: string(0x1b) string(0x1b) string("OC")\n\
 +      ~Meta<Key>Return: string(0x0d)\n\
@@ -117,10 +137,6 @@ diff -urN xc.orig/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad
 +      <Key>F18: string(0x1b) string("[32~")\n\
 +      <Key>F19: string(0x1b) string("[33~")\n\
 +      <Key>F20: string(0x1b) string("[34~")\n\
-+      Shift<Key>Home: scroll-back(100,page)\n\
-+      Shift<Key>End: scroll-forw(100,page)\n\
-+      Shift<Key>KP_Home: scroll-back(100,page)\n\
-+      Shift<Key>KP_End: scroll-forw(100,page)\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\
@@ -160,6 +176,6 @@ diff -urN xc.orig/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad
 +      a<Key>w: string(0x1b) string("w")\n\
 +      a<Key>x: string(0x1b) string("x")\n\
 +      a<Key>y: string(0x1b) string("y")\n\
-+      a<Key>z: string(0x1b) string("z")\n\
-+      a s<Key>/: string(0x1b) string("?")\n\
-+      a s<Key>1: string(0x1b) string("!")
++      a<Key>z: string(0x1b) string("z")
++!     a s<Key>/: string(0x1b) string("?")\n\
++!     a s<Key>1: string(0x1b) string("!")

diff --git a/XTerm.ad-pl b/XTerm.ad-pl
index 9d15575d5922094c69a6be4d653a1809ce27a7f6..6e719132025af5a26029d762b4eff549345a961c 100644 (file)
--- a/XTerm.ad-pl
+++ b/XTerm.ad-pl
@@ -1,16 +1,3 @@
-! $autor: Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-! $Ver:   0.03
-! - 09.04.98
-!   Pierwsza w miarê kompletna wersja
-! - 04.02.99
-!   Poprawione dzia³anie klawiszy Home, End
-! - 28.10.2001
-!   Poprawione BackSpace (^H zamiast \177)
-! - 16.11.2002 (GoTaR <gotar@priv0.onet.pl>)
-!   Poprawione b³êdy, dodane meta-? i meta-!
-! - 6.09.2003  (GoTaR <gotar@priv0.onet.pl>)
-!   Usuniête duplikaty, dodane meta-H
-
 NXTerm.JoinSession:                    False
 *SimpleMenu*BackingStore:              NotUseful
 *SimpleMenu*menuLabel.font:            -misc-*-*-*-*-*-15-*-*-*-*-*-*-2
@@ -135,7 +122,7 @@ NXTerm.JoinSession:                 False
 *tek4014*fontSmall:                    6x10
 
 ! This file causes when loaded using xrdb correct behaviour of xterm
-! is you are using enclosed xterm.tcap and xterm.ti.
+! if you are using enclosed xterm.tcap and xterm.ti.
 ! Some keys would never normally work if they weren't here (like Alt
 ! something), some key definitions differ from one termcap/terminfo
 ! to the other. You may delete any line if you find out that mc
@@ -180,34 +167,54 @@ NXTerm.JoinSession:                       False
        <Key>KP_Equal: string(=)\n\
        <Key>KP_Multiply: string(*)\n\
        <Key>KP_Subtract: string(-)\n\
+       Shift<Key>KP_Home: scroll-back(100,page)\n\
+       Shift<Key>KP_End: scroll-forw(100,page)\n\
+       <Key>KP_Home: string(0x1b) string("[1~")\n\
+       <Key>KP_End: string(0x1b) string("[4~")\n\
        Shift<Key>Prior:scroll-back(1,page)\n\
        Shift<Key>Next:scroll-forw(1,page)\n\
        <Key>F16: start-extend() select-end(PRIMARY, CUT_BUFFER0, CLIPBOARD)\n\
        <Key>F18: insert-selection(PRIMARY, CLIPBOARD)\n\
        <Key>F27: scroll-back(100,page)\n\
        <Key>R13: scroll-forw(100,page)\n\
-       <Key>KP_Home: string(0x1b) string("[1~")\n\
-       <Key>KP_End: string(0x1b) string("[4~")\n\
+       Ctrl<Key>Home: string(0x1b) string("[1;5H")\n\
+       Shift<Key>Home: string(0x1b) string("[1;2H")\n\
        ~Meta<Key>Home: string(0x1b) string("[1~")\n\
        Meta<Key>Home: string(0x1b) string(0x1b) string("[1~")\n\
+       Ctrl<Key>End: string(0x1b) string("[1;5F")\n\
+       Shift<Key>End: string(0x1b) string("[1;2F")\n\
        ~Meta<Key>End: string(0x1b) string("[4~")\n\
        Meta<Key>End: string(0x1b) string(0x1b) string("[4~")\n\
+       Ctrl<Key>Insert: string(0x1b) string("[2;5~")\n\
+       Shift<Key>Insert: string(0x1b) string("[2;2~")\n\
        ~Meta<Key>Insert: string(0x1b) string("[2~")\n\
        Meta<Key>Insert: string(0x1b) string(0x1b) string("[2~")\n\
+       Ctrl<Key>Delete: string(0x1b) string("[3;5~")\n\
+       Shift<Key>Delete: string(0x1b) string("[3;2~")\n\
        ~Meta<Key>Delete: string(0x1b) string("[3~")\n\
        Meta<Key>Delete: string(0x1b) string(0x1b) string("[3~")\n\
+       Ctrl<Key>Page_Up: string(0x1b) string("[5;5~")\n\
        ~Meta<Key>Page_Up: string(0x1b) string("[5~")\n\
        Meta<Key>Page_Up: string(0x1b) string(0x1b) string("[5~")\n\
+       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(0x1b) string(0x08)\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\
+       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\
+       Ctrl<Key>Left: string(0x1b) string("[1;5D")\n\
+       Shift<Key>Left: string(0x1b) string("O2D")\n\
        ~Meta<Key>Left: string(0x1b) string("OD")\n\
        Meta<Key>Left: string(0x1b) string(0x1b) string("OD")\n\
+       Ctrl<Key>Right: string(0x1b) string("[1;5C")\n\
+       Shift<Key>Right: string(0x1b) string("O2C")\n\
        ~Meta<Key>Right: string(0x1b) string("OC")\n\
        Meta<Key>Right: string(0x1b) string(0x1b) string("OC")\n\
        ~Meta<Key>Return: string(0x0d)\n\
@@ -234,10 +241,6 @@ NXTerm.JoinSession:                        False
        <Key>F18: string(0x1b) string("[32~")\n\
        <Key>F19: string(0x1b) string("[33~")\n\
        <Key>F20: string(0x1b) string("[34~")\n\
-       Shift<Key>Home: scroll-back(100,page)\n\
-       Shift<Key>End: scroll-forw(100,page)\n\
-       Shift<Key>KP_Home: scroll-back(100,page)\n\
-       Shift<Key>KP_End: scroll-forw(100,page)\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\
@@ -277,6 +280,6 @@ NXTerm.JoinSession:                 False
        a<Key>w: string(0x1b) string("w")\n\
        a<Key>x: string(0x1b) string("x")\n\
        a<Key>y: string(0x1b) string("y")\n\
-       a<Key>z: string(0x1b) string("z")\n\
-       a s<Key>/: string(0x1b) string("?")\n\
-       a s<Key>1: string(0x1b) string("!")
+       a<Key>z: string(0x1b) string("z")
+!      a s<Key>/: string(0x1b) string("?")\n\
+!      a s<Key>1: string(0x1b) string("!")