From: Tomasz Pala <gotar@pld-linux.org>
Date: Sun, 11 Apr 2004 22:00:53 +0000 (+0000)
Subject: - don't override (meta){Home,End} - they differ in application mode!
X-Git-Tag: X11-6_7_0-0_1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=f1fa48a0ed357bf93e0f206ae88fb4afd38d49cc;p=packages%2FXFree86.git

- don't override (meta){Home,End} - they differ in application mode!
- added AltGr-{Left,Right} as meta-[bf],
- added {AltGr,Ctrl}-Tab as meta-Tab - Alt-Tab does commonly window switching.

Changed files:
    XFree86-XTerm.ad.patch -> 1.13
    XTerm.ad-pl -> 1.14
---

diff --git a/XFree86-XTerm.ad.patch b/XFree86-XTerm.ad.patch
index aa7197d..4b61c40 100644
--- a/XFree86-XTerm.ad.patch
+++ b/XFree86-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
-@@ -107,3 +107,180 @@
+@@ -110,3 +110,178 @@
  *tek4014*font2: 8x13
  *tek4014*font3: 6x13
  *tek4014*fontSmall: 6x10
@@ -66,8 +66,6 @@
 +	<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("[H")\n\
-+	<Key>KP_End: string(0x1b) string("[F")\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\
@@ -76,12 +74,8 @@
 +	<Key>R13: scroll-forw(100,page)\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("[H")\n\
-+	Meta<Key>Home: string(0x1b) string(0x1b) string("[H")\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("[F")\n\
-+	Meta<Key>End: string(0x1b) string(0x1b) string("[F")\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\
@@ -111,15 +105,19 @@
 +	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\
++	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\
 +	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\
++	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>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\
diff --git a/XTerm.ad-pl b/XTerm.ad-pl
index 9b4e2c1..145d93e 100644
--- a/XTerm.ad-pl
+++ b/XTerm.ad-pl
@@ -169,8 +169,6 @@ NXTerm.JoinSession:			False
 	<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("[H")\n\
-	<Key>KP_End: string(0x1b) string("[F")\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\
@@ -179,12 +177,8 @@ NXTerm.JoinSession:			False
 	<Key>R13: scroll-forw(100,page)\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("[H")\n\
-	Meta<Key>Home: string(0x1b) string(0x1b) string("[H")\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("[F")\n\
-	Meta<Key>End: string(0x1b) string(0x1b) string("[F")\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\
@@ -214,15 +208,19 @@ NXTerm.JoinSession:			False
 	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\
+	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\
 	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\
+	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>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\