src/video/cocoa/SDL_cocoakeyboard.m
changeset 2305 fbe8ff44c519
parent 2304 50f58ce12497
child 2859 99210400e8b9
     1.1 --- a/src/video/cocoa/SDL_cocoakeyboard.m	Tue Feb 05 07:30:50 2008 +0000
     1.2 +++ b/src/video/cocoa/SDL_cocoakeyboard.m	Thu Feb 07 15:31:09 2008 +0000
     1.3 @@ -22,9 +22,9 @@
     1.4  #include "SDL_config.h"
     1.5  
     1.6  #include "SDL_cocoavideo.h"
     1.7 -#include "SDL_cocoakeys.h"
     1.8  
     1.9  #include "../../events/SDL_keyboard_c.h"
    1.10 +#include "../../events/scancodes_darwin.h"
    1.11  
    1.12  #include <Carbon/Carbon.h>
    1.13  
    1.14 @@ -372,13 +372,13 @@
    1.15          UInt32 keyboard_type = LMGetKbdType();
    1.16          OSStatus err;
    1.17  
    1.18 -        for (i = 0; i < SDL_arraysize(scancode_table); i++) {
    1.19 +        for (i = 0; i < SDL_arraysize(darwin_scancode_table); i++) {
    1.20              UniChar s[8];
    1.21              UniCharCount len;
    1.22              UInt32 dead_key_state;
    1.23  
    1.24              /* Make sure this scancode is a valid character scancode */
    1.25 -            scancode = scancode_table[i];
    1.26 +            scancode = darwin_scancode_table[i];
    1.27              if (scancode == SDL_SCANCODE_UNKNOWN ||
    1.28                  (keymap[scancode] & SDLK_SCANCODE_MASK)) {
    1.29                  continue;
    1.30 @@ -407,7 +407,7 @@
    1.31              UInt32 c, state = 0;
    1.32  
    1.33              /* Make sure this scancode is a valid character scancode */
    1.34 -            scancode = scancode_table[i];
    1.35 +            scancode = darwin_scancode_table[i];
    1.36              if (scancode == SDL_SCANCODE_UNKNOWN ||
    1.37                  (keymap[scancode] & SDLK_SCANCODE_MASK)) {
    1.38                  continue;
    1.39 @@ -487,8 +487,8 @@
    1.40          /* see comments in SDL_cocoakeys.h */
    1.41          scancode = 60 - scancode;
    1.42      }
    1.43 -    if (scancode < SDL_arraysize(scancode_table)) {
    1.44 -        code = scancode_table[scancode];
    1.45 +    if (scancode < SDL_arraysize(darwin_scancode_table)) {
    1.46 +        code = darwin_scancode_table[scancode];
    1.47      }
    1.48      else {
    1.49          /* Hmm, does this ever happen?  If so, need to extend the keymap... */