test/checkkeys.c
changeset 2303 d87417504c75
parent 2300 c97ad1abe05b
child 2305 fbe8ff44c519
     1.1 --- a/test/checkkeys.c	Mon Feb 04 17:25:33 2008 +0000
     1.2 +++ b/test/checkkeys.c	Tue Feb 05 07:19:23 2008 +0000
     1.3 @@ -40,10 +40,10 @@
     1.4          printf(" LALT");
     1.5      if (mod & KMOD_RALT)
     1.6          printf(" RALT");
     1.7 -    if (mod & KMOD_LMETA)
     1.8 -        printf(" LMETA");
     1.9 -    if (mod & KMOD_RMETA)
    1.10 -        printf(" RMETA");
    1.11 +    if (mod & KMOD_LGUI)
    1.12 +        printf(" LGUI");
    1.13 +    if (mod & KMOD_RGUI)
    1.14 +        printf(" RGUI");
    1.15      if (mod & KMOD_NUM)
    1.16          printf(" NUM");
    1.17      if (mod & KMOD_CAPS)
    1.18 @@ -57,14 +57,13 @@
    1.19  {
    1.20      /* Print the keycode, name and state */
    1.21      if (sym->sym) {
    1.22 -        printf("Key %s:  physical 0x%08X = %s, layout 0x%08X = %s ",
    1.23 +        printf("Key %s:  scancode 0x%04X = %s, keycode 0x%08X = %s ",
    1.24                 pressed ? "pressed " : "released",
    1.25 -               sym->sym,
    1.26 -               SDL_GetKeyName(sym->sym),
    1.27 -               SDL_GetLayoutKey(sym->sym),
    1.28 -               SDL_GetKeyName(SDL_GetLayoutKey(sym->sym)));
    1.29 +               sym->scancode,
    1.30 +               SDL_GetScancodeName(sym->scancode),
    1.31 +               sym->sym, SDL_GetKeyName(sym->sym));
    1.32      } else {
    1.33 -        printf("Unknown Key (scancode = 0x%08X) %s ",
    1.34 +        printf("Unknown Key (scancode = 0x%04X) %s ",
    1.35                 sym->scancode, pressed ? "pressed" : "released");
    1.36      }
    1.37