Implemented Cocoa key event handling.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402005

src/events/SDL_keyboard.c

@@ -654,6 +654,7 @@ SDL_SendKeyboardKey(int index, Uint8 state, Uint8 scancode, SDLKey key)
         event.key.keysym.mod = modstate;
         event.key.keysym.unicode = 0;
         event.key.windowID = keyboard->focus;
+        /* FIXME: This doesn't make sense anymore... */
         /*
          * jk 991215 - Added
          */
@@ -688,7 +689,7 @@ SDL_SendKeyboardText(int index, const char *text)
         event.text.type = SDL_TEXTINPUT;
         event.text.which = (Uint8) index;
         SDL_strlcpy(event.text.text, text, SDL_arraysize(event.text.text));
-        event.key.windowID = keyboard->focus;
+        event.text.windowID = keyboard->focus;
         posted = (SDL_PushEvent(&event) > 0);
     }
     return (posted);

src/video/cocoa/SDL_cocoaevents.m

@@ -89,9 +89,9 @@ CreateApplicationMenus(void)
     [appleMenu addItem:[NSMenuItem separatorItem]];
 
     title = [@"Hide " stringByAppendingString:appName];
-    [appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"];
+    [appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@/*"h"*/""];
 
-    menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
+    menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@/*"h"*/""];
     [menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];
 
     [appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];
@@ -99,7 +99,7 @@ CreateApplicationMenus(void)
     [appleMenu addItem:[NSMenuItem separatorItem]];
 
     title = [@"Quit " stringByAppendingString:appName];
-    [appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
+    [appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@/*"q"*/""];
     
     /* Put menu into the menubar */
     menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
@@ -116,7 +116,7 @@ CreateApplicationMenus(void)
     windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
     
     /* "Minimize" item */
-    menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"];
+    menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@/*"m"*/""];
     [windowMenu addItem:menuItem];
     [menuItem release];
     
@@ -169,7 +169,16 @@ Cocoa_PumpEvents(_THIS)
         if ( event == nil ) {
             break;
         }
+        switch ([event type]) {
+        case NSKeyDown:
+        case NSKeyUp:
+        case NSFlagsChanged:
+            Cocoa_HandleKeyEvent(_this, event);
+            /* Fall through to pass event to NSApp */
+        default:
             [NSApp sendEvent:event];
+            break;
+        }
     }
     [pool release];
 }

src/video/cocoa/SDL_cocoakeys.h

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+/* These are the Macintosh key scancode constants -- from Inside Macintosh */
+
+#define KEY_ESCAPE		0x35
+#define KEY_F1			0x7A
+#define KEY_F2			0x78
+#define KEY_F3			0x63
+#define KEY_F4			0x76
+#define KEY_F5			0x60
+#define KEY_F6			0x61
+#define KEY_F7			0x62
+#define KEY_F8			0x64
+#define KEY_F9			0x65
+#define KEY_F10			0x6D
+#define KEY_F11			0x67
+#define KEY_F12			0x6F
+#define KEY_PRINT		0x69
+#define KEY_SCROLLOCK    0x6B
+#define KEY_PAUSE		0x71
+#define KEY_POWER		0x7F
+#define KEY_BACKQUOTE	0x32
+#define KEY_1			0x12
+#define KEY_2			0x13
+#define KEY_3			0x14
+#define KEY_4			0x15
+#define KEY_5			0x17
+#define KEY_6			0x16
+#define KEY_7			0x1A
+#define KEY_8			0x1C
+#define KEY_9			0x19
+#define KEY_0			0x1D
+#define KEY_MINUS		0x1B
+#define KEY_EQUALS		0x18
+#define KEY_BACKSPACE	0x33
+#define KEY_INSERT		0x72
+#define KEY_HOME			0x73
+#define KEY_PAGEUP		0x74
+#define KEY_NUMLOCK		0x47
+#define KEY_KP_EQUALS	0x51
+#define KEY_KP_DIVIDE	0x4B
+#define KEY_KP_MULTIPLY	0x43
+#define KEY_TAB			0x30
+#define KEY_q			0x0C
+#define KEY_w			0x0D
+#define KEY_e			0x0E
+#define KEY_r			0x0F
+#define KEY_t			0x11
+#define KEY_y			0x10
+#define KEY_u			0x20
+#define KEY_i			0x22
+#define KEY_o			0x1F
+#define KEY_p			0x23
+#define KEY_LEFTBRACKET	0x21
+#define KEY_RIGHTBRACKET	0x1E
+#define KEY_BACKSLASH	0x2A
+#define KEY_DELETE		0x75
+#define KEY_END			0x77
+#define KEY_PAGEDOWN		0x79
+#define KEY_KP7			0x59
+#define KEY_KP8			0x5B
+#define KEY_KP9			0x5C
+#define KEY_KP_MINUS		0x4E
+#define KEY_CAPSLOCK		0x39
+#define KEY_a			0x00
+#define KEY_s			0x01
+#define KEY_d			0x02
+#define KEY_f			0x03
+#define KEY_g			0x05
+#define KEY_h			0x04
+#define KEY_j			0x26
+#define KEY_k			0x28
+#define KEY_l			0x25
+#define KEY_SEMICOLON	0x29
+#define KEY_QUOTE		0x27
+#define KEY_RETURN		0x24
+#define KEY_KP4			0x56
+#define KEY_KP5			0x57
+#define KEY_KP6			0x58
+#define KEY_KP_PLUS		0x45
+#define KEY_LSHIFT		0x38
+#define KEY_z			0x06
+#define KEY_x			0x07
+#define KEY_c			0x08
+#define KEY_v			0x09
+#define KEY_b			0x0B
+#define KEY_n			0x2D
+#define KEY_m			0x2E
+#define KEY_COMMA		0x2B
+#define KEY_PERIOD		0x2F
+#define KEY_SLASH		0x2C
+#if 1                           /* Panther now defines right side keys */
+#define KEY_RSHIFT		0x3C
+#endif
+#define KEY_UP			0x7E
+#define KEY_KP1			0x53
+#define KEY_KP2			0x54
+#define KEY_KP3			0x55
+#define KEY_KP_ENTER		0x4C
+#define KEY_LCTRL		0x3B
+#define KEY_LALT			0x3A
+#define KEY_LMETA		0x37
+#define KEY_SPACE		0x31
+#if 1                           /* Panther now defines right side keys */
+#define KEY_RMETA		0x36
+#define KEY_RALT			0x3D
+#define KEY_RCTRL		0x3E
+#endif
+#define KEY_LEFT			0x7B
+#define KEY_DOWN			0x7D
+#define KEY_RIGHT		0x7C
+#define KEY_KP0			0x52
+#define KEY_KP_PERIOD	0x41
+
+/* Wierd, these keys are on my iBook under Mac OS X */
+#define KEY_IBOOK_ENTER		0x34
+#define KEY_IBOOK_LEFT		0x3B
+#define KEY_IBOOK_RIGHT		0x3C
+#define KEY_IBOOK_DOWN		0x3D
+#define KEY_IBOOK_UP			0x3E

src/video/cocoa/SDL_cocoavideo.h

@@ -27,6 +27,7 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include <Cocoa/Cocoa.h>
 
+#include "SDL_keysym.h"
 #include "../SDL_sysvideo.h"
 
 #include "SDL_cocoaevents.h"
@@ -40,6 +41,9 @@
 
 typedef struct SDL_VideoData
 {
+    SInt32 osversion;
+    SDLKey keymap[256];
+    unsigned int modifierFlags;
     int mouse;
     int keyboard;
 } SDL_VideoData;

src/video/cocoa/SDL_cocoavideo.m

@@ -66,6 +66,9 @@ Cocoa_CreateDevice(int devindex)
     }
     device->driverdata = data;
 
+    /* Find out what version of Mac OS X we're running */
+    Gestalt(gestaltSystemVersion, &data->osversion);
+
     /* Set the function pointers */
     device->VideoInit = Cocoa_VideoInit;
     device->VideoQuit = Cocoa_VideoQuit;

src/video/cocoa/SDL_cocoawindow.m

@@ -148,49 +148,67 @@ static __inline__ void ConvertNSRect(NSRect *r)
 - (void)mouseDown:(NSEvent *)theEvent
 {
     int index;
+    int button;
 
     index = _data->videodata->mouse;
-    SDL_SendMouseButton(index, SDL_PRESSED, SDL_BUTTON_LEFT);
+    switch ([theEvent buttonNumber]) {
+    case 0:
+        button = SDL_BUTTON_LEFT;
+        break;
+    case 1:
+        button = SDL_BUTTON_RIGHT;
+        break;
+    case 2:
+        button = SDL_BUTTON_MIDDLE;
+        break;
+    default:
+        button = [theEvent buttonNumber];
+        break;
+    }
+    SDL_SendMouseButton(index, SDL_PRESSED, button);
 }
 
 - (void)rightMouseDown:(NSEvent *)theEvent
 {
-    int index;
-
-    index = _data->videodata->mouse;
-    SDL_SendMouseButton(index, SDL_PRESSED, SDL_BUTTON_RIGHT);
+    [self mouseDown:theEvent];
 }
 
 - (void)otherMouseDown:(NSEvent *)theEvent
 {
-    int index;
-
-    index = _data->videodata->mouse;
-    SDL_SendMouseButton(index, SDL_PRESSED, SDL_BUTTON_MIDDLE);
+    [self mouseDown:theEvent];
 }
 
 - (void)mouseUp:(NSEvent *)theEvent
 {
     int index;
+    int button;
 
     index = _data->videodata->mouse;
-    SDL_SendMouseButton(index, SDL_RELEASED, SDL_BUTTON_LEFT);
+    switch ([theEvent buttonNumber]) {
+    case 0:
+        button = SDL_BUTTON_LEFT;
+        break;
+    case 1:
+        button = SDL_BUTTON_RIGHT;
+        break;
+    case 2:
+        button = SDL_BUTTON_MIDDLE;
+        break;
+    default:
+        button = [theEvent buttonNumber];
+        break;
+    }
+    SDL_SendMouseButton(index, SDL_RELEASED, button);
 }
 
 - (void)rightMouseUp:(NSEvent *)theEvent
 {
-    int index;
-
-    index = _data->videodata->mouse;
-    SDL_SendMouseButton(index, SDL_RELEASED, SDL_BUTTON_RIGHT);
+    [self mouseUp:theEvent];
 }
 
 - (void)otherMouseUp:(NSEvent *)theEvent
 {
-    int index;
-
-    index = _data->videodata->mouse;
-    SDL_SendMouseButton(index, SDL_RELEASED, SDL_BUTTON_MIDDLE);
+    [self mouseUp:theEvent];
 }
 
 - (void)mouseMoved:(NSEvent *)theEvent
@@ -238,11 +256,21 @@ static __inline__ void ConvertNSRect(NSRect *r)
 
 - (void)keyDown:(NSEvent *)theEvent
 {
+    int index;
+
+    index = _data->videodata->keyboard;
 fprintf(stderr, "keyDown\n");
+    const char *text = [[theEvent characters] UTF8String];
+    if(text && *text) {
+        SDL_SendKeyboardText(index, text);
+    }
 }
 
 - (void)keyUp:(NSEvent *)theEvent
 {
+    int index;
+
+    index = _data->videodata->keyboard;
 fprintf(stderr, "keyUp\n");
 }