Mercurial > sdl-ios-xcode
diff src/events/SDL_keyboard.c @ 5083:25d4feb7c127
Renamed SDL_keysym to SDL_KeySym
Renamed SDL_scancode to SDL_ScanCode
Added #defines to SDL_compat.h
author | krogoway |
---|---|
date | Mon, 24 Jan 2011 13:47:35 -0600 |
parents | 443771460df9 |
children | dc0dfdd58f27 |
line wrap: on
line diff
--- a/src/events/SDL_keyboard.c Sun Jan 23 21:55:04 2011 -0800 +++ b/src/events/SDL_keyboard.c Mon Jan 24 13:47:35 2011 -0600 @@ -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) {