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

[Elias Pschernig <elias@xxxxxxxxxx>]

On Wed, 2003-10-29 at 11:29, Eric Botcazou wrote:
> 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?

No, they were a quick hack to not crash when the key table is out of
sync - but since it shouldn't get out of sync in the first place, no
more need for it.

That is, the graphical changes to keyconf are needed if all keys should
be visible in the test screen - I reattached that part of the patch.

-- 
Elias Pschernig <elias@xxxxxxxxxx>

Index: keyconf.c
===================================================================
RCS file: /cvsroot/alleg/allegro/setup/keyconf.c,v
retrieving revision 1.21
diff -u -r1.21 keyconf.c
--- keyconf.c	29 Oct 2003 10:34:25 -0000	1.21
+++ keyconf.c	29 Oct 2003 11:28:49 -0000
@@ -773,7 +773,7 @@
    clear_to_color(screen, palette_color[8]);
 
    for (i=0; i<=KEY_MAX; i++)
-      textout_ex(screen, font, scancode_name[i], 32+(i%4)*160, 88+(i/4)*14, palette_color[255], palette_color[8]);
+      textout_ex(screen, font, scancode_name[i], 32+(i%4)*160, 60+(i/4)*14, palette_color[255], palette_color[8]);
 
    release_screen();
 
@@ -789,7 +789,7 @@
       acquire_screen();
 
       for (i=0; i<KEY_MAX; i++)
-	 textout_ex(screen, font, key[i] ? "*" : " ", 16+(i%4)*160, 88+(i/4)*14, palette_color[255], palette_color[8]);
+	 textout_ex(screen, font, key[i] ? "*" : " ", 16+(i%4)*160, 60+(i/4)*14, palette_color[255], palette_color[8]);
 
       buf[0] = 0;
 
@@ -849,7 +849,7 @@
 	 a = ureadkey(&i);
 	 if (!a)
 	    a = ' ';
-	 textprintf_ex(screen, font, 32, 48, palette_color[255], palette_color[8], "ureadkey() returns scancode 0x%02X, U+0x%04X, '%c'", i, a, a);
+	 textprintf_ex(screen, font, 32, 34, palette_color[255], palette_color[8], "ureadkey() returns scancode 0x%02X, U+0x%04X, '%c'", i, a, a);
       }
 
    } while ((!key[KEY_ESC]) && (!mouse_b));