[AD] Fix keyboard tables problem (3/n)

[ Thread Index | Date Index | More lists.liballeg.org/allegro-developers Archives ]


This is a stripped-down version of Elias' two patches to adjust the keyconf 
and xkeymap utilities, as well as the necessary correction to exkeys.

Applied to mainline.


Elias, do you think the other parts of your patches are still needed?

-- 
Eric Botcazou
Index: examples/exkeys.c
===================================================================
RCS file: /cvsroot/alleg/allegro/examples/exkeys.c,v
retrieving revision 1.11
diff -u -r1.11 exkeys.c
--- examples/exkeys.c	31 May 2003 19:38:23 -0000	1.11
+++ examples/exkeys.c	29 Oct 2003 10:26:51 -0000
@@ -40,11 +40,11 @@
    "KEY_PRTSCR",     "KEY_PAUSE",      "KEY_ABNT_C1",    "KEY_YEN",
    "KEY_KANA",       "KEY_CONVERT",    "KEY_NOCONVERT",  "KEY_AT",
    "KEY_CIRCUMFLEX", "KEY_COLON2",     "KEY_KANJI",
+   "KEY_EQUALS_PAD", "KEY_BACKQUOTE",  "KEY_SEMICOLON",  "KEY_COMMAND",
    "KEY_LSHIFT",     "KEY_RSHIFT",     "KEY_LCONTROL",   "KEY_RCONTROL",
    "KEY_ALT",        "KEY_ALTGR",      "KEY_LWIN",       "KEY_RWIN",
    "KEY_MENU",       "KEY_SCRLOCK",    "KEY_NUMLOCK",    "KEY_CAPSLOCK",
-   "KEY_EQUALS_PAD", "KEY_BACKQUOTE",  "KEY_SEMICOLON",  "KEY_COMMAND",
-   "(none)",         "KEY_MAX"
+   "KEY_MAX"
 };
 
 
Index: setup/keyconf.c
===================================================================
RCS file: /cvsroot/alleg/allegro/setup/keyconf.c,v
retrieving revision 1.20
diff -u -r1.20 keyconf.c
--- setup/keyconf.c	31 May 2003 19:38:24 -0000	1.20
+++ setup/keyconf.c	29 Oct 2003 10:26:57 -0000
@@ -53,6 +53,7 @@
    "KEY_PRTSCR",     "KEY_PAUSE",      "KEY_ABNT_C1",    "KEY_YEN",
    "KEY_KANA",       "KEY_CONVERT",    "KEY_NOCONVERT",  "KEY_AT",
    "KEY_CIRCUMFLEX", "KEY_COLON2",     "KEY_KANJI",
+   "KEY_EQUALS_PAD", "KEY_BACKQUOTE",  "KEY_SEMICOLON",  "KEY_COMMAND",
    "KEY_LSHIFT",     "KEY_RSHIFT",     "KEY_LCONTROL",   "KEY_RCONTROL",
    "KEY_ALT",        "KEY_ALTGR",      "KEY_LWIN",       "KEY_RWIN",
    "KEY_MENU",       "KEY_SCRLOCK",    "KEY_NUMLOCK",    "KEY_CAPSLOCK",
Index: tools/x11/xkeymap.c
===================================================================
RCS file: /cvsroot/alleg/allegro/tools/x11/xkeymap.c,v
retrieving revision 1.2
diff -u -r1.2 xkeymap.c
--- tools/x11/xkeymap.c	10 Mar 2003 08:33:56 -0000	1.2
+++ tools/x11/xkeymap.c	29 Oct 2003 10:26:57 -0000
@@ -135,6 +135,10 @@
    {"KEY_CIRCUMFLEX", 0x10 | 0x80},
    {"KEY_COLON2", 0x12 | 0x80},
    {"KEY_KANJI", 0x14 | 0x80},
+   {"KEY_EQUALS_PAD", 0},
+   {"KEY_BACKQUOTE", 0},
+   {"KEY_SEMICOLON", 0},
+   {"KEY_COMMAND", 0},
    {"KEY_LSHIFT", 0x2A},
    {"KEY_RSHIFT", 0x36},
    {"KEY_LCONTROL", 0x1D},


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/