From bd264ac22b26222e12766e9e5ecc7a1bad96ae3e Mon Sep 17 00:00:00 2001
From: Tomasz Pala <gotar@pld-linux.org>
Date: Fri, 25 Nov 2005 15:58:46 +0000
Subject: [PATCH] - don't override arrows - they differ in application mode, -
 updated shift/meta arrows sequences from xterm 3.x to xterm 4.x

Changed files:
    X11-XTerm.ad.patch -> 1.7
    XTerm.ad-pl -> 1.22
---
 X11-XTerm.ad.patch | 22 +++++++++-------------
 XTerm.ad-pl        | 20 ++++++++------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/X11-XTerm.ad.patch b/X11-XTerm.ad.patch
index a832bf4..02967f0 100644
--- a/X11-XTerm.ad.patch
+++ b/X11-XTerm.ad.patch
@@ -13,7 +13,7 @@
  !*VT100*colorBDMode: 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,172 @@
+@@ -110,3 +110,168 @@
  *tek4014*font2: 8x13
  *tek4014*font3: 6x13
  *tek4014*fontSmall: 6x10
@@ -94,26 +94,22 @@
 +	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\
diff --git a/XTerm.ad-pl b/XTerm.ad-pl
index 1c7cbf0..12272ec 100644
--- a/XTerm.ad-pl
+++ b/XTerm.ad-pl
@@ -197,26 +197,22 @@ NXTerm.JoinSession:			False
 	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\
-- 
2.44.0