Sheena pointed out that "scancode" and "keysym" are single words and shouldn't be camel-cased.
--- a/include/SDL_compat.h Mon Feb 07 09:23:01 2011 -0800
+++ b/include/SDL_compat.h Mon Feb 07 09:37:11 2011 -0800
@@ -215,8 +215,10 @@
*/
/*@{*/
-#define SDL_keysym SDL_KeySym
-#define SDL_scancode SDL_ScanCode
+#define SDL_keysym SDL_Keysym
+#define SDL_KeySym SDL_Keysym
+#define SDL_scancode SDL_Scancode
+#define SDL_ScanCode SDL_Scancode
/**
* \name Renamed keys
--- a/include/SDL_events.h Mon Feb 07 09:23:01 2011 -0800
+++ b/include/SDL_events.h Mon Feb 07 09:37:11 2011 -0800
@@ -151,7 +151,7 @@
Uint8 repeat; /**< Non-zero if this is a key repeat */
Uint8 padding2;
Uint8 padding3;
- SDL_KeySym keysym; /**< The key that was pressed or released */
+ SDL_Keysym keysym; /**< The key that was pressed or released */
} SDL_KeyboardEvent;
#define SDL_TEXTEDITINGEVENT_TEXT_SIZE (32)
--- a/include/SDL_keyboard.h Mon Feb 07 09:23:01 2011 -0800
+++ b/include/SDL_keyboard.h Mon Feb 07 09:37:11 2011 -0800
@@ -45,13 +45,13 @@
/**
* \brief The SDL keysym structure, used in key events.
*/
-typedef struct SDL_KeySym
+typedef struct SDL_Keysym
{
- SDL_ScanCode scancode; /**< SDL physical key code - see ::SDL_ScanCode for details */
+ SDL_Scancode scancode; /**< SDL physical key code - see ::SDL_Scancode for details */
SDLKey sym; /**< SDL virtual key code - see ::SDLKey for details */
Uint16 mod; /**< current key modifiers */
Uint32 unicode; /**< \deprecated use SDL_TextInputEvent instead */
-} SDL_KeySym;
+} SDL_Keysym;
/* Function prototypes */
@@ -65,7 +65,7 @@
*
* \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 ::SDL_ScanCode values.
+ * \return An array of key states. Indexes into this array are obtained by using ::SDL_Scancode values.
*
* \b Example:
* \code
@@ -97,17 +97,17 @@
*
* \sa SDL_GetKeyName()
*/
-extern DECLSPEC SDLKey SDLCALL SDL_GetKeyFromScancode(SDL_ScanCode scancode);
+extern DECLSPEC SDLKey SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode);
/**
* \brief Get the scancode corresponding to the given key code according to the
* current keyboard layout.
*
- * See ::SDL_ScanCode for details.
+ * See ::SDL_Scancode for details.
*
* \sa SDL_GetScancodeName()
*/
-extern DECLSPEC SDL_ScanCode SDLCALL SDL_GetScancodeFromKey(SDLKey key);
+extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDLKey key);
/**
* \brief Get a human-readable name for a scancode.
@@ -117,9 +117,9 @@
* copy it. If the scancode doesn't have a name, this function returns
* an empty string ("").
*
- * \sa SDL_ScanCode
+ * \sa SDL_Scancode
*/
-extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_ScanCode
+extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_Scancode
scancode);
/**
--- a/include/SDL_scancode.h Mon Feb 07 09:23:01 2011 -0800
+++ b/include/SDL_scancode.h Mon Feb 07 09:37:11 2011 -0800
@@ -35,7 +35,7 @@
* \brief The SDL keyboard scancode representation.
*
* Values of this type are used to represent keyboard keys, among other places
- * in the \link SDL_KeySym::scancode key.keysym.scancode \endlink field of the
+ * in the \link SDL_Keysym::scancode key.keysym.scancode \endlink field of the
* SDL_Event structure.
*
* The values in this enumeration are based on the USB usage page standard:
@@ -392,7 +392,7 @@
SDL_NUM_SCANCODES = 512 /**< not a key, just marks the number of scancodes
for array bounds */
-} SDL_ScanCode;
+} SDL_Scancode;
#endif /* _SDL_scancode_h */
--- a/src/events/SDL_keyboard.c Mon Feb 07 09:23:01 2011 -0800
+++ b/src/events/SDL_keyboard.c Mon Feb 07 09:37:11 2011 -0800
@@ -562,7 +562,7 @@
SDL_ResetKeyboard(void)
{
SDL_Keyboard *keyboard = &SDL_keyboard;
- SDL_ScanCode scancode;
+ SDL_Scancode scancode;
for (scancode = 0; scancode < SDL_NUM_SCANCODES; ++scancode) {
if (keyboard->keystate[scancode] == SDL_PRESSED) {
@@ -590,7 +590,7 @@
}
void
-SDL_SetScancodeName(SDL_ScanCode scancode, const char *name)
+SDL_SetScancodeName(SDL_Scancode scancode, const char *name)
{
SDL_scancode_names[scancode] = name;
}
@@ -638,7 +638,7 @@
}
int
-SDL_SendKeyboardKey(Uint8 state, SDL_ScanCode scancode)
+SDL_SendKeyboardKey(Uint8 state, SDL_Scancode scancode)
{
SDL_Keyboard *keyboard = &SDL_keyboard;
int posted;
@@ -849,18 +849,18 @@
}
SDLKey
-SDL_GetKeyFromScancode(SDL_ScanCode scancode)
+SDL_GetKeyFromScancode(SDL_Scancode scancode)
{
SDL_Keyboard *keyboard = &SDL_keyboard;
return keyboard->keymap[scancode];
}
-SDL_ScanCode
+SDL_Scancode
SDL_GetScancodeFromKey(SDLKey key)
{
SDL_Keyboard *keyboard = &SDL_keyboard;
- SDL_ScanCode scancode;
+ SDL_Scancode scancode;
for (scancode = SDL_SCANCODE_UNKNOWN; scancode < SDL_NUM_SCANCODES;
++scancode) {
@@ -872,7 +872,7 @@
}
const char *
-SDL_GetScancodeName(SDL_ScanCode scancode)
+SDL_GetScancodeName(SDL_Scancode scancode)
{
const char *name = SDL_scancode_names[scancode];
@@ -890,7 +890,7 @@
if (key & SDLK_SCANCODE_MASK) {
return
- SDL_GetScancodeName((SDL_ScanCode) (key & ~SDLK_SCANCODE_MASK));
+ SDL_GetScancodeName((SDL_Scancode) (key & ~SDLK_SCANCODE_MASK));
}
switch (key) {
--- a/src/events/SDL_keyboard_c.h Mon Feb 07 09:23:01 2011 -0800
+++ b/src/events/SDL_keyboard_c.h Mon Feb 07 09:37:11 2011 -0800
@@ -43,13 +43,13 @@
name. Encoded as UTF-8. The string is not copied, thus the pointer given to
this function must stay valid forever (or at least until the call to
VideoQuit()). */
-extern void SDL_SetScancodeName(SDL_ScanCode scancode, const char *name);
+extern void SDL_SetScancodeName(SDL_Scancode scancode, const char *name);
/* Set the keyboard focus window */
extern void SDL_SetKeyboardFocus(SDL_Window * window);
/* Send a keyboard key event */
-extern int SDL_SendKeyboardKey(Uint8 state, SDL_ScanCode scancode);
+extern int SDL_SendKeyboardKey(Uint8 state, SDL_Scancode scancode);
/* Send keyboard text input */
extern int SDL_SendKeyboardText(const char *text);
--- a/src/events/scancodes_darwin.h Mon Feb 07 09:23:01 2011 -0800
+++ b/src/events/scancodes_darwin.h Mon Feb 07 09:37:11 2011 -0800
@@ -27,7 +27,7 @@
- experimentation on various ADB and USB ISO keyboards and one ADB ANSI keyboard
*/
/* *INDENT-OFF* */
-static const SDL_ScanCode darwin_scancode_table[] = {
+static const SDL_Scancode darwin_scancode_table[] = {
/* 0 */ SDL_SCANCODE_A,
/* 1 */ SDL_SCANCODE_S,
/* 2 */ SDL_SCANCODE_D,
--- a/src/events/scancodes_linux.h Mon Feb 07 09:23:01 2011 -0800
+++ b/src/events/scancodes_linux.h Mon Feb 07 09:37:11 2011 -0800
@@ -26,7 +26,7 @@
- Linux kernel source input.h
*/
/* *INDENT-OFF* */
-static SDL_ScanCode const linux_scancode_table[] = {
+static SDL_Scancode const linux_scancode_table[] = {
/* 0 */ SDL_SCANCODE_UNKNOWN,
/* 1 */ SDL_SCANCODE_ESCAPE,
/* 2 */ SDL_SCANCODE_1,
--- a/src/events/scancodes_windows.h Mon Feb 07 09:23:01 2011 -0800
+++ b/src/events/scancodes_windows.h Mon Feb 07 09:37:11 2011 -0800
@@ -26,7 +26,7 @@
- msdn.microsoft.com
*/
/* *INDENT-OFF* */
-static const SDL_ScanCode windows_scancode_table[] = {
+static const SDL_Scancode windows_scancode_table[] = {
/* 0, 0x00 */ SDL_SCANCODE_UNKNOWN,
/* 1, 0x01 */ SDL_SCANCODE_UNKNOWN,
/* 2, 0x02 */ SDL_SCANCODE_UNKNOWN,
--- a/src/events/scancodes_xfree86.h Mon Feb 07 09:23:01 2011 -0800
+++ b/src/events/scancodes_xfree86.h Mon Feb 07 09:37:11 2011 -0800
@@ -26,7 +26,7 @@
- atKeyNames.h from XFree86 source code
*/
/* *INDENT-OFF* */
-static const SDL_ScanCode xfree86_scancode_table[] = {
+static const SDL_Scancode xfree86_scancode_table[] = {
/* 0 */ SDL_SCANCODE_UNKNOWN,
/* 1 */ SDL_SCANCODE_ESCAPE,
/* 2 */ SDL_SCANCODE_1,
@@ -177,7 +177,7 @@
};
/* for wireless usb keyboard (manufacturer TRUST) without numpad. */
-static const SDL_ScanCode xfree86_scancode_table2[] = {
+static const SDL_Scancode xfree86_scancode_table2[] = {
/* 0 */ SDL_SCANCODE_UNKNOWN,
/* 1 */ SDL_SCANCODE_ESCAPE,
/* 2 */ SDL_SCANCODE_1,
--- a/src/video/android/SDL_androidkeyboard.c Mon Feb 07 09:23:01 2011 -0800
+++ b/src/video/android/SDL_androidkeyboard.c Mon Feb 07 09:37:11 2011 -0800
@@ -37,7 +37,7 @@
SDL_SetKeymap(0, keymap, SDL_NUM_SCANCODES);
}
-static SDL_ScanCode Android_Keycodes[] = {
+static SDL_Scancode Android_Keycodes[] = {
SDL_SCANCODE_UNKNOWN, /* AKEYCODE_UNKNOWN */
SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SOFT_LEFT */
SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SOFT_RIGHT */
@@ -151,10 +151,10 @@
SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_MODE */
};
-static SDL_ScanCode
+static SDL_Scancode
TranslateKeycode(int keycode)
{
- SDL_ScanCode scancode = SDL_SCANCODE_UNKNOWN;
+ SDL_Scancode scancode = SDL_SCANCODE_UNKNOWN;
if (keycode < SDL_arraysize(Android_Keycodes)) {
scancode = Android_Keycodes[keycode];
--- a/src/video/bwindow/SDL_BWin.h Mon Feb 07 09:23:01 2011 -0800
+++ b/src/video/bwindow/SDL_BWin.h Mon Feb 07 09:37:11 2011 -0800
@@ -509,7 +509,7 @@
if (msg->FindInt32("key", &key) == B_OK
&& msg->FindInt32("modifiers", &modifiers) == B_OK) {
- SDL_KeySym keysym;
+ SDL_Keysym keysym;
keysym.scancode = key;
if ((key > 0) && (key < 128)) {
keysym.sym = keymap[key];
@@ -543,7 +543,7 @@
int32 modifiers;
if (msg->FindInt32("key", &key) == B_OK
&& msg->FindInt32("modifiers", &modifiers) == B_OK) {
- SDL_KeySym keysym;
+ SDL_Keysym keysym;
keysym.scancode = key;
if ((key > 0) && (key < 128)) {
keysym.sym = keymap[key];
--- a/src/video/cocoa/SDL_cocoakeyboard.m Mon Feb 07 09:23:01 2011 -0800
+++ b/src/video/cocoa/SDL_cocoakeyboard.m Mon Feb 07 09:37:11 2011 -0800
@@ -246,7 +246,7 @@
HandleNonDeviceModifier(unsigned int device_independent_mask,
unsigned int oldMods,
unsigned int newMods,
- SDL_ScanCode scancode)
+ SDL_Scancode scancode)
{
unsigned int oldMask, newMask;
@@ -268,7 +268,7 @@
*/
static void
HandleModifierOneSide(unsigned int oldMods, unsigned int newMods,
- SDL_ScanCode scancode,
+ SDL_Scancode scancode,
unsigned int sided_device_dependent_mask)
{
unsigned int old_dep_mask, new_dep_mask;
@@ -297,8 +297,8 @@
static void
HandleModifierSide(int device_independent_mask,
unsigned int oldMods, unsigned int newMods,
- SDL_ScanCode left_scancode,
- SDL_ScanCode right_scancode,
+ SDL_Scancode left_scancode,
+ SDL_Scancode right_scancode,
unsigned int left_device_dependent_mask,
unsigned int right_device_dependent_mask)
{
@@ -341,8 +341,8 @@
static void
ReleaseModifierSide(unsigned int device_independent_mask,
unsigned int oldMods, unsigned int newMods,
- SDL_ScanCode left_scancode,
- SDL_ScanCode right_scancode,
+ SDL_Scancode left_scancode,
+ SDL_Scancode right_scancode,
unsigned int left_device_dependent_mask,
unsigned int right_device_dependent_mask)
{
@@ -409,13 +409,13 @@
unsigned int oldMods, unsigned int newMods)
{
/* Set up arrays for the key syms for the left and right side. */
- const SDL_ScanCode left_mapping[] = {
+ const SDL_Scancode left_mapping[] = {
SDL_SCANCODE_LSHIFT,
SDL_SCANCODE_LCTRL,
SDL_SCANCODE_LALT,
SDL_SCANCODE_LGUI
};
- const SDL_ScanCode right_mapping[] = {
+ const SDL_Scancode right_mapping[] = {
SDL_SCANCODE_RSHIFT,
SDL_SCANCODE_RCTRL,
SDL_SCANCODE_RALT,
@@ -489,7 +489,7 @@
#endif
const void *chr_data;
int i;
- SDL_ScanCode scancode;
+ SDL_Scancode scancode;
SDLKey keymap[SDL_NUM_SCANCODES];
/* See if the keymap needs to be updated */
@@ -675,7 +675,7 @@
{
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
unsigned short scancode = [event keyCode];
- SDL_ScanCode code;
+ SDL_Scancode code;
#if 0
const char *text;
#endif
--- a/src/video/directfb/SDL_DirectFB_events.c Mon Feb 07 09:23:01 2011 -0800
+++ b/src/video/directfb/SDL_DirectFB_events.c Mon Feb 07 09:37:11 2011 -0800
@@ -61,15 +61,15 @@
};
/* The translation tables from a DirectFB keycode to a SDL keysym */
-static SDL_ScanCode oskeymap[256];
+static SDL_Scancode oskeymap[256];
-static SDL_KeySym *DirectFB_TranslateKey(_THIS, DFBWindowEvent * evt,
- SDL_KeySym * keysym);
-static SDL_KeySym *DirectFB_TranslateKeyInputEvent(_THIS, DFBInputEvent * evt,
- SDL_KeySym * keysym);
+static SDL_Keysym *DirectFB_TranslateKey(_THIS, DFBWindowEvent * evt,
+ SDL_Keysym * keysym);
+static SDL_Keysym *DirectFB_TranslateKeyInputEvent(_THIS, DFBInputEvent * evt,
+ SDL_Keysym * keysym);
-static void DirectFB_InitOSKeymap(_THIS, SDL_ScanCode * keypmap, int numkeys);
+static void DirectFB_InitOSKeymap(_THIS, SDL_Scancode * keypmap, int numkeys);
static int DirectFB_TranslateButton(DFBInputDeviceButtonIdentifier button);
static void UnicodeToUtf8( Uint16 w , char *utf8buf)
@@ -176,7 +176,7 @@
{
SDL_DFB_DEVICEDATA(_this);
SDL_DFB_WINDOWDATA(sdlwin);
- SDL_KeySym keysym;
+ SDL_Keysym keysym;
char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];
if (evt->clazz == DFEC_WINDOW) {
@@ -308,7 +308,7 @@
ProcessInputEvent(_THIS, DFBInputEvent * ievt)
{
SDL_DFB_DEVICEDATA(_this);
- SDL_KeySym keysym;
+ SDL_Keysym keysym;
int kbd_idx;
char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];
@@ -448,7 +448,7 @@
}
void
-DirectFB_InitOSKeymap(_THIS, SDL_ScanCode * keymap, int numkeys)
+DirectFB_InitOSKeymap(_THIS, SDL_Scancode * keymap, int numkeys)
{
int i;
@@ -575,8 +575,8 @@
}
-static SDL_KeySym *
-DirectFB_TranslateKey(_THIS, DFBWindowEvent * evt, SDL_KeySym * keysym)
+static SDL_Keysym *
+DirectFB_TranslateKey(_THIS, DFBWindowEvent * evt, SDL_Keysym * keysym)
{
SDL_DFB_DEVICEDATA(_this);
int kbd_idx = 0; /* Window events lag the device source KbdIndex(_this, evt->device_id); */
@@ -605,9 +605,9 @@
return keysym;
}
-static SDL_KeySym *
+static SDL_Keysym *
DirectFB_TranslateKeyInputEvent(_THIS, DFBInputEvent * evt,
- SDL_KeySym * keysym)
+ SDL_Keysym * keysym)
{
SDL_DFB_DEVICEDATA(_this);
int kbd_idx = KbdIndex(_this, evt->device_id);
--- a/src/video/directfb/SDL_DirectFB_video.h Mon Feb 07 09:23:01 2011 -0800
+++ b/src/video/directfb/SDL_DirectFB_video.h Mon Feb 07 09:37:11 2011 -0800
@@ -142,7 +142,7 @@
typedef struct _DFB_KeyboardData DFB_KeyboardData;
struct _DFB_KeyboardData
{
- const SDL_ScanCode *map; /* keyboard scancode map */
+ const SDL_Scancode *map; /* keyboard scancode map */
int map_size; /* size of map */
int map_adjust; /* index adjust */
int is_generic; /* generic keyboard */
--- a/src/video/uikit/SDL_uikitview.m Mon Feb 07 09:23:01 2011 -0800
+++ b/src/video/uikit/SDL_uikitview.m Mon Feb 07 09:37:11 2011 -0800
@@ -267,10 +267,10 @@
unichar c = [string characterAtIndex: i];
Uint16 mod = 0;
- SDL_ScanCode code;
+ SDL_Scancode code;
if (c < 127) {
- /* figure out the SDL_ScanCode and SDL_keymod for this unichar */
+ /* figure out the SDL_Scancode and SDL_keymod for this unichar */
code = unicharToUIKeyInfoTable[c].code;
mod = unicharToUIKeyInfoTable[c].mod;
}
--- a/src/video/uikit/keyinfotable.h Mon Feb 07 09:23:01 2011 -0800
+++ b/src/video/uikit/keyinfotable.h Mon Feb 07 09:37:11 2011 -0800
@@ -27,14 +27,14 @@
/*
This file is used by the keyboard code in SDL_uikitview.m to convert between characters
- passed in from the iPhone's virtual keyboard, and tuples of SDL_ScanCodes and SDL_keymods.
+ passed in from the iPhone's virtual keyboard, and tuples of SDL_Scancode and SDL_keymods.
For example unicharToUIKeyInfoTable['a'] would give you the scan code and keymod for lower
case a.
*/
typedef struct
{
- SDL_ScanCode code;
+ SDL_Scancode code;
Uint16 mod;
} UIKitKeyInfo;
--- a/src/video/windows/SDL_windowskeyboard.c Mon Feb 07 09:23:01 2011 -0800
+++ b/src/video/windows/SDL_windowskeyboard.c Mon Feb 07 09:37:11 2011 -0800
@@ -150,7 +150,7 @@
WIN_UpdateKeymap()
{
int i;
- SDL_ScanCode scancode;
+ SDL_Scancode scancode;
SDLKey keymap[SDL_NUM_SCANCODES];
SDL_GetDefaultKeymap(keymap);
--- a/src/video/windows/SDL_windowsvideo.h Mon Feb 07 09:23:01 2011 -0800
+++ b/src/video/windows/SDL_windowsvideo.h Mon Feb 07 09:37:11 2011 -0800
@@ -123,7 +123,7 @@
PFCoordTransform CoordTransform;
#endif
- const SDL_ScanCode *key_layout;
+ const SDL_Scancode *key_layout;
DWORD clipboard_count;
/* Touch input functions */
--- a/src/video/x11/SDL_x11events.c Mon Feb 07 09:23:01 2011 -0800
+++ b/src/video/x11/SDL_x11events.c Mon Feb 07 09:37:11 2011 -0800
@@ -202,7 +202,7 @@
case KeyPress:{
KeyCode keycode = xevent.xkey.keycode;
KeySym keysym = NoSymbol;
- SDL_ScanCode scancode;
+ SDL_Scancode scancode;
char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];
Status status = 0;
--- a/src/video/x11/SDL_x11keyboard.c Mon Feb 07 09:23:01 2011 -0800
+++ b/src/video/x11/SDL_x11keyboard.c Mon Feb 07 09:37:11 2011 -0800
@@ -134,7 +134,7 @@
static const struct
{
- const SDL_ScanCode const *table;
+ const SDL_Scancode const *table;
int table_size;
} scancode_set[] = {
{ darwin_scancode_table, SDL_arraysize(darwin_scancode_table) },
@@ -175,7 +175,7 @@
int i, j;
int min_keycode, max_keycode;
struct {
- SDL_ScanCode scancode;
+ SDL_Scancode scancode;
KeySym keysym;
int value;
} fingerprint[] = {
@@ -215,7 +215,7 @@
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);
#endif
SDL_memcpy(&data->key_layout[min_keycode], scancode_set[i].table,
- sizeof(SDL_ScanCode) * scancode_set[i].table_size);
+ sizeof(SDL_Scancode) * scancode_set[i].table_size);
fingerprint_detected = SDL_TRUE;
break;
}
@@ -239,7 +239,7 @@
key = X11_KeyCodeToSDLKey(data->display, i);
for (j = 0; j < SDL_arraysize(keymap); ++j) {
if (keymap[j] == key) {
- data->key_layout[i] = (SDL_ScanCode) j;
+ data->key_layout[i] = (SDL_Scancode) j;
break;
}
}
@@ -264,7 +264,7 @@
{
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
int i;
- SDL_ScanCode scancode;
+ SDL_Scancode scancode;
SDLKey keymap[SDL_NUM_SCANCODES];
SDL_zero(keymap);
--- a/src/video/x11/SDL_x11video.h Mon Feb 07 09:23:01 2011 -0800
+++ b/src/video/x11/SDL_x11video.h Mon Feb 07 09:37:11 2011 -0800
@@ -89,7 +89,7 @@
Atom _NET_WM_ICON;
Atom UTF8_STRING;
- SDL_ScanCode key_layout[256];
+ SDL_Scancode key_layout[256];
SDL_bool selection_waiting;
} SDL_VideoData;
--- a/test/checkkeys.c Mon Feb 07 09:23:01 2011 -0800
+++ b/test/checkkeys.c Mon Feb 07 09:37:11 2011 -0800
@@ -53,7 +53,7 @@
}
static void
-PrintKey(SDL_KeySym * sym, SDL_bool pressed, SDL_bool repeat)
+PrintKey(SDL_Keysym * sym, SDL_bool pressed, SDL_bool repeat)
{
/* Print the keycode, name and state */
if (sym->sym) {
--- a/test/testkeys.c Mon Feb 07 09:23:01 2011 -0800
+++ b/test/testkeys.c Mon Feb 07 09:37:11 2011 -0800
@@ -11,7 +11,7 @@
int
main(int argc, char *argv[])
{
- SDL_ScanCode scancode;
+ SDL_Scancode scancode;
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
--- a/test/testwm.c Mon Feb 07 09:23:01 2011 -0800
+++ b/test/testwm.c Mon Feb 07 09:37:11 2011 -0800
@@ -210,7 +210,7 @@
printf(" MODE");
}
-static void PrintKey(const SDL_KeySym *sym, int pressed)
+static void PrintKey(const SDL_Keysym *sym, int pressed)
{
/* Print the keycode, name and state */
if ( sym->sym ) {