Renamed SDL_keysym to SDL_KeySym
authorkrogoway
Mon, 24 Jan 2011 13:47:35 -0600
changeset 508125d4feb7c127
parent 5080 de59e0218aa2
child 5084 ac2c68eb1bb9
Renamed SDL_keysym to SDL_KeySym
Renamed SDL_scancode to SDL_ScanCode
Added #defines to SDL_compat.h
Xcode-iPhoneOS/Demos/src/keyboard.c
include/SDL_compat.h
include/SDL_events.h
include/SDL_keyboard.h
include/SDL_scancode.h
src/events/SDL_keyboard.c
src/events/SDL_keyboard_c.h
src/events/scancodes_darwin.h
src/events/scancodes_linux.h
src/events/scancodes_windows.h
src/events/scancodes_xfree86.h
src/video/android/SDL_androidkeyboard.c
src/video/bwindow/SDL_BWin.h
src/video/cocoa/SDL_cocoakeyboard.m
src/video/directfb/SDL_DirectFB_events.c
src/video/photon/SDL_photon.c
src/video/photon/SDL_photon_input.c
src/video/photon/SDL_photon_input.h
src/video/riscos/SDL_riscosevents.c
src/video/uikit/SDL_uikitview.m
src/video/uikit/keyinfotable.h
src/video/windows/SDL_windowskeyboard.c
src/video/windows/SDL_windowsvideo.h
src/video/x11/SDL_x11events.c
src/video/x11/SDL_x11keyboard.c
src/video/x11/SDL_x11video.h
test/checkkeys.c
test/testkeys.c
test/testwm.c
     1.1 --- a/Xcode-iPhoneOS/Demos/src/keyboard.c	Sun Jan 23 21:55:04 2011 -0800
     1.2 +++ b/Xcode-iPhoneOS/Demos/src/keyboard.c	Mon Jan 24 13:47:35 2011 -0600
     1.3 @@ -34,7 +34,7 @@
     1.4  */
     1.5  typedef struct
     1.6  {
     1.7 -    SDL_scancode scancode;      /* scancode of the key we want to map */
     1.8 +    SDL_ScanCode scancode;      /* scancode of the key we want to map */
     1.9      int allow_no_mod;           /* is the map valid if the key has no modifiers? */
    1.10      SDLMod mod;                 /* what modifiers are allowed for the mapping */
    1.11      int index;                  /* what index in the font does the scancode map to */
    1.12 @@ -103,7 +103,7 @@
    1.13  };
    1.14  
    1.15  /*
    1.16 -	This function maps an SDL_keysym to an index in the bitmap font.
    1.17 +	This function maps an SDL_KeySym to an index in the bitmap font.
    1.18  	It does so by scanning through the font mapping table one entry
    1.19  	at a time.
    1.20   
    1.21 @@ -113,7 +113,7 @@
    1.22  	If there is no entry for the key, -1 is returned
    1.23  */
    1.24  int
    1.25 -keyToIndex(SDL_keysym key)
    1.26 +keyToIndex(SDL_KeySym key)
    1.27  {
    1.28      int i, index = -1;
    1.29      for (i = 0; i < TABLE_SIZE; i++) {
    1.30 @@ -240,7 +240,7 @@
    1.31      SDL_Window *window;
    1.32      SDL_Event event;            /* last event received */
    1.33      SDLMod mod;                 /* key modifiers of last key we pushed */
    1.34 -    SDL_scancode scancode;      /* scancode of last key we pushed */
    1.35 +    SDL_ScanCode scancode;      /* scancode of last key we pushed */
    1.36  
    1.37      if (SDL_Init(SDL_INIT_VIDEO) < 0) {
    1.38          printf("Error initializing SDL: %s", SDL_GetError());
     2.1 --- a/include/SDL_compat.h	Sun Jan 23 21:55:04 2011 -0800
     2.2 +++ b/include/SDL_compat.h	Mon Jan 24 13:47:35 2011 -0600
     2.3 @@ -223,6 +223,9 @@
     2.4   */
     2.5  /*@{*/
     2.6  
     2.7 +#define SDL_keysym		SDL_KeySym
     2.8 +#define SDL_scancode	SDL_ScanCode
     2.9 +
    2.10  /** 
    2.11   *  \name Renamed keys
    2.12   *
     3.1 --- a/include/SDL_events.h	Sun Jan 23 21:55:04 2011 -0800
     3.2 +++ b/include/SDL_events.h	Mon Jan 24 13:47:35 2011 -0600
     3.3 @@ -151,7 +151,7 @@
     3.4      Uint8 repeat;       /**< Non-zero if this is a key repeat */
     3.5      Uint8 padding2;
     3.6      Uint8 padding3;
     3.7 -    SDL_keysym keysym;  /**< The key that was pressed or released */
     3.8 +    SDL_KeySym keysym;  /**< The key that was pressed or released */
     3.9  } SDL_KeyboardEvent;
    3.10  
    3.11  #define SDL_TEXTEDITINGEVENT_TEXT_SIZE (32)
     4.1 --- a/include/SDL_keyboard.h	Sun Jan 23 21:55:04 2011 -0800
     4.2 +++ b/include/SDL_keyboard.h	Mon Jan 24 13:47:35 2011 -0600
     4.3 @@ -45,13 +45,13 @@
     4.4  /**
     4.5   *  \brief The SDL keysym structure, used in key events.
     4.6   */
     4.7 -typedef struct SDL_keysym
     4.8 +typedef struct SDL_KeySym
     4.9  {
    4.10 -    SDL_scancode scancode;      /**< SDL physical key code - see ::SDL_scancode for details */
    4.11 +    SDL_ScanCode scancode;      /**< SDL physical key code - see ::SDL_ScanCode for details */
    4.12      SDLKey sym;                 /**< SDL virtual key code - see ::SDLKey for details */
    4.13      Uint16 mod;                 /**< current key modifiers */
    4.14      Uint32 unicode;             /**< \deprecated use SDL_TextInputEvent instead */
    4.15 -} SDL_keysym;
    4.16 +} SDL_KeySym;
    4.17  
    4.18  /* Function prototypes */
    4.19  
    4.20 @@ -65,7 +65,7 @@
    4.21   *  
    4.22   *  \param numkeys if non-NULL, receives the length of the returned array.
    4.23   *  
    4.24 - *  \return An array of key states. Indexes into this array are obtained by using ::SDL_scancode values.
    4.25 + *  \return An array of key states. Indexes into this array are obtained by using ::SDL_ScanCode values.
    4.26   *  
    4.27   *  \b Example:
    4.28   *  \code
    4.29 @@ -97,17 +97,17 @@
    4.30   *  
    4.31   *  \sa SDL_GetKeyName()
    4.32   */
    4.33 -extern DECLSPEC SDLKey SDLCALL SDL_GetKeyFromScancode(SDL_scancode scancode);
    4.34 +extern DECLSPEC SDLKey SDLCALL SDL_GetKeyFromScancode(SDL_ScanCode scancode);
    4.35  
    4.36  /**
    4.37   *  \brief Get the scancode corresponding to the given key code according to the
    4.38   *         current keyboard layout.
    4.39   *  
    4.40 - *  See ::SDL_scancode for details.
    4.41 + *  See ::SDL_ScanCode for details.
    4.42   *  
    4.43   *  \sa SDL_GetScancodeName()
    4.44   */
    4.45 -extern DECLSPEC SDL_scancode SDLCALL SDL_GetScancodeFromKey(SDLKey key);
    4.46 +extern DECLSPEC SDL_ScanCode SDLCALL SDL_GetScancodeFromKey(SDLKey key);
    4.47  
    4.48  /**
    4.49   *  \brief Get a human-readable name for a scancode.
    4.50 @@ -117,9 +117,9 @@
    4.51   *          copy it.  If the scancode doesn't have a name, this function returns
    4.52   *          an empty string ("").
    4.53   *
    4.54 - *  \sa SDL_scancode
    4.55 + *  \sa SDL_ScanCode
    4.56   */
    4.57 -extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_scancode
    4.58 +extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_ScanCode
    4.59                                                          scancode);
    4.60  
    4.61  /**
     5.1 --- a/include/SDL_scancode.h	Sun Jan 23 21:55:04 2011 -0800
     5.2 +++ b/include/SDL_scancode.h	Mon Jan 24 13:47:35 2011 -0600
     5.3 @@ -35,7 +35,7 @@
     5.4   *  \brief The SDL keyboard scancode representation.
     5.5   *  
     5.6   *  Values of this type are used to represent keyboard keys, among other places
     5.7 - *  in the \link SDL_keysym::scancode key.keysym.scancode \endlink field of the
     5.8 + *  in the \link SDL_KeySym::scancode key.keysym.scancode \endlink field of the
     5.9   *  SDL_Event structure.
    5.10   *  
    5.11   *  The values in this enumeration are based on the USB usage page standard:
    5.12 @@ -392,7 +392,7 @@
    5.13  
    5.14      SDL_NUM_SCANCODES = 512 /**< not a key, just marks the number of scancodes 
    5.15                                   for array bounds */
    5.16 -} SDL_scancode;
    5.17 +} SDL_ScanCode;
    5.18  
    5.19  #endif /* _SDL_scancode_h */
    5.20  
     6.1 --- a/src/events/SDL_keyboard.c	Sun Jan 23 21:55:04 2011 -0800
     6.2 +++ b/src/events/SDL_keyboard.c	Mon Jan 24 13:47:35 2011 -0600
     6.3 @@ -562,7 +562,7 @@
     6.4  SDL_ResetKeyboard(void)
     6.5  {
     6.6      SDL_Keyboard *keyboard = &SDL_keyboard;
     6.7 -    SDL_scancode scancode;
     6.8 +    SDL_ScanCode scancode;
     6.9  
    6.10      for (scancode = 0; scancode < SDL_NUM_SCANCODES; ++scancode) {
    6.11          if (keyboard->keystate[scancode] == SDL_PRESSED) {
    6.12 @@ -590,7 +590,7 @@
    6.13  }
    6.14  
    6.15  void
    6.16 -SDL_SetScancodeName(SDL_scancode scancode, const char *name)
    6.17 +SDL_SetScancodeName(SDL_ScanCode scancode, const char *name)
    6.18  {
    6.19      SDL_scancode_names[scancode] = name;
    6.20  }
    6.21 @@ -638,7 +638,7 @@
    6.22  }
    6.23  
    6.24  int
    6.25 -SDL_SendKeyboardKey(Uint8 state, SDL_scancode scancode)
    6.26 +SDL_SendKeyboardKey(Uint8 state, SDL_ScanCode scancode)
    6.27  {
    6.28      SDL_Keyboard *keyboard = &SDL_keyboard;
    6.29      int posted;
    6.30 @@ -849,18 +849,18 @@
    6.31  }
    6.32  
    6.33  SDLKey
    6.34 -SDL_GetKeyFromScancode(SDL_scancode scancode)
    6.35 +SDL_GetKeyFromScancode(SDL_ScanCode scancode)
    6.36  {
    6.37      SDL_Keyboard *keyboard = &SDL_keyboard;
    6.38  
    6.39      return keyboard->keymap[scancode];
    6.40  }
    6.41  
    6.42 -SDL_scancode
    6.43 +SDL_ScanCode
    6.44  SDL_GetScancodeFromKey(SDLKey key)
    6.45  {
    6.46      SDL_Keyboard *keyboard = &SDL_keyboard;
    6.47 -    SDL_scancode scancode;
    6.48 +    SDL_ScanCode scancode;
    6.49  
    6.50      for (scancode = SDL_SCANCODE_UNKNOWN; scancode < SDL_NUM_SCANCODES;
    6.51           ++scancode) {
    6.52 @@ -872,7 +872,7 @@
    6.53  }
    6.54  
    6.55  const char *
    6.56 -SDL_GetScancodeName(SDL_scancode scancode)
    6.57 +SDL_GetScancodeName(SDL_ScanCode scancode)
    6.58  {
    6.59      const char *name = SDL_scancode_names[scancode];
    6.60  
    6.61 @@ -890,7 +890,7 @@
    6.62  
    6.63      if (key & SDLK_SCANCODE_MASK) {
    6.64          return
    6.65 -            SDL_GetScancodeName((SDL_scancode) (key & ~SDLK_SCANCODE_MASK));
    6.66 +            SDL_GetScancodeName((SDL_ScanCode) (key & ~SDLK_SCANCODE_MASK));
    6.67      }
    6.68  
    6.69      switch (key) {
     7.1 --- a/src/events/SDL_keyboard_c.h	Sun Jan 23 21:55:04 2011 -0800
     7.2 +++ b/src/events/SDL_keyboard_c.h	Mon Jan 24 13:47:35 2011 -0600
     7.3 @@ -43,13 +43,13 @@
     7.4     name. Encoded as UTF-8. The string is not copied, thus the pointer given to
     7.5     this function must stay valid forever (or at least until the call to
     7.6     VideoQuit()). */
     7.7 -extern void SDL_SetScancodeName(SDL_scancode scancode, const char *name);
     7.8 +extern void SDL_SetScancodeName(SDL_ScanCode scancode, const char *name);
     7.9  
    7.10  /* Set the keyboard focus window */
    7.11  extern void SDL_SetKeyboardFocus(SDL_Window * window);
    7.12  
    7.13  /* Send a keyboard key event */
    7.14 -extern int SDL_SendKeyboardKey(Uint8 state, SDL_scancode scancode);
    7.15 +extern int SDL_SendKeyboardKey(Uint8 state, SDL_ScanCode scancode);
    7.16  
    7.17  /* Send keyboard text input */
    7.18  extern int SDL_SendKeyboardText(const char *text);
     8.1 --- a/src/events/scancodes_darwin.h	Sun Jan 23 21:55:04 2011 -0800
     8.2 +++ b/src/events/scancodes_darwin.h	Mon Jan 24 13:47:35 2011 -0600
     8.3 @@ -27,7 +27,7 @@
     8.4     - experimentation on various ADB and USB ISO keyboards and one ADB ANSI keyboard
     8.5  */
     8.6  /* *INDENT-OFF* */
     8.7 -static const SDL_scancode darwin_scancode_table[] = {
     8.8 +static const SDL_ScanCode darwin_scancode_table[] = {
     8.9      /*   0 */   SDL_SCANCODE_A,
    8.10      /*   1 */   SDL_SCANCODE_S,
    8.11      /*   2 */   SDL_SCANCODE_D,
     9.1 --- a/src/events/scancodes_linux.h	Sun Jan 23 21:55:04 2011 -0800
     9.2 +++ b/src/events/scancodes_linux.h	Mon Jan 24 13:47:35 2011 -0600
     9.3 @@ -26,7 +26,7 @@
     9.4     - Linux kernel source input.h
     9.5  */
     9.6  /* *INDENT-OFF* */
     9.7 -static SDL_scancode const linux_scancode_table[] = {
     9.8 +static SDL_ScanCode const linux_scancode_table[] = {
     9.9      /*  0 */    SDL_SCANCODE_UNKNOWN,
    9.10      /*  1 */    SDL_SCANCODE_ESCAPE,
    9.11      /*  2 */    SDL_SCANCODE_1,
    10.1 --- a/src/events/scancodes_windows.h	Sun Jan 23 21:55:04 2011 -0800
    10.2 +++ b/src/events/scancodes_windows.h	Mon Jan 24 13:47:35 2011 -0600
    10.3 @@ -26,7 +26,7 @@
    10.4     - msdn.microsoft.com
    10.5  */
    10.6  /* *INDENT-OFF* */
    10.7 -static const SDL_scancode windows_scancode_table[] = {
    10.8 +static const SDL_ScanCode windows_scancode_table[] = {
    10.9      /*  0, 0x00 */      SDL_SCANCODE_UNKNOWN,
   10.10      /*  1, 0x01 */      SDL_SCANCODE_UNKNOWN,
   10.11      /*  2, 0x02 */      SDL_SCANCODE_UNKNOWN,
    11.1 --- a/src/events/scancodes_xfree86.h	Sun Jan 23 21:55:04 2011 -0800
    11.2 +++ b/src/events/scancodes_xfree86.h	Mon Jan 24 13:47:35 2011 -0600
    11.3 @@ -26,7 +26,7 @@
    11.4     - atKeyNames.h from XFree86 source code
    11.5  */
    11.6  /* *INDENT-OFF* */
    11.7 -static const SDL_scancode xfree86_scancode_table[] = {
    11.8 +static const SDL_ScanCode xfree86_scancode_table[] = {
    11.9      /*  0 */    SDL_SCANCODE_UNKNOWN,
   11.10      /*  1 */    SDL_SCANCODE_ESCAPE,
   11.11      /*  2 */    SDL_SCANCODE_1,
   11.12 @@ -177,7 +177,7 @@
   11.13  };
   11.14  
   11.15  /* for wireless usb keyboard (manufacturer TRUST) without numpad. */
   11.16 -static const SDL_scancode xfree86_scancode_table2[] = {
   11.17 +static const SDL_ScanCode xfree86_scancode_table2[] = {
   11.18      /*  0 */    SDL_SCANCODE_UNKNOWN,
   11.19      /*  1 */    SDL_SCANCODE_ESCAPE,
   11.20      /*  2 */    SDL_SCANCODE_1,
    12.1 --- a/src/video/android/SDL_androidkeyboard.c	Sun Jan 23 21:55:04 2011 -0800
    12.2 +++ b/src/video/android/SDL_androidkeyboard.c	Mon Jan 24 13:47:35 2011 -0600
    12.3 @@ -37,7 +37,7 @@
    12.4      SDL_SetKeymap(0, keymap, SDL_NUM_SCANCODES);
    12.5  }
    12.6  
    12.7 -static SDL_scancode Android_Keycodes[] = {
    12.8 +static SDL_ScanCode Android_Keycodes[] = {
    12.9      SDL_SCANCODE_UNKNOWN, /* AKEYCODE_UNKNOWN */
   12.10      SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SOFT_LEFT */
   12.11      SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SOFT_RIGHT */
   12.12 @@ -151,10 +151,10 @@
   12.13      SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_MODE */
   12.14  };
   12.15  
   12.16 -static SDL_scancode
   12.17 +static SDL_ScanCode
   12.18  TranslateKeycode(int keycode)
   12.19  {
   12.20 -    SDL_scancode scancode = SDL_SCANCODE_UNKNOWN;
   12.21 +    SDL_ScanCode scancode = SDL_SCANCODE_UNKNOWN;
   12.22  
   12.23      if (keycode < SDL_arraysize(Android_Keycodes)) {
   12.24          scancode = Android_Keycodes[keycode];
    13.1 --- a/src/video/bwindow/SDL_BWin.h	Sun Jan 23 21:55:04 2011 -0800
    13.2 +++ b/src/video/bwindow/SDL_BWin.h	Mon Jan 24 13:47:35 2011 -0600
    13.3 @@ -509,7 +509,7 @@
    13.4  
    13.5                  if (msg->FindInt32("key", &key) == B_OK
    13.6                      && msg->FindInt32("modifiers", &modifiers) == B_OK) {
    13.7 -                    SDL_keysym keysym;
    13.8 +                    SDL_KeySym keysym;
    13.9                      keysym.scancode = key;
   13.10                      if ((key > 0) && (key < 128)) {
   13.11                          keysym.sym = keymap[key];
   13.12 @@ -543,7 +543,7 @@
   13.13                  int32 modifiers;
   13.14                  if (msg->FindInt32("key", &key) == B_OK
   13.15                      && msg->FindInt32("modifiers", &modifiers) == B_OK) {
   13.16 -                    SDL_keysym keysym;
   13.17 +                    SDL_KeySym keysym;
   13.18                      keysym.scancode = key;
   13.19                      if ((key > 0) && (key < 128)) {
   13.20                          keysym.sym = keymap[key];
    14.1 --- a/src/video/cocoa/SDL_cocoakeyboard.m	Sun Jan 23 21:55:04 2011 -0800
    14.2 +++ b/src/video/cocoa/SDL_cocoakeyboard.m	Mon Jan 24 13:47:35 2011 -0600
    14.3 @@ -246,7 +246,7 @@
    14.4  HandleNonDeviceModifier(unsigned int device_independent_mask,
    14.5                          unsigned int oldMods,
    14.6                          unsigned int newMods,
    14.7 -                        SDL_scancode scancode)
    14.8 +                        SDL_ScanCode scancode)
    14.9  {
   14.10      unsigned int oldMask, newMask;
   14.11      
   14.12 @@ -268,7 +268,7 @@
   14.13   */
   14.14  static void
   14.15  HandleModifierOneSide(unsigned int oldMods, unsigned int newMods,
   14.16 -                      SDL_scancode scancode, 
   14.17 +                      SDL_ScanCode scancode, 
   14.18                        unsigned int sided_device_dependent_mask)
   14.19  {
   14.20      unsigned int old_dep_mask, new_dep_mask;
   14.21 @@ -297,8 +297,8 @@
   14.22  static void
   14.23  HandleModifierSide(int device_independent_mask, 
   14.24                     unsigned int oldMods, unsigned int newMods, 
   14.25 -                   SDL_scancode left_scancode, 
   14.26 -                   SDL_scancode right_scancode,
   14.27 +                   SDL_ScanCode left_scancode, 
   14.28 +                   SDL_ScanCode right_scancode,
   14.29                     unsigned int left_device_dependent_mask, 
   14.30                     unsigned int right_device_dependent_mask)
   14.31  {
   14.32 @@ -341,8 +341,8 @@
   14.33  static void
   14.34  ReleaseModifierSide(unsigned int device_independent_mask, 
   14.35                      unsigned int oldMods, unsigned int newMods,
   14.36 -                    SDL_scancode left_scancode, 
   14.37 -                    SDL_scancode right_scancode,
   14.38 +                    SDL_ScanCode left_scancode, 
   14.39 +                    SDL_ScanCode right_scancode,
   14.40                      unsigned int left_device_dependent_mask, 
   14.41                      unsigned int right_device_dependent_mask)
   14.42  {
   14.43 @@ -409,13 +409,13 @@
   14.44                   unsigned int oldMods, unsigned int newMods)
   14.45  {
   14.46  	/* Set up arrays for the key syms for the left and right side. */
   14.47 -    const SDL_scancode left_mapping[]  = {
   14.48 +    const SDL_ScanCode left_mapping[]  = {
   14.49          SDL_SCANCODE_LSHIFT,
   14.50          SDL_SCANCODE_LCTRL,
   14.51          SDL_SCANCODE_LALT,
   14.52          SDL_SCANCODE_LGUI
   14.53      };
   14.54 -    const SDL_scancode right_mapping[] = {
   14.55 +    const SDL_ScanCode right_mapping[] = {
   14.56          SDL_SCANCODE_RSHIFT,
   14.57          SDL_SCANCODE_RCTRL,
   14.58          SDL_SCANCODE_RALT,
   14.59 @@ -489,7 +489,7 @@
   14.60  #endif
   14.61      const void *chr_data;
   14.62      int i;
   14.63 -    SDL_scancode scancode;
   14.64 +    SDL_ScanCode scancode;
   14.65      SDLKey keymap[SDL_NUM_SCANCODES];
   14.66  
   14.67      /* See if the keymap needs to be updated */
   14.68 @@ -675,7 +675,7 @@
   14.69  {
   14.70      SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
   14.71      unsigned short scancode = [event keyCode];
   14.72 -    SDL_scancode code;
   14.73 +    SDL_ScanCode code;
   14.74  #if 0
   14.75      const char *text;
   14.76  #endif
    15.1 --- a/src/video/directfb/SDL_DirectFB_events.c	Sun Jan 23 21:55:04 2011 -0800
    15.2 +++ b/src/video/directfb/SDL_DirectFB_events.c	Mon Jan 24 13:47:35 2011 -0600
    15.3 @@ -56,11 +56,11 @@
    15.4  static SDLKey oskeymap[256];
    15.5  
    15.6  
    15.7 -static SDL_keysym *DirectFB_TranslateKey(_THIS, DFBWindowEvent * evt,
    15.8 -                                         SDL_keysym * keysym);
    15.9 -static SDL_keysym *DirectFB_TranslateKeyInputEvent(_THIS, int index,
   15.10 +static SDL_KeySym *DirectFB_TranslateKey(_THIS, DFBWindowEvent * evt,
   15.11 +                                         SDL_KeySym * keysym);
   15.12 +static SDL_KeySym *DirectFB_TranslateKeyInputEvent(_THIS, int index,
   15.13                                                     DFBInputEvent * evt,
   15.14 -                                                   SDL_keysym * keysym);
   15.15 +                                                   SDL_KeySym * keysym);
   15.16  
   15.17  static void DirectFB_InitOSKeymap(_THIS, SDLKey * keypmap, int numkeys);
   15.18  static int DirectFB_TranslateButton(DFBInputDeviceButtonIdentifier button);
   15.19 @@ -168,7 +168,7 @@
   15.20                     DFBWindowEvent * evt)
   15.21  {
   15.22      SDL_DFB_DEVICEDATA(_this);
   15.23 -    SDL_keysym keysym;
   15.24 +    SDL_KeySym keysym;
   15.25      char text[5];
   15.26  
   15.27      if (evt->clazz == DFEC_WINDOW) {
   15.28 @@ -300,7 +300,7 @@
   15.29  ProcessInputEvent(_THIS, DFBInputEvent * ievt)
   15.30  {
   15.31      SDL_DFB_DEVICEDATA(_this);
   15.32 -    SDL_keysym keysym;
   15.33 +    SDL_KeySym keysym;
   15.34      int kbd_idx;
   15.35      char text[5];
   15.36  
   15.37 @@ -549,8 +549,8 @@
   15.38  
   15.39  }
   15.40  
   15.41 -static SDL_keysym *
   15.42 -DirectFB_TranslateKey(_THIS, DFBWindowEvent * evt, SDL_keysym * keysym)
   15.43 +static SDL_KeySym *
   15.44 +DirectFB_TranslateKey(_THIS, DFBWindowEvent * evt, SDL_KeySym * keysym)
   15.45  {
   15.46      SDL_DFB_DEVICEDATA(_this);
   15.47  
   15.48 @@ -577,9 +577,9 @@
   15.49      return keysym;
   15.50  }
   15.51  
   15.52 -static SDL_keysym *
   15.53 +static SDL_KeySym *
   15.54  DirectFB_TranslateKeyInputEvent(_THIS, int index, DFBInputEvent * evt,
   15.55 -                                SDL_keysym * keysym)
   15.56 +                                SDL_KeySym * keysym)
   15.57  {
   15.58      SDL_DFB_DEVICEDATA(_this);
   15.59  
   15.60 @@ -719,7 +719,7 @@
   15.61  
   15.62      while (devdata->eventbuffer->GetEvent(devdata->eventbuffer,
   15.63                                            DFB_EVENT(&evt)) == DFB_OK) {
   15.64 -        SDL_keysym keysym;
   15.65 +        SDL_KeySym keysym;
   15.66          DFBInputDeviceModifierMask mod;
   15.67  
   15.68          if (evt.clazz = DFEC_INPUT) {
    16.1 --- a/src/video/photon/SDL_photon.c	Sun Jan 23 21:55:04 2011 -0800
    16.2 +++ b/src/video/photon/SDL_photon.c	Mon Jan 24 13:47:35 2011 -0600
    16.3 @@ -2488,7 +2488,7 @@
    16.4                  case Ph_EV_KEY:
    16.5                      {
    16.6                          PhKeyEvent_t *keyevent = NULL;
    16.7 -                        SDL_scancode scancode = SDL_SCANCODE_UNKNOWN;
    16.8 +                        SDL_ScanCode scancode = SDL_SCANCODE_UNKNOWN;
    16.9                          SDL_bool pressed = SDL_FALSE;
   16.10  
   16.11                          keyevent = PhGetData(event);
    17.1 --- a/src/video/photon/SDL_photon_input.c	Sun Jan 23 21:55:04 2011 -0800
    17.2 +++ b/src/video/photon/SDL_photon_input.c	Mon Jan 24 13:47:35 2011 -0600
    17.3 @@ -460,10 +460,10 @@
    17.4      return;
    17.5  }
    17.6  
    17.7 -SDL_scancode
    17.8 +SDL_ScanCode
    17.9  photon_to_sdl_keymap(uint32_t key)
   17.10  {
   17.11 -    SDL_scancode scancode = SDL_SCANCODE_UNKNOWN;
   17.12 +    SDL_ScanCode scancode = SDL_SCANCODE_UNKNOWN;
   17.13  
   17.14      switch (key & 0x0000007F) {
   17.15      case PHOTON_SCANCODE_ESCAPE:
    18.1 --- a/src/video/photon/SDL_photon_input.h	Sun Jan 23 21:55:04 2011 -0800
    18.2 +++ b/src/video/photon/SDL_photon_input.h	Mon Jan 24 13:47:35 2011 -0600
    18.3 @@ -45,6 +45,6 @@
    18.4  #define SDL_PHOTON_MOUSE_COLOR_WHITE 0xFFFFFFFF
    18.5  #define SDL_PHOTON_MOUSE_COLOR_TRANS 0x00000000
    18.6  
    18.7 -SDL_scancode photon_to_sdl_keymap(uint32_t key);
    18.8 +SDL_ScanCode photon_to_sdl_keymap(uint32_t key);
    18.9  
   18.10  #endif /* __SDL_GF_INPUT_H__ */
    19.1 --- a/src/video/riscos/SDL_riscosevents.c	Sun Jan 23 21:55:04 2011 -0800
    19.2 +++ b/src/video/riscos/SDL_riscosevents.c	Mon Jan 24 13:47:35 2011 -0600
    19.3 @@ -69,7 +69,7 @@
    19.4  
    19.5  static char RO_pressed[ROKEYBD_ARRAYSIZE];
    19.6  
    19.7 -static SDL_keysym *TranslateKey(int intkey, SDL_keysym * keysym, int pressed);
    19.8 +static SDL_KeySym *TranslateKey(int intkey, SDL_KeySym * keysym, int pressed);
    19.9  
   19.10  void RISCOS_PollMouse(_THIS);
   19.11  void RISCOS_PollKeyboard();
   19.12 @@ -366,7 +366,7 @@
   19.13      int which_key = ROKEY_LEFT_SHIFT;
   19.14      int j;
   19.15      int min_key, max_key;
   19.16 -    SDL_keysym key;
   19.17 +    SDL_KeySym key;
   19.18  
   19.19      /* Scan the keyboard to see what is pressed */
   19.20      while (which_key <= ROKEY_LAST_KEY) {
   19.21 @@ -428,8 +428,8 @@
   19.22      }
   19.23  }
   19.24  
   19.25 -static SDL_keysym *
   19.26 -TranslateKey(int intkey, SDL_keysym * keysym, int pressed)
   19.27 +static SDL_KeySym *
   19.28 +TranslateKey(int intkey, SDL_KeySym * keysym, int pressed)
   19.29  {
   19.30      /* Set the keysym information */
   19.31      keysym->scancode = (unsigned char) intkey;
    20.1 --- a/src/video/uikit/SDL_uikitview.m	Sun Jan 23 21:55:04 2011 -0800
    20.2 +++ b/src/video/uikit/SDL_uikitview.m	Mon Jan 24 13:47:35 2011 -0600
    20.3 @@ -267,10 +267,10 @@
    20.4  			unichar c = [string characterAtIndex: i];
    20.5  			
    20.6  			Uint16 mod = 0;
    20.7 -			SDL_scancode code;
    20.8 +			SDL_ScanCode code;
    20.9  			
   20.10  			if (c < 127) {
   20.11 -				/* figure out the SDL_scancode and SDL_keymod for this unichar */
   20.12 +				/* figure out the SDL_ScanCode and SDL_keymod for this unichar */
   20.13  				code = unicharToUIKeyInfoTable[c].code;
   20.14  				mod  = unicharToUIKeyInfoTable[c].mod;
   20.15  			}
    21.1 --- a/src/video/uikit/keyinfotable.h	Sun Jan 23 21:55:04 2011 -0800
    21.2 +++ b/src/video/uikit/keyinfotable.h	Mon Jan 24 13:47:35 2011 -0600
    21.3 @@ -27,14 +27,14 @@
    21.4  
    21.5  /*
    21.6  	This file is used by the keyboard code in SDL_uikitview.m to convert between characters
    21.7 -	passed in from the iPhone's virtual keyboard, and tuples of SDL_scancodes and SDL_keymods.
    21.8 +	passed in from the iPhone's virtual keyboard, and tuples of SDL_ScanCodes and SDL_keymods.
    21.9  	For example unicharToUIKeyInfoTable['a'] would give you the scan code and keymod for lower
   21.10  	case a.
   21.11  */
   21.12  
   21.13  typedef struct
   21.14  {
   21.15 -    SDL_scancode code;
   21.16 +    SDL_ScanCode code;
   21.17      Uint16 mod;
   21.18  } UIKitKeyInfo;
   21.19  
    22.1 --- a/src/video/windows/SDL_windowskeyboard.c	Sun Jan 23 21:55:04 2011 -0800
    22.2 +++ b/src/video/windows/SDL_windowskeyboard.c	Mon Jan 24 13:47:35 2011 -0600
    22.3 @@ -145,7 +145,7 @@
    22.4  WIN_UpdateKeymap()
    22.5  {
    22.6      int i;
    22.7 -    SDL_scancode scancode;
    22.8 +    SDL_ScanCode scancode;
    22.9      SDLKey keymap[SDL_NUM_SCANCODES];
   22.10  
   22.11      SDL_GetDefaultKeymap(keymap);
    23.1 --- a/src/video/windows/SDL_windowsvideo.h	Sun Jan 23 21:55:04 2011 -0800
    23.2 +++ b/src/video/windows/SDL_windowsvideo.h	Mon Jan 24 13:47:35 2011 -0600
    23.3 @@ -160,7 +160,7 @@
    23.4      PFCoordTransform CoordTransform;
    23.5  #endif
    23.6  
    23.7 -    const SDL_scancode *key_layout;
    23.8 +    const SDL_ScanCode *key_layout;
    23.9  	DWORD clipboard_count;
   23.10  
   23.11  	/* Touch input functions */
    24.1 --- a/src/video/x11/SDL_x11events.c	Sun Jan 23 21:55:04 2011 -0800
    24.2 +++ b/src/video/x11/SDL_x11events.c	Mon Jan 24 13:47:35 2011 -0600
    24.3 @@ -202,7 +202,7 @@
    24.4      case KeyPress:{
    24.5              KeyCode keycode = xevent.xkey.keycode;
    24.6              KeySym keysym = NoSymbol;
    24.7 -            SDL_scancode scancode;
    24.8 +            SDL_ScanCode scancode;
    24.9              char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];
   24.10              Status status = 0;
   24.11  
    25.1 --- a/src/video/x11/SDL_x11keyboard.c	Sun Jan 23 21:55:04 2011 -0800
    25.2 +++ b/src/video/x11/SDL_x11keyboard.c	Mon Jan 24 13:47:35 2011 -0600
    25.3 @@ -134,7 +134,7 @@
    25.4  
    25.5  static const struct
    25.6  {
    25.7 -    const SDL_scancode const *table;
    25.8 +    const SDL_ScanCode const *table;
    25.9      int table_size;
   25.10  } scancode_set[] = {
   25.11      { darwin_scancode_table, SDL_arraysize(darwin_scancode_table) },
   25.12 @@ -175,7 +175,7 @@
   25.13      int i, j;
   25.14      int min_keycode, max_keycode;
   25.15      struct {
   25.16 -        SDL_scancode scancode;
   25.17 +        SDL_ScanCode scancode;
   25.18          KeySym keysym;
   25.19          int value;
   25.20      } fingerprint[] = {
   25.21 @@ -215,7 +215,7 @@
   25.22              printf("Using scancode set %d, min_keycode = %d, max_keycode = %d, table_size = %d\n", i, min_keycode, max_keycode, scancode_set[i].table_size);
   25.23  #endif
   25.24              SDL_memcpy(&data->key_layout[min_keycode], scancode_set[i].table,
   25.25 -                       sizeof(SDL_scancode) * scancode_set[i].table_size);
   25.26 +                       sizeof(SDL_ScanCode) * scancode_set[i].table_size);
   25.27              fingerprint_detected = SDL_TRUE;
   25.28              break;
   25.29          }
   25.30 @@ -239,7 +239,7 @@
   25.31                  key = X11_KeyCodeToSDLKey(data->display, i);
   25.32                  for (j = 0; j < SDL_arraysize(keymap); ++j) {
   25.33                      if (keymap[j] == key) {
   25.34 -                        data->key_layout[i] = (SDL_scancode) j;
   25.35 +                        data->key_layout[i] = (SDL_ScanCode) j;
   25.36                          break;
   25.37                      }
   25.38                  }
   25.39 @@ -264,7 +264,7 @@
   25.40  {
   25.41      SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
   25.42      int i;
   25.43 -    SDL_scancode scancode;
   25.44 +    SDL_ScanCode scancode;
   25.45      SDLKey keymap[SDL_NUM_SCANCODES];
   25.46  
   25.47      SDL_zero(keymap);
    26.1 --- a/src/video/x11/SDL_x11video.h	Sun Jan 23 21:55:04 2011 -0800
    26.2 +++ b/src/video/x11/SDL_x11video.h	Mon Jan 24 13:47:35 2011 -0600
    26.3 @@ -96,7 +96,7 @@
    26.4      Atom _NET_WM_ICON;
    26.5      Atom UTF8_STRING;
    26.6  
    26.7 -    SDL_scancode key_layout[256];
    26.8 +    SDL_ScanCode key_layout[256];
    26.9      SDL_bool selection_waiting;
   26.10  } SDL_VideoData;
   26.11  
    27.1 --- a/test/checkkeys.c	Sun Jan 23 21:55:04 2011 -0800
    27.2 +++ b/test/checkkeys.c	Mon Jan 24 13:47:35 2011 -0600
    27.3 @@ -53,7 +53,7 @@
    27.4  }
    27.5  
    27.6  static void
    27.7 -PrintKey(SDL_keysym * sym, SDL_bool pressed, SDL_bool repeat)
    27.8 +PrintKey(SDL_KeySym * sym, SDL_bool pressed, SDL_bool repeat)
    27.9  {
   27.10      /* Print the keycode, name and state */
   27.11      if (sym->sym) {
    28.1 --- a/test/testkeys.c	Sun Jan 23 21:55:04 2011 -0800
    28.2 +++ b/test/testkeys.c	Mon Jan 24 13:47:35 2011 -0600
    28.3 @@ -11,7 +11,7 @@
    28.4  int
    28.5  main(int argc, char *argv[])
    28.6  {
    28.7 -    SDL_scancode scancode;
    28.8 +    SDL_ScanCode scancode;
    28.9  
   28.10      if (SDL_Init(SDL_INIT_VIDEO) < 0) {
   28.11          fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
    29.1 --- a/test/testwm.c	Sun Jan 23 21:55:04 2011 -0800
    29.2 +++ b/test/testwm.c	Mon Jan 24 13:47:35 2011 -0600
    29.3 @@ -210,7 +210,7 @@
    29.4          printf(" MODE");
    29.5  }
    29.6  
    29.7 -static void PrintKey(const SDL_keysym *sym, int pressed)
    29.8 +static void PrintKey(const SDL_KeySym *sym, int pressed)
    29.9  {
   29.10      /* Print the keycode, name and state */
   29.11      if ( sym->sym ) {