Mercurial > sdl-ios-xcode

diff include/SDL_keyboard.h @ 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 047245361002
children d87417504c75
line wrap: on
line diff
--- a/include/SDL_keyboard.h	Sat Aug 18 05:39:09 2007 +0000
+++ b/include/SDL_keyboard.h	Sun Aug 19 14:52:52 2007 +0000
@@ -50,7 +50,7 @@
 {
     Uint8 scancode;             /**< keyboard specific scancode */
     Uint8 padding[3];           /**< alignment padding */
-    Uint16 sym;                 /**< SDL virtual keysym */
+    SDLKey sym;                 /**< SDL virtual key code - see ::SDLKey for details */
     Uint16 mod;                 /**< current key modifiers */
     Uint32 unicode;             /**< OBSOLETE, use SDL_TextInputEvent instead */
 } SDL_keysym;
@@ -97,11 +97,13 @@
  *
  * \brief Get a snapshot of the current state of the selected keyboard.
  *
- * \return An array of keystates, indexed by the SDLK_* syms.
+ * \param numkeys if non-NULL, receives the length of the returned array.
+ *
+ * \return An array of key states. Indexes into this array are obtained by using the SDLK_INDEX() macro on the \link ::SDLPhysicalKey SDLK_* \endlink syms.
  *
  * Example:
  * 	Uint8 *keystate = SDL_GetKeyState(NULL);
- *	if ( keystate[SDLK_RETURN] ) ... <RETURN> is pressed.
+ *	if ( keystate[SDLK_INDEX(SDLK_RETURN)] ) ... <RETURN> is pressed.
  */
 extern DECLSPEC Uint8 *SDLCALL SDL_GetKeyState(int *numkeys);
 
@@ -122,11 +124,32 @@
 extern DECLSPEC void SDLCALL SDL_SetModState(SDLMod modstate);
 
 /**
- * \fn const char *SDL_GetKeyName(SDLKey key)
+ * \fn SDLKey SDL_GetLayoutKey(SDLKey physicalKey)
  * 
- * \brief Get the name of an SDL virtual keysym
+ * \brief Get the layout key code corresponding to the given physical key code according to the current keyboard layout.
+ *
+ * See ::SDLKey for details.
+ *
+ * If \a physicalKey is not a physical key code, it is returned unchanged.
+ *
+ * \sa SDL_GetKeyName()
  */
-extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDLKey key);
+extern DECLSPEC SDLKey SDLCALL SDL_GetLayoutKey(SDLKey physicalKey);
+
+/**
+ * \fn const char *SDL_GetKeyName(SDLKey layoutKey)
+ * 
+ * \brief Get a human-readable name for a key.
+ *
+ * \param layoutKey An SDL layout key code.
+ *
+ * If what you have is a physical key code, e.g. from the \link SDL_keysym::sym key.keysym.sym \endlink field of the SDL_Event structure, convert it to a layout key code using SDL_GetLayoutKey() first. Doing this ensures that the returned name matches what users see on their keyboards. Calling this function directly on a physical key code (that is not also a layout key code) is possible, but is not recommended except for debugging purposes. The name returned in that case is the name of the \link ::SDLPhysicalKey SDLK_* \endlink constant and is not suitable for display to users.
+ *
+ * \return A pointer to a UTF-8 string that stays valid at least until the next call to this function. If you need it around any longer, you must copy it. Always non-NULL.
+ *
+ * \sa SDLKey
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDLKey layoutKey);
 
 
 /* Ends C function definitions when using C++ */