Author: branden
Date: 2004-06-28 00:35:03 -0500 (Mon, 28 Jun 2004)
New Revision: 1586
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff
trunk/debian/patches/066_XKB_recognize_keypad_period_on_ABNT2_keyboards.diff
Log:
Grab from XFree86 CVS (2003-06-11) support for the keypad equal key on
Macintosh keyboards. Resync patch #066.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-06-28 05:22:47 UTC (rev 1585)
+++ trunk/debian/CHANGESETS 2004-06-28 05:35:03 UTC (rev 1586)
@@ -83,4 +83,8 @@
package to note API change.
1584, 1585
+Grab from XFree86 CVS (2003-06-11) support for the keypad equal key on
+Macintosh keyboards. Resync patch #066.
+ 1586
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-06-28 05:22:47 UTC (rev 1585)
+++ trunk/debian/changelog 2004-06-28 05:35:03 UTC (rev 1586)
@@ -50,6 +50,9 @@
pending merges). Resync patch #802. Add NEWS file to xlibs-static-pic
package to note API change.
+ * Grab from XFree86 CVS (2003-06-11) support for the keypad equal key on
+ Macintosh keyboards. Resync patch #066.
+
Changes by Fabio Massimo Di Nitto:
* Update French debconf template translations (thanks, Christian Perrier).
@@ -58,7 +61,7 @@
* Update Brazilian Portuguese debconf template translations (thanks, Andre
Luis Lopes). (Closes: #255963)
- -- Branden Robinson <[EMAIL PROTECTED]> Sun, 27 Jun 2004 23:51:00 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Mon, 28 Jun 2004 00:32:09 -0500
xfree86 (4.3.0.dfsg.1-5) unstable; urgency=low
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-06-28 05:22:47 UTC
(rev 1585)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-06-28 05:35:03 UTC
(rev 1586)
@@ -42,6 +42,16 @@
Typo noticed by Joe Moss
[Marc Aurele La France]
+xc/programs/Xserver/hw/xfree86/common/xf86Events.c @ 3.150
+xc/programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c @ 1.2
+ 207. Add support for the Mac's KP_Equal key (untested) (David Dawes).
+ [The remainder of this functionality is in
+ 000_stolen_from_HEAD_xkb_data.]
+
+xc/programs/Xserver/hw/xfree86/common/xf86Events.c @ 3.151
+ Fix #if/#else for the recent KP_Equal changes.
+ [David Dawes]
+
xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c @ 1.51
981. Disable cuase of SEGV's in rendition driver (Marc La France).
@@ -400,13 +410,13 @@
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v
retrieving revision 3.146
-retrieving revision 3.149
-diff -u -r3.146 -r3.149
+retrieving revision 3.151
+diff -u -r3.146 -r3.151
--- xc/programs/Xserver/hw/xfree86/common/xf86Events.c 20 Feb 2003 04:20:52
-0000 3.146
-+++ xc/programs/Xserver/hw/xfree86/common/xf86Events.c 3 Apr 2003 16:20:23
-0000 3.149
++++ xc/programs/Xserver/hw/xfree86/common/xf86Events.c 11 Jun 2003 16:06:27
-0000 3.151
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.146
2003/02/20 04:20:52 dawes Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.149
2003/04/03 16:20:23 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.151
2003/06/11 16:06:27 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
@@ -461,9 +471,65 @@
default:
break;
}
-@@ -535,6 +563,17 @@
+@@ -412,25 +440,6 @@
+ goto special;
+ #endif /* __sparc__ */
+
+-#if defined (i386) && defined (SVR4)
+- /*
+- * PANIX returns DICOP standards based keycodes in using 106jp
+- * keyboard. We need to remap some keys.
+- */
+- if(xf86Info.panix106 == TRUE){
+- switch (scanCode) {
+- case 0x56: scanCode = KEY_BSlash2; break; /* Backslash */
+- case 0x5A: scanCode = KEY_NFER; break; /* No Kanji Transfer*/
+- case 0x5B: scanCode = KEY_XFER; break; /* Kanji Tranfer */
+- case 0x5C: scanCode = KEY_Yen; break; /* Yen curs pgup */
+- case 0x6B: scanCode = KEY_Left; break; /* Cur Left */
+- case 0x6F: scanCode = KEY_PgUp; break; /* Cur PageUp */
+- case 0x72: scanCode = KEY_AltLang; break; /* AltLang(right) */
+- case 0x73: scanCode = KEY_RCtrl; break; /* not needed */
+- }
+- }
+-#endif /* i386 && SVR4 */
+-
+ #ifdef __linux__
+ if (xf86Info.kbdCustomKeycodes) {
+ specialkey = SpecialServerMap[scanCode];
+@@ -461,6 +470,29 @@
+ break;
+ #endif
}
++#if defined (i386) && defined (SVR4)
++ /*
++ * PANIX returns DICOP standards based keycodes in using 106jp
++ * keyboard. We need to remap some keys.
++ */
++ if(xf86Info.panix106 == TRUE){
++ switch (scanCode) {
++ case 0x56: scanCode = KEY_BSlash2; break; /* Backslash */
++ case 0x5A: scanCode = KEY_NFER; break; /* No Kanji Transfer*/
++ case 0x5B: scanCode = KEY_XFER; break; /* Kanji Tranfer */
++ case 0x5C: scanCode = KEY_Yen; break; /* Yen curs pgup */
++ case 0x6B: scanCode = KEY_Left; break; /* Cur Left */
++ case 0x6F: scanCode = KEY_PgUp; break; /* Cur PageUp */
++ case 0x72: scanCode = KEY_AltLang; break; /*
AltLang(right) */
++ case 0x73: scanCode = KEY_RCtrl; break; /* not needed */
++ }
++ } else
++#endif /* i386 && SVR4 */
++ {
++ switch (scanCode) {
++ case 0x5c: scanCode = KEY_KP_Equal; break; /* Keypad Equal */
++ }
++ }
+ }
+ else if (
+@@ -535,6 +567,17 @@
+ }
+
/*
+ * PC keyboards generate separate key codes for
+ * Alt+Print and Control+Pause but in the X keyboard model
@@ -479,7 +545,7 @@
* and now get some special keysequences
*/
-@@ -829,17 +868,6 @@
+@@ -829,17 +872,6 @@
#endif
/*
@@ -5217,3 +5283,27 @@
}
#endif
return 0;
+Index: xc/programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- xc/programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c 11 Oct
2002 01:40:37 -0000 1.1
++++ xc/programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c 9 Jun
2003 19:59:46 -0000 1.2
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c,v
1.1 2002/10/11 01:40:37 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c,v
1.2 2003/06/09 19:59:46 dawes Exp $ */
+
+ /*
+ * Copyright (c) 2002 by The XFree86 Project, Inc.
+@@ -21,6 +21,9 @@
+ case KEY_Prefix1:
+ pKbd->scanPrefix = *scanCode; /* special prefixes */
+ return TRUE;
++ case 0x5c:
++ *scanCode = KEY_KP_Equal;
++ break;
+ }
+ break;
+ case KEY_Prefix0:
Modified: trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-06-28
05:22:47 UTC (rev 1585)
+++ trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-06-28
05:35:03 UTC (rev 1586)
@@ -155,6 +155,12 @@
- some cosmetic changes.
[Ivan Pascal]
+xc/programs/xkbcomp/keycodes/xfree86 @ 3.21
+xc/programs/xkbcomp/symbols/pc/pc @ 1.9
+xc/programs/xkbcomp/symbols/us @ 3.13
+ 207. Add support for the Mac's KP_Equal key (untested) (David Dawes).
+ [The remainder of this functionality is in 000_stolen_from_HEAD.]
+
xc/programs/xkbcomp/rules/xfree86.lst @ 3.72
xc/programs/xkbcomp/rules/xfree86.xml @ 1.14
xc/programs/xkbcomp/symbols/inet @ 1.33 [PARTIAL]
@@ -1056,20 +1062,28 @@
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/keycodes/xfree86,v
retrieving revision 3.18
-retrieving revision 3.20
-diff -u -r3.18 -r3.20
+retrieving revision 3.21
+diff -u -r3.18 -r3.21
--- xc/programs/xkbcomp/keycodes/xfree86 15 Oct 2002 02:11:38 -0000
3.18
-+++ xc/programs/xkbcomp/keycodes/xfree86 15 May 2003 13:31:58 -0000
3.20
++++ xc/programs/xkbcomp/keycodes/xfree86 9 Jun 2003 19:59:46 -0000
3.21
@@ -3,7 +3,7 @@
-// $XFree86: xc/programs/xkbcomp/keycodes/xfree86,v 3.18 2002/10/15 02:11:38
dawes Exp $
-+// $XFree86: xc/programs/xkbcomp/keycodes/xfree86,v 3.20 2003/05/15 13:31:58
pascal Exp $
++// $XFree86: xc/programs/xkbcomp/keycodes/xfree86,v 3.21 2003/06/09 19:59:46
dawes Exp $
// "standard" XFree86 codes
// It seems that the "default" must be the first entry in the file.
-@@ -164,11 +164,11 @@
+@@ -138,6 +138,7 @@
+
+ <KP0> = 90;
+ <KPDL> = 91;
++ <KPEQ> = 126;
+
+ <FK13> = 118;
+ <FK14> = 119;
+@@ -164,11 +165,11 @@
// The entries commented out are never generated because the raw codes
// in those positions are already used for well-defined keys.
@@ -1084,7 +1098,7 @@
<I06> = 134;
<I07> = 135;
<I08> = 136;
-@@ -294,13 +294,13 @@
+@@ -294,13 +295,13 @@
// Other codes never generated. The XFree86 ddx never generates
// these codes.
@@ -1099,7 +1113,7 @@
+ <MDSW> = 93; // <U5D>
+ <LVL3> = 124; // <U7C>
+ <ALT> = 125; // <U7D>
-+ <META> = 126; // <U7E>
++ <META> = 156; // <I1C>
+ <SUPR> = 127; // <U7F>
+ <HYPR> = 128; // <U80>
@@ -2350,6 +2364,31 @@
key <AB10> { [ slash, question ],
[ slash, question ] };
};
+Index: xc/programs/xkbcomp/symbols/us
+===================================================================
+RCS file: /cvs/xc/programs/xkbcomp/symbols/us,v
+retrieving revision 3.12
+retrieving revision 3.13
+diff -u -r3.12 -r3.13
+--- xc/programs/xkbcomp/symbols/us 20 Nov 2002 04:49:03 -0000 3.12
++++ xc/programs/xkbcomp/symbols/us 9 Jun 2003 19:59:46 -0000 3.13
+@@ -6,7 +6,7 @@
+ // uses the punctuation keys configurations common on PC
+ // keyboards (e.g. key <ABO9> is { [ period greater ] })
+
+-// $XFree86: xc/programs/xkbcomp/symbols/us,v 3.12 2002/11/20 04:49:03 dawes
Exp $
++// $XFree86: xc/programs/xkbcomp/symbols/us,v 3.13 2003/06/09 19:59:46 dawes
Exp $
+
+ partial hidden alphanumeric_keys modifier_keys
+ xkb_symbols "basic" {
+@@ -160,6 +160,7 @@
+ key <KP2> { [ KP_Down, KP_2 ] };
+ key <KP3> { [ KP_Next, KP_3 ] };
+ key <KPEN> { [ KP_Enter ] };
++ key <KPEQ> { [ KP_Equal ] };
+
+ key <KP0> { [ KP_Insert, KP_0 ] };
+ key <KPDL> { [ KP_Delete, KP_Decimal ] };
Index: xc/programs/xkbcomp/symbols/us_intl
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/us_intl,v
@@ -3514,15 +3553,15 @@
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/pc/pc,v
retrieving revision 1.6
-retrieving revision 1.8
-diff -u -r1.6 -r1.8
+retrieving revision 1.9
+diff -u -r1.6 -r1.9
--- xc/programs/xkbcomp/symbols/pc/pc 11 Feb 2003 02:51:11 -0000 1.6
-+++ xc/programs/xkbcomp/symbols/pc/pc 15 May 2003 13:32:00 -0000 1.8
++++ xc/programs/xkbcomp/symbols/pc/pc 9 Jun 2003 19:59:46 -0000 1.9
@@ -1,6 +1,6 @@
//
-// $XFree86: xc/programs/xkbcomp/symbols/pc/pc,v 1.6 2003/02/11 02:51:11
dawes Exp $
-+// $XFree86: xc/programs/xkbcomp/symbols/pc/pc,v 1.8 2003/05/15 13:32:00
pascal Exp $
++// $XFree86: xc/programs/xkbcomp/symbols/pc/pc,v 1.9 2003/06/09 19:59:46
dawes Exp $
partial hidden alphanumeric_keys modifier_keys
xkb_symbols "basic" {
@@ -3539,7 +3578,13 @@
key <END> { [ End ] };
key <PGDN> { [ Next ] };
-@@ -170,13 +170,28 @@
+@@ -165,18 +165,34 @@
+ key <KP2> { [ KP_Down, KP_2 ] };
+ key <KP3> { [ KP_Next, KP_3 ] };
+ key <KPEN> { [ KP_Enter ] };
++ key <KPEQ> { [ KP_Equal ] };
+
+ key <KP0> { [ KP_Insert, KP_0 ] };
key <KPDL> { [ KP_Delete, KP_Decimal ] };
// End "Keypad" section
@@ -3570,7 +3615,7 @@
};
// definition for the PC-AT type 101 key keyboard
-@@ -185,15 +200,12 @@
+@@ -185,15 +201,12 @@
key <LALT> { [ Alt_L, Meta_L ] };
key <RALT> { [ Alt_R, Meta_R ] };
@@ -3587,7 +3632,7 @@
};
// definition for the extra keys on 104-key "Windows95" keyboards
-@@ -206,15 +218,44 @@
+@@ -206,15 +219,44 @@
key <RWIN> { [ Super_R ] };
key <MENU> { [ Menu ] };
Modified:
trunk/debian/patches/066_XKB_recognize_keypad_period_on_ABNT2_keyboards.diff
===================================================================
---
trunk/debian/patches/066_XKB_recognize_keypad_period_on_ABNT2_keyboards.diff
2004-06-28 05:22:47 UTC (rev 1585)
+++
trunk/debian/patches/066_XKB_recognize_keypad_period_on_ABNT2_keyboards.diff
2004-06-28 05:35:03 UTC (rev 1586)
@@ -10,9 +10,9 @@
Not submitted to XFree86.
---- xc/programs/xkbcomp/keycodes/xfree86~ 2004-02-19 16:49:11.000000000
-0500
-+++ xc/programs/xkbcomp/keycodes/xfree86 2004-02-19 16:49:51.000000000
-0500
-@@ -354,6 +354,7 @@
+--- xc/programs/xkbcomp/keycodes/xfree86~ 2004-06-28 00:14:22.000000000
-0500
++++ xc/programs/xkbcomp/keycodes/xfree86 2004-06-28 00:14:29.000000000
-0500
+@@ -355,6 +355,7 @@
include "xfree86(basic)"
<BKSL> = 94;
<AC12> = 51;
