src/events/SDL_keyboard.c
changeset 5081 25d4feb7c127
parent 4890 443771460df9
child 5123 dc0dfdd58f27
     1.1 --- a/src/events/SDL_keyboard.c	Sun Jan 23 21:55:04 2011 -0800
     1.2 +++ b/src/events/SDL_keyboard.c	Mon Jan 24 13:47:35 2011 -0600
     1.3 @@ -562,7 +562,7 @@
     1.4  SDL_ResetKeyboard(void)
     1.5  {
     1.6      SDL_Keyboard *keyboard = &SDL_keyboard;
     1.7 -    SDL_scancode scancode;
     1.8 +    SDL_ScanCode scancode;
     1.9  
    1.10      for (scancode = 0; scancode < SDL_NUM_SCANCODES; ++scancode) {
    1.11          if (keyboard->keystate[scancode] == SDL_PRESSED) {
    1.12 @@ -590,7 +590,7 @@
    1.13  }
    1.14  
    1.15  void
    1.16 -SDL_SetScancodeName(SDL_scancode scancode, const char *name)
    1.17 +SDL_SetScancodeName(SDL_ScanCode scancode, const char *name)
    1.18  {
    1.19      SDL_scancode_names[scancode] = name;
    1.20  }
    1.21 @@ -638,7 +638,7 @@
    1.22  }
    1.23  
    1.24  int
    1.25 -SDL_SendKeyboardKey(Uint8 state, SDL_scancode scancode)
    1.26 +SDL_SendKeyboardKey(Uint8 state, SDL_ScanCode scancode)
    1.27  {
    1.28      SDL_Keyboard *keyboard = &SDL_keyboard;
    1.29      int posted;
    1.30 @@ -849,18 +849,18 @@
    1.31  }
    1.32  
    1.33  SDLKey
    1.34 -SDL_GetKeyFromScancode(SDL_scancode scancode)
    1.35 +SDL_GetKeyFromScancode(SDL_ScanCode scancode)
    1.36  {
    1.37      SDL_Keyboard *keyboard = &SDL_keyboard;
    1.38  
    1.39      return keyboard->keymap[scancode];
    1.40  }
    1.41  
    1.42 -SDL_scancode
    1.43 +SDL_ScanCode
    1.44  SDL_GetScancodeFromKey(SDLKey key)
    1.45  {
    1.46      SDL_Keyboard *keyboard = &SDL_keyboard;
    1.47 -    SDL_scancode scancode;
    1.48 +    SDL_ScanCode scancode;
    1.49  
    1.50      for (scancode = SDL_SCANCODE_UNKNOWN; scancode < SDL_NUM_SCANCODES;
    1.51           ++scancode) {
    1.52 @@ -872,7 +872,7 @@
    1.53  }
    1.54  
    1.55  const char *
    1.56 -SDL_GetScancodeName(SDL_scancode scancode)
    1.57 +SDL_GetScancodeName(SDL_ScanCode scancode)
    1.58  {
    1.59      const char *name = SDL_scancode_names[scancode];
    1.60  
    1.61 @@ -890,7 +890,7 @@
    1.62  
    1.63      if (key & SDLK_SCANCODE_MASK) {
    1.64          return
    1.65 -            SDL_GetScancodeName((SDL_scancode) (key & ~SDLK_SCANCODE_MASK));
    1.66 +            SDL_GetScancodeName((SDL_ScanCode) (key & ~SDLK_SCANCODE_MASK));
    1.67      }
    1.68  
    1.69      switch (key) {