sdl-ios-xcode: src/video/cocoa/SDL_cocoakeyboard.m annotate

annotate src/video/cocoa/SDL_cocoakeyboard.m @ 3136:962357f325e1 gsoc2009_IME

Further polish API, fix crash in test program.

author	Jiang Jiang <gzjjgod@gmail.com>
date	Thu, 06 Aug 2009 08:59:53 +0000
parents	f4e553ec6a62
children	7100a1a20143

rev	line source
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
2859 99210400e8b9 Updated copyright date Sam Lantinga <slouken@libsdl.org> parents: 2305 diff changeset	3 Copyright (C) 1997-2009 Sam Lantinga
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 #include "SDL_config.h"
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 #include "SDL_cocoavideo.h"
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26 #include "../../events/SDL_keyboard_c.h"
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2304 diff changeset	27 #include "../../events/scancodes_darwin.h"
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28
2268 4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	29 #include <Carbon/Carbon.h>
4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	30
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	31
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	32 #ifndef NX_DEVICERCTLKEYMASK
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	33 #define NX_DEVICELCTLKEYMASK 0x00000001
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	34 #endif
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	35 #ifndef NX_DEVICELSHIFTKEYMASK
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	36 #define NX_DEVICELSHIFTKEYMASK 0x00000002
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	37 #endif
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	38 #ifndef NX_DEVICERSHIFTKEYMASK
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	39 #define NX_DEVICERSHIFTKEYMASK 0x00000004
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	40 #endif
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	41 #ifndef NX_DEVICELCMDKEYMASK
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	42 #define NX_DEVICELCMDKEYMASK 0x00000008
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	43 #endif
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	44 #ifndef NX_DEVICERCMDKEYMASK
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	45 #define NX_DEVICERCMDKEYMASK 0x00000010
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	46 #endif
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	47 #ifndef NX_DEVICELALTKEYMASK
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	48 #define NX_DEVICELALTKEYMASK 0x00000020
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	49 #endif
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	50 #ifndef NX_DEVICERALTKEYMASK
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	51 #define NX_DEVICERALTKEYMASK 0x00000040
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	52 #endif
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	53 #ifndef NX_DEVICERCTLKEYMASK
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	54 #define NX_DEVICERCTLKEYMASK 0x00002000
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	55 #endif
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	56
3136 962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	57 @interface SDLTranslatorResponder : NSView <NSTextInput>
2289 f629d566ec6b Merged fix for bug #508 from SDL 1.2 revision 3495 Sam Lantinga <slouken@libsdl.org> parents: 2273 diff changeset	58 {
3129 e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	59 NSString *_markedText;
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	60 NSRange _markedRange;
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	61 NSRange _selectedRange;
3135 f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	62 SDL_Rect _inputRect;
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	63 int _keyboard;
2289 f629d566ec6b Merged fix for bug #508 from SDL 1.2 revision 3495 Sam Lantinga <slouken@libsdl.org> parents: 2273 diff changeset	64 }
f629d566ec6b Merged fix for bug #508 from SDL 1.2 revision 3495 Sam Lantinga <slouken@libsdl.org> parents: 2273 diff changeset	65 - (void) doCommandBySelector:(SEL)myselector;
3130 fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	66 - (void) setInputRect:(SDL_Rect *) rect;
3135 f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	67 - (void) setKeyboard:(int) keyboard;
2289 f629d566ec6b Merged fix for bug #508 from SDL 1.2 revision 3495 Sam Lantinga <slouken@libsdl.org> parents: 2273 diff changeset	68 @end
f629d566ec6b Merged fix for bug #508 from SDL 1.2 revision 3495 Sam Lantinga <slouken@libsdl.org> parents: 2273 diff changeset	69
f629d566ec6b Merged fix for bug #508 from SDL 1.2 revision 3495 Sam Lantinga <slouken@libsdl.org> parents: 2273 diff changeset	70 @implementation SDLTranslatorResponder
3127 da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	71
3135 f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	72 - (void) setKeyboard:(int) keyboard
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	73 {
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	74 _keyboard = keyboard;
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	75 }
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	76
3130 fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	77 - (void) setInputRect:(SDL_Rect *) rect
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	78 {
3135 f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	79 _inputRect = *rect;
3130 fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	80 }
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	81
3127 da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	82 - (void) insertText:(id) aString
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	83 {
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	84 const char *str;
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	85
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	86 NSLog(@"insertText: %@", aString);
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	87
3129 e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	88 /* Could be NSString or NSAttributedString, so we have
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	89 * to test and convert it before return as SDL event */
3127 da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	90 if ([aString isKindOfClass: [NSAttributedString class]])
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	91 str = [[aString string] UTF8String];
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	92 else
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	93 str = [aString UTF8String];
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	94
3135 f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	95 SDL_SendKeyboardText(_keyboard, str);
3127 da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	96 }
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	97
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	98 - (void) doCommandBySelector:(SEL) myselector
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	99 {
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	100 [super doCommandBySelector: myselector];
da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	101 }
3129 e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	102
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	103 - (BOOL) hasMarkedText
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	104 {
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	105 return _markedText != nil;
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	106 }
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	107
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	108 - (NSRange) markedRange
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	109 {
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	110 return _markedRange;
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	111 }
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	112
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	113 - (NSRange) selectedRange
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	114 {
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	115 return _selectedRange;
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	116 }
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	117
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	118 - (void) setMarkedText:(id) aString
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	119 selectedRange:(NSRange) selRange
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	120 {
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	121 if ([aString isKindOfClass: [NSAttributedString class]])
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	122 aString = [aString string];
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	123
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	124 if ([aString length] == 0)
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	125 {
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	126 [self unmarkText];
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	127 return;
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	128 }
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	129
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	130 if (_markedText != aString)
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	131 {
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	132 [_markedText release];
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	133 _markedText = [aString retain];
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	134 }
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	135
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	136 _selectedRange = selRange;
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	137 _markedRange = NSMakeRange(0, [aString length]);
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	138
3132 88861448961f Add SDL_TEXTEDTING event to inform application about marked text. Jiang Jiang <gzjjgod@gmail.com> parents: 3130 diff changeset	139 SDL_SendEditingText([aString UTF8String], selRange.location, selRange.length);
88861448961f Add SDL_TEXTEDTING event to inform application about marked text. Jiang Jiang <gzjjgod@gmail.com> parents: 3130 diff changeset	140
3129 e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	141 NSLog(@"setMarkedText: %@, (%d, %d)", _markedText,
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	142 selRange.location, selRange.length);
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	143 }
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	144
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	145 - (void) unmarkText
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	146 {
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	147 [_markedText release];
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	148 _markedText = nil;
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	149 }
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	150
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	151 - (NSRect) firstRectForCharacterRange: (NSRange) theRange
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	152 {
3130 fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	153 float windowHeight = [[self window] frame].size.height;
3136 962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	154 NSRect rect = NSMakeRect(_inputRect.x, windowHeight - _inputRect.y - _inputRect.h,
962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	155 _inputRect.w, _inputRect.h);
3130 fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	156
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	157 NSLog(@"firstRectForCharacterRange: (%d, %d): windowHeight = %g, rect = %@",
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	158 theRange.location, theRange.length, windowHeight,
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	159 NSStringFromRect(rect));
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	160 rect.origin = [[self window] convertBaseToScreen: rect.origin];
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	161
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	162 return rect;
3129 e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	163 }
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	164
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	165 - (NSAttributedString *) attributedSubstringFromRange: (NSRange) theRange
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	166 {
3130 fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	167 NSLog(@"attributedSubstringFromRange: (%d, %d)", theRange.location, theRange.length);
3129 e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	168 return nil;
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	169 }
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	170
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	171 - (NSInteger) conversationIdentifier
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	172 {
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	173 return (NSInteger) self;
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	174 }
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	175
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	176 // This method returns the index for character that is
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	177 // nearest to thePoint. thPoint is in screen coordinate system.
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	178 - (NSUInteger) characterIndexForPoint:(NSPoint) thePoint
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	179 {
3130 fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	180 NSLog(@"characterIndexForPoint: (%g, %g)", thePoint.x, thePoint.y);
3129 e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	181 return 0;
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	182 }
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	183
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	184 // This method is the key to attribute extension.
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	185 // We could add new attributes through this method.
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	186 // NSInputServer examines the return value of this
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	187 // method & constructs appropriate attributed string.
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	188 - (NSArray *) validAttributesForMarkedText
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	189 {
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	190 return [NSArray array];
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	191 }
e42873b9c6f1 Basic marked text handling Jiang Jiang <gzjjgod@gmail.com> parents: 3127 diff changeset	192
2289 f629d566ec6b Merged fix for bug #508 from SDL 1.2 revision 3495 Sam Lantinga <slouken@libsdl.org> parents: 2273 diff changeset	193 @end
f629d566ec6b Merged fix for bug #508 from SDL 1.2 revision 3495 Sam Lantinga <slouken@libsdl.org> parents: 2273 diff changeset	194
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	195 /* This is the original behavior, before support was added for
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	196 * differentiating between left and right versions of the keys.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	197 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	198 static void
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	199 DoUnsidedModifiers(int keyboard, unsigned short scancode,
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	200 unsigned int oldMods, unsigned int newMods)
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	201 {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	202 const int mapping[] = {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	203 SDL_SCANCODE_CAPSLOCK,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	204 SDL_SCANCODE_LSHIFT,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	205 SDL_SCANCODE_LCTRL,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	206 SDL_SCANCODE_LALT,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	207 SDL_SCANCODE_LGUI
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	208 };
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	209 unsigned int i, bit;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	210
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	211 /* Iterate through the bits, testing each against the current modifiers */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	212 for (i = 0, bit = NSAlphaShiftKeyMask; bit <= NSCommandKeyMask; bit <<= 1, ++i) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	213 unsigned int oldMask, newMask;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	214
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	215 oldMask = oldMods & bit;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	216 newMask = newMods & bit;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	217
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	218 if (oldMask && oldMask != newMask) { /* modifier up event */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	219 /* If this was Caps Lock, we need some additional voodoo to make SDL happy */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	220 if (bit == NSAlphaShiftKeyMask) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	221 SDL_SendKeyboardKey(keyboard, SDL_PRESSED, mapping[i]);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	222 }
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	223 SDL_SendKeyboardKey(keyboard, SDL_RELEASED, mapping[i]);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	224 } else if (newMask && oldMask != newMask) { /* modifier down event */
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	225 SDL_SendKeyboardKey(keyboard, SDL_PRESSED, mapping[i]);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	226 /* If this was Caps Lock, we need some additional voodoo to make SDL happy */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	227 if (bit == NSAlphaShiftKeyMask) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	228 SDL_SendKeyboardKey(keyboard, SDL_RELEASED, mapping[i]);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	229 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	230 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	231 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	232 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	233
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	234 /* This is a helper function for HandleModifierSide. This
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	235 * function reverts back to behavior before the distinction between
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	236 * sides was made.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	237 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	238 static void
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	239 HandleNonDeviceModifier(int keyboard,
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	240 unsigned int device_independent_mask,
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	241 unsigned int oldMods,
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	242 unsigned int newMods,
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	243 SDL_scancode scancode)
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	244 {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	245 unsigned int oldMask, newMask;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	246
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	247 /* Isolate just the bits we care about in the depedent bits so we can
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	248 * figure out what changed
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	249 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	250 oldMask = oldMods & device_independent_mask;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	251 newMask = newMods & device_independent_mask;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	252
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	253 if (oldMask && oldMask != newMask) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	254 SDL_SendKeyboardKey(keyboard, SDL_RELEASED, scancode);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	255 } else if (newMask && oldMask != newMask) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	256 SDL_SendKeyboardKey(keyboard, SDL_PRESSED, scancode);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	257 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	258 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	259
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	260 /* This is a helper function for HandleModifierSide.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	261 * This function sets the actual SDL_PrivateKeyboard event.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	262 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	263 static void
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	264 HandleModifierOneSide(int keyboard,
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	265 unsigned int oldMods, unsigned int newMods,
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	266 SDL_scancode scancode,
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	267 unsigned int sided_device_dependent_mask)
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	268 {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	269 unsigned int old_dep_mask, new_dep_mask;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	270
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	271 /* Isolate just the bits we care about in the depedent bits so we can
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	272 * figure out what changed
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	273 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	274 old_dep_mask = oldMods & sided_device_dependent_mask;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	275 new_dep_mask = newMods & sided_device_dependent_mask;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	276
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	277 /* We now know that this side bit flipped. But we don't know if
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	278 * it went pressed to released or released to pressed, so we must
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	279 * find out which it is.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	280 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	281 if (new_dep_mask && old_dep_mask != new_dep_mask) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	282 SDL_SendKeyboardKey(keyboard, SDL_PRESSED, scancode);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	283 } else {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	284 SDL_SendKeyboardKey(keyboard, SDL_RELEASED, scancode);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	285 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	286 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	287
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	288 /* This is a helper function for DoSidedModifiers.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	289 * This function will figure out if the modifier key is the left or right side,
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	290 * e.g. left-shift vs right-shift.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	291 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	292 static void
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	293 HandleModifierSide(int keyboard,
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	294 int device_independent_mask,
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	295 unsigned int oldMods, unsigned int newMods,
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	296 SDL_scancode left_scancode,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	297 SDL_scancode right_scancode,
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	298 unsigned int left_device_dependent_mask,
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	299 unsigned int right_device_dependent_mask)
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	300 {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	301 unsigned int device_dependent_mask = (left_device_dependent_mask \|
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	302 right_device_dependent_mask);
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	303 unsigned int diff_mod;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	304
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	305 /* On the basis that the device independent mask is set, but there are
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	306 * no device dependent flags set, we'll assume that we can't detect this
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	307 * keyboard and revert to the unsided behavior.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	308 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	309 if ((device_dependent_mask & newMods) == 0) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	310 /* Revert to the old behavior */
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	311 HandleNonDeviceModifier(keyboard, device_independent_mask, oldMods, newMods, left_scancode);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	312 return;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	313 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	314
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	315 /* XOR the previous state against the new state to see if there's a change */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	316 diff_mod = (device_dependent_mask & oldMods) ^
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	317 (device_dependent_mask & newMods);
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	318 if (diff_mod) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	319 /* A change in state was found. Isolate the left and right bits
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	320 * to handle them separately just in case the values can simulataneously
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	321 * change or if the bits don't both exist.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	322 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	323 if (left_device_dependent_mask & diff_mod) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	324 HandleModifierOneSide(keyboard, oldMods, newMods, left_scancode, left_device_dependent_mask);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	325 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	326 if (right_device_dependent_mask & diff_mod) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	327 HandleModifierOneSide(keyboard, oldMods, newMods, right_scancode, right_device_dependent_mask);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	328 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	329 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	330 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	331
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	332 /* This is a helper function for DoSidedModifiers.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	333 * This function will release a key press in the case that
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	334 * it is clear that the modifier has been released (i.e. one side
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	335 * can't still be down).
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	336 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	337 static void
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	338 ReleaseModifierSide(int keyboard,
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	339 unsigned int device_independent_mask,
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	340 unsigned int oldMods, unsigned int newMods,
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	341 SDL_scancode left_scancode,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	342 SDL_scancode right_scancode,
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	343 unsigned int left_device_dependent_mask,
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	344 unsigned int right_device_dependent_mask)
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	345 {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	346 unsigned int device_dependent_mask = (left_device_dependent_mask \|
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	347 right_device_dependent_mask);
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	348
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	349 /* On the basis that the device independent mask is set, but there are
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	350 * no device dependent flags set, we'll assume that we can't detect this
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	351 * keyboard and revert to the unsided behavior.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	352 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	353 if ((device_dependent_mask & oldMods) == 0) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	354 /* In this case, we can't detect the keyboard, so use the left side
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	355 * to represent both, and release it.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	356 */
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	357 SDL_SendKeyboardKey(keyboard, SDL_RELEASED, left_scancode);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	358 return;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	359 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	360
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	361 /*
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	362 * This could have been done in an if-else case because at this point,
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	363 * we know that all keys have been released when calling this function.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	364 * But I'm being paranoid so I want to handle each separately,
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	365 * so I hope this doesn't cause other problems.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	366 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	367 if ( left_device_dependent_mask & oldMods ) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	368 SDL_SendKeyboardKey(keyboard, SDL_RELEASED, left_scancode);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	369 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	370 if ( right_device_dependent_mask & oldMods ) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	371 SDL_SendKeyboardKey(keyboard, SDL_RELEASED, right_scancode);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	372 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	373 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	374
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	375 /* This is a helper function for DoSidedModifiers.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	376 * This function handles the CapsLock case.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	377 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	378 static void
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	379 HandleCapsLock(int keyboard, unsigned short scancode,
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	380 unsigned int oldMods, unsigned int newMods)
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	381 {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	382 unsigned int oldMask, newMask;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	383
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	384 oldMask = oldMods & NSAlphaShiftKeyMask;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	385 newMask = newMods & NSAlphaShiftKeyMask;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	386
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	387 if (oldMask != newMask) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	388 SDL_SendKeyboardKey(keyboard, SDL_PRESSED, SDL_SCANCODE_CAPSLOCK);
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	389 SDL_SendKeyboardKey(keyboard, SDL_RELEASED, SDL_SCANCODE_CAPSLOCK);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	390 }
1960 118daa3a24cc Added numlock support Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	391
118daa3a24cc Added numlock support Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	392 oldMask = oldMods & NSNumericPadKeyMask;
118daa3a24cc Added numlock support Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	393 newMask = newMods & NSNumericPadKeyMask;
118daa3a24cc Added numlock support Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	394
118daa3a24cc Added numlock support Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	395 if (oldMask != newMask) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	396 SDL_SendKeyboardKey(keyboard, SDL_PRESSED, SDL_SCANCODE_NUMLOCKCLEAR);
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	397 SDL_SendKeyboardKey(keyboard, SDL_RELEASED, SDL_SCANCODE_NUMLOCKCLEAR);
1960 118daa3a24cc Added numlock support Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	398 }
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	399 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	400
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	401 /* This function will handle the modifier keys and also determine the
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	402 * correct side of the key.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	403 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	404 static void
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	405 DoSidedModifiers(int keyboard, unsigned short scancode,
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	406 unsigned int oldMods, unsigned int newMods)
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	407 {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	408 /* Set up arrays for the key syms for the left and right side. */
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	409 const SDL_scancode left_mapping[] = {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	410 SDL_SCANCODE_LSHIFT,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	411 SDL_SCANCODE_LCTRL,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	412 SDL_SCANCODE_LALT,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	413 SDL_SCANCODE_LGUI
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	414 };
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	415 const SDL_scancode right_mapping[] = {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	416 SDL_SCANCODE_RSHIFT,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	417 SDL_SCANCODE_RCTRL,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	418 SDL_SCANCODE_RALT,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	419 SDL_SCANCODE_RGUI
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	420 };
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	421 /* Set up arrays for the device dependent masks with indices that
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	422 * correspond to the _mapping arrays
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	423 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	424 const unsigned int left_device_mapping[] = { NX_DEVICELSHIFTKEYMASK, NX_DEVICELCTLKEYMASK, NX_DEVICELALTKEYMASK, NX_DEVICELCMDKEYMASK };
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	425 const unsigned int right_device_mapping[] = { NX_DEVICERSHIFTKEYMASK, NX_DEVICERCTLKEYMASK, NX_DEVICERALTKEYMASK, NX_DEVICERCMDKEYMASK };
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	426
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	427 unsigned int i, bit;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	428
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	429 /* Handle CAPSLOCK separately because it doesn't have a left/right side */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	430 HandleCapsLock(keyboard, scancode, oldMods, newMods);
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	431
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	432 /* Iterate through the bits, testing each against the old modifiers */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	433 for (i = 0, bit = NSShiftKeyMask; bit <= NSCommandKeyMask; bit <<= 1, ++i) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	434 unsigned int oldMask, newMask;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	435
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	436 oldMask = oldMods & bit;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	437 newMask = newMods & bit;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	438
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	439 /* If the bit is set, we must always examine it because the left
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	440 * and right side keys may alternate or both may be pressed.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	441 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	442 if (newMask) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	443 HandleModifierSide(keyboard, bit, oldMods, newMods,
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	444 left_mapping[i], right_mapping[i],
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	445 left_device_mapping[i], right_device_mapping[i]);
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	446 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	447 /* If the state changed from pressed to unpressed, we must examine
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	448 * the device dependent bits to release the correct keys.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	449 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	450 else if (oldMask && oldMask != newMask) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	451 ReleaseModifierSide(keyboard, bit, oldMods, newMods,
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	452 left_mapping[i], right_mapping[i],
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	453 left_device_mapping[i], right_device_mapping[i]);
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	454 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	455 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	456 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	457
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	458 static void
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	459 HandleModifiers(_THIS, unsigned short scancode, unsigned int modifierFlags)
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	460 {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	461 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	462
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	463 if (modifierFlags == data->modifierFlags) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	464 return;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	465 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	466
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	467 /*
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	468 * Starting with Panther (10.3.0), the ability to distinguish between
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	469 * left side and right side modifiers is available.
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	470 */
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	471 if (data->osversion >= 0x1030) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	472 DoSidedModifiers(data->keyboard, scancode, data->modifierFlags, modifierFlags);
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	473 } else {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	474 DoUnsidedModifiers(data->keyboard, scancode, data->modifierFlags, modifierFlags);
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	475 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	476 data->modifierFlags = modifierFlags;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	477 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	478
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	479 static void
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	480 UpdateKeymap(SDL_VideoData *data)
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	481 {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	482 KeyboardLayoutRef key_layout;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	483 const void *chr_data;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	484 int i;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	485 SDL_scancode scancode;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	486 SDLKey keymap[SDL_NUM_SCANCODES];
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	487
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	488 /* See if the keymap needs to be updated */
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	489 KLGetCurrentKeyboardLayout(&key_layout);
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	490 if (key_layout == data->key_layout) {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	491 return;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	492 }
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	493 data->key_layout = key_layout;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	494
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	495 SDL_GetDefaultKeymap(keymap);
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	496
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	497 /* Try Unicode data first (preferred as of Mac OS X 10.5) */
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	498 KLGetKeyboardLayoutProperty(key_layout, kKLuchrData, &chr_data);
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	499 if (chr_data) {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	500 UInt32 keyboard_type = LMGetKbdType();
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	501 OSStatus err;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	502
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2304 diff changeset	503 for (i = 0; i < SDL_arraysize(darwin_scancode_table); i++) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	504 UniChar s[8];
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	505 UniCharCount len;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	506 UInt32 dead_key_state;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	507
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	508 /* Make sure this scancode is a valid character scancode */
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2304 diff changeset	509 scancode = darwin_scancode_table[i];
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	510 if (scancode == SDL_SCANCODE_UNKNOWN \|\|
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	511 (keymap[scancode] & SDLK_SCANCODE_MASK)) {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	512 continue;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	513 }
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	514
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	515 dead_key_state = 0;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	516 err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	517 0, keyboard_type,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	518 kUCKeyTranslateNoDeadKeysMask,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	519 &dead_key_state, 8, &len, s);
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	520 if (err != noErr)
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	521 continue;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	522
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	523 if (len > 0 && s[0] != 0x10) {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	524 keymap[scancode] = s[0];
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	525 }
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	526 }
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	527 SDL_SetKeymap(data->keyboard, 0, keymap, SDL_NUM_SCANCODES);
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	528 return;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	529 }
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	530
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	531 /* Fall back to older style key map data */
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	532 KLGetKeyboardLayoutProperty(key_layout, kKLKCHRData, &chr_data);
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	533 if (chr_data) {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	534 for (i = 0; i < 128; i++) {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	535 UInt32 c, state = 0;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	536
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	537 /* Make sure this scancode is a valid character scancode */
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2304 diff changeset	538 scancode = darwin_scancode_table[i];
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	539 if (scancode == SDL_SCANCODE_UNKNOWN \|\|
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	540 (keymap[scancode] & SDLK_SCANCODE_MASK)) {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	541 continue;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	542 }
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	543
2304 50f58ce12497 Christian's comment: Sam Lantinga <slouken@libsdl.org> parents: 2303 diff changeset	544 c = KeyTranslate (chr_data, i, &state) & 255;
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	545 if (state) {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	546 /* Dead key, process key up */
2304 50f58ce12497 Christian's comment: Sam Lantinga <slouken@libsdl.org> parents: 2303 diff changeset	547 c = KeyTranslate (chr_data, i \| 128, &state) & 255;
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	548 }
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	549
2304 50f58ce12497 Christian's comment: Sam Lantinga <slouken@libsdl.org> parents: 2303 diff changeset	550 if (c != 0 && c != 0x10) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	551 /* MacRoman to Unicode table, taken from X.org sources */
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	552 static const unsigned short macroman_table[128] = {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	553 0xc4, 0xc5, 0xc7, 0xc9, 0xd1, 0xd6, 0xdc, 0xe1,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	554 0xe0, 0xe2, 0xe4, 0xe3, 0xe5, 0xe7, 0xe9, 0xe8,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	555 0xea, 0xeb, 0xed, 0xec, 0xee, 0xef, 0xf1, 0xf3,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	556 0xf2, 0xf4, 0xf6, 0xf5, 0xfa, 0xf9, 0xfb, 0xfc,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	557 0x2020, 0xb0, 0xa2, 0xa3, 0xa7, 0x2022, 0xb6, 0xdf,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	558 0xae, 0xa9, 0x2122, 0xb4, 0xa8, 0x2260, 0xc6, 0xd8,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	559 0x221e, 0xb1, 0x2264, 0x2265, 0xa5, 0xb5, 0x2202, 0x2211,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	560 0x220f, 0x3c0, 0x222b, 0xaa, 0xba, 0x3a9, 0xe6, 0xf8,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	561 0xbf, 0xa1, 0xac, 0x221a, 0x192, 0x2248, 0x2206, 0xab,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	562 0xbb, 0x2026, 0xa0, 0xc0, 0xc3, 0xd5, 0x152, 0x153,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	563 0x2013, 0x2014, 0x201c, 0x201d, 0x2018, 0x2019, 0xf7, 0x25ca,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	564 0xff, 0x178, 0x2044, 0x20ac, 0x2039, 0x203a, 0xfb01, 0xfb02,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	565 0x2021, 0xb7, 0x201a, 0x201e, 0x2030, 0xc2, 0xca, 0xc1,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	566 0xcb, 0xc8, 0xcd, 0xce, 0xcf, 0xcc, 0xd3, 0xd4,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	567 0xf8ff, 0xd2, 0xda, 0xdb, 0xd9, 0x131, 0x2c6, 0x2dc,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	568 0xaf, 0x2d8, 0x2d9, 0x2da, 0xb8, 0x2dd, 0x2db, 0x2c7,
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	569 };
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	570
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	571 if (c >= 128) {
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	572 c = macroman_table[c - 128];
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	573 }
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	574 keymap[scancode] = c;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	575 }
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	576 }
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	577 SDL_SetKeymap(data->keyboard, 0, keymap, SDL_NUM_SCANCODES);
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	578 return;
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	579 }
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	580 }
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	581
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	582 void
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	583 Cocoa_InitKeyboard(_THIS)
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	584 {
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	585 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	586 SDL_Keyboard keyboard;
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	587
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	588 SDL_zero(keyboard);
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	589 data->keyboard = SDL_AddKeyboard(&keyboard, -1);
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	590 UpdateKeymap(data);
2268 4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	591
4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	592 /* Set our own names for the platform-dependent but layout-independent keys */
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	593 /* This key is NumLock on the MacBook keyboard. :) */
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	594 /SDL_SetScancodeName(SDL_SCANCODE_NUMLOCKCLEAR, "Clear");/
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	595 SDL_SetScancodeName(SDL_SCANCODE_LALT, "Left Option");
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	596 SDL_SetScancodeName(SDL_SCANCODE_LGUI, "Left Command");
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	597 SDL_SetScancodeName(SDL_SCANCODE_RALT, "Right Option");
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	598 SDL_SetScancodeName(SDL_SCANCODE_RGUI, "Right Command");
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	599 }
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	600
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	601 void
3136 962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	602 Cocoa_StartTextInput(_THIS)
3135 f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	603 {
3136 962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	604 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	605 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	606 NSView *parentView = [[NSApp keyWindow] contentView];
3135 f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	607
3136 962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	608 data->fieldEdit = [[SDLTranslatorResponder alloc] initWithFrame:NSMakeRect(0.0, 0.0, 0.0, 0.0)];
962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	609 [data->fieldEdit setKeyboard: data->keyboard];
962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	610
962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	611 if (! [[data->fieldEdit superview] isEqual: parentView])
3135 f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	612 {
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	613 NSLog(@"add fieldEdit to window contentView");
3136 962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	614 [data->fieldEdit removeFromSuperview];
962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	615 [parentView addSubview: data->fieldEdit];
962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	616 [[NSApp keyWindow] makeFirstResponder: data->fieldEdit];
3135 f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	617 }
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	618
3136 962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	619 [pool release];
962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	620
3135 f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	621 SDL_EventState(SDL_TEXTINPUT, SDL_ENABLE);
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	622 SDL_EventState(SDL_TEXTEDITING, SDL_ENABLE);
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	623 }
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	624
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	625 void
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	626 Cocoa_SetTextInputRect(_THIS, SDL_Rect *rect)
3130 fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	627 {
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	628 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	629
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	630 [data->fieldEdit setInputRect: rect];
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	631 }
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	632
fef1a835af43 Basic text input API Jiang Jiang <gzjjgod@gmail.com> parents: 3129 diff changeset	633 void
3135 f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	634 Cocoa_StopTextInput(_THIS)
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	635 {
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	636 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	637
3136 962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	638 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3135 f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	639 [data->fieldEdit removeFromSuperview];
3136 962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	640 [data->fieldEdit release];
962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	641 data->fieldEdit = nil;
962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	642 [pool release];
962357f325e1 Further polish API, fix crash in test program. Jiang Jiang <gzjjgod@gmail.com> parents: 3135 diff changeset	643
3135 f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	644 SDL_EventState(SDL_TEXTINPUT, SDL_IGNORE);
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	645 SDL_EventState(SDL_TEXTEDITING, SDL_IGNORE);
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	646 }
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	647
f4e553ec6a62 Update API, first step: make it build Jiang Jiang <gzjjgod@gmail.com> parents: 3132 diff changeset	648 void
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	649 Cocoa_HandleKeyEvent(_THIS, NSEvent *event)
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	650 {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	651 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	652 unsigned short scancode = [event keyCode];
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	653 SDL_scancode code;
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	654 const char *text;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	655
2268 4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	656 if ((scancode == 10 \|\| scancode == 50) && KBGetLayoutType(LMGetKbdType()) == kKeyboardISO) {
4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	657 /* see comments in SDL_cocoakeys.h */
4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	658 scancode = 60 - scancode;
4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	659 }
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2304 diff changeset	660 if (scancode < SDL_arraysize(darwin_scancode_table)) {
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2304 diff changeset	661 code = darwin_scancode_table[scancode];
2268 4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	662 }
4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	663 else {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	664 /* Hmm, does this ever happen? If so, need to extend the keymap... */
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	665 code = SDL_SCANCODE_UNKNOWN;
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	666 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	667
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	668 switch ([event type]) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	669 case NSKeyDown:
2129 047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2090 diff changeset	670 if (![event isARepeat]) {
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	671 /* See if we need to rebuild the keyboard layout */
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	672 UpdateKeymap(data);
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	673
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	674 SDL_SendKeyboardKey(data->keyboard, SDL_PRESSED, code);
2268 4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	675 #if 1
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	676 if (code == SDL_SCANCODE_UNKNOWN) {
2268 4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	677 fprintf(stderr, "The key you just pressed is not recognized by SDL. To help get this fixed, report this to the SDL mailing list <sdl@libsdl.org> or to Christian Walther <cwalther@gmx.ch>. Mac virtual key code is %d.\n", scancode);
4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	678 }
4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	679 #endif
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	680 }
2129 047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2090 diff changeset	681 if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
2268 4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	682 /* FIXME CW 2007-08-16: only send those events to the field editor for which we actually want text events, not e.g. esc or function keys. Arrow keys in particular seem to produce crashes sometimes. */
2169 13cf2d5eda86 Added key composition support, courtesy of Kuon Sam Lantinga <slouken@libsdl.org> parents: 2129 diff changeset	683 [data->fieldEdit interpretKeyEvents:[NSArray arrayWithObject:event]];
3127 da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	684 #if 0
2129 047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2090 diff changeset	685 text = [[event characters] UTF8String];
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2090 diff changeset	686 if(text && *text) {
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2090 diff changeset	687 SDL_SendKeyboardText(data->keyboard, text);
2273 a25bc0f79557 Fixed bug #471 Sam Lantinga <slouken@libsdl.org> parents: 2270 diff changeset	688 [data->fieldEdit setString:@""];
2129 047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2090 diff changeset	689 }
3127 da6cbfa5b5f2 Get basic text input support working for Cocoa Jiang Jiang <gzjjgod@gmail.com> parents: 2859 diff changeset	690 #endif
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	691 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	692 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	693 case NSKeyUp:
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2289 diff changeset	694 SDL_SendKeyboardKey(data->keyboard, SDL_RELEASED, code);
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	695 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	696 case NSFlagsChanged:
2268 4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	697 /* FIXME CW 2007-08-14: check if this whole mess that takes up half of this file is really necessary */
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	698 HandleModifiers(_this, scancode, [event modifierFlags]);
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	699 break;
2268 4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	700 default: /* just to avoid compiler warnings */
4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	701 break;
4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	702 }
4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	703 }
4baee598306d Date: Thu, 05 Jul 2007 14:02:33 -0700 Sam Lantinga <slouken@libsdl.org> parents: 2170 diff changeset	704
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	705 void
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	706 Cocoa_QuitKeyboard(_THIS)
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	707 {
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	708 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
2270 d5a11262f067 Date: Sun, 19 Aug 2007 18:29:28 +0200 Sam Lantinga <slouken@libsdl.org> parents: 2268 diff changeset	709 NSAutoreleasePool *pool;
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	710
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	711 SDL_DelKeyboard(data->keyboard);
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	712 }
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	713
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	714 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/cocoa/SDL_cocoakeyboard.m @ 3136:962357f325e1 gsoc2009_IME