Mercurial > sdl-ios-xcode

diff test/common.c @ 2268:4baee598306d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Date: Thu, 05 Jul 2007 14:02:33 -0700 From: Sam Lantinga Subject: SDL 1.3 keyboard plan After lots of discussion with Christian, this is what we came up with: > So, to sum up... > SDLK_* become the physical keys, starting at > (1<<21) > We create a macro SDLK_INDEX(X) > We have two functions SDL_GetLayoutKey(SDLKey) and SDL_GetKeyName() > SDL_GetLayoutKey maps to UCS4 for printable characters, and SDLK* for non-printable characters > and does so based on the OS's current keyboard layout > SDL_GetKeyName() handles both SDLK_* and UCS4, converting UCS4 to UTF-8 and converting SDLK_* into our names, which are UTF-8 for printable characters. > WASD folks use SDLK_*, and 'I' folks use SDL_GetLayoutKey(SDLK_*) Here is the patch he came up with, and his e-mail about it: Date: Fri, 17 Aug 2007 19:50:28 +0200 From: Christian Walther Subject: Re: SDL 1.3 keyboard plan > Sounds great, go ahead and send me a patch. Here goes! Thanks for having a look. Don't hesitate to comment if anything does not conform to your ideas. One caveat: Committing this now may break compilability of some video drivers - specifically, if they use any of the SDLK_* codes that were obsoleted and moved into SDL_compat.h. I only tried Cocoa (which did break, but is already fixed) and X11 (which didn't, but then its key handling is #iffed out). If that's a problem, it may need to go into a branch. -Christian
author Sam Lantinga <slouken@libsdl.org>
date Sun, 19 Aug 2007 14:52:52 +0000
parents b292fa4941c6
children 1a8bab15a45d
line wrap: on
line diff
--- a/test/common.c	Sat Aug 18 05:39:09 2007 +0000
+++ b/test/common.c	Sun Aug 19 14:52:52 2007 +0000
@@ -803,14 +803,20 @@
         }
         break;
     case SDL_KEYDOWN:
-        fprintf(stderr, "Keyboard %d: key %s pressed in window %d",
-                event->key.which, SDL_GetKeyName(event->key.keysym.sym),
-                event->key.windowID);
+        fprintf(stderr,
+                "Keyboard %d: key pressed  in window %d: physical 0x%08X = %s, layout 0x%08X = %s",
+                event->key.which, event->key.windowID, event->key.keysym.sym,
+                SDL_GetKeyName(event->key.keysym.sym),
+                SDL_GetLayoutKey(event->key.keysym.sym),
+                SDL_GetKeyName(SDL_GetLayoutKey(event->key.keysym.sym)));
         break;
     case SDL_KEYUP:
-        fprintf(stderr, "Keyboard %d: key %s released in window %d",
-                event->key.which, SDL_GetKeyName(event->key.keysym.sym),
-                event->key.windowID);
+        fprintf(stderr,
+                "Keyboard %d: key released in window %d: physical 0x%08X = %s, layout 0x%08X = %s",
+                event->key.which, event->key.windowID, event->key.keysym.sym,
+                SDL_GetKeyName(event->key.keysym.sym),
+                SDL_GetLayoutKey(event->key.keysym.sym),
+                SDL_GetKeyName(SDL_GetLayoutKey(event->key.keysym.sym)));
         break;
     case SDL_TEXTINPUT:
         fprintf(stderr, "Keyboard %d: text input \"%s\" in window %d",