sdl-ios-xcode: src/video/uikit/SDL

annotate src/video/uikit/SDL_uikitview.m @ 5051:a69e36365766

Fixed bug #1027 Vittorio Giovara 2010-07-17 19:21:36 PDT fix the double free error in SDL_uikitview the variable 'textfield' is initialialized and set to autorelease. however in the dealloc method a second [release] is sent. If the textfield has not been set to nil before (with a viewDidUnload for example) this can lead to awful hard-to-find crashes when the SDL code terminates. the error message is -[textfield release] message sent to deallocated instance 0x4e5fa90 the fix is simple, just release the object as soon as it is added to the subview, see attached patch

author	Sam Lantinga <slouken@libsdl.org>
date	Wed, 19 Jan 2011 23:45:29 -0800
parents	c24ba2cc9583
children	25d4feb7c127

rev	line source
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
2859 99210400e8b9 Updated copyright date Sam Lantinga <slouken@libsdl.org> parents: 2765 diff changeset	3 Copyright (C) 1997-2009 Sam Lantinga
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23 #import "SDL_uikitview.h"
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24
4490 06c7423f8c60 Updated iPhone keyboard code (which builds and runs on the iPad and iPhone simulator now) Sam Lantinga <slouken@libsdl.org> parents: 4488 diff changeset	25 #include "../../events/SDL_keyboard_c.h"
06c7423f8c60 Updated iPhone keyboard code (which builds and runs on the iPad and iPhone simulator now) Sam Lantinga <slouken@libsdl.org> parents: 4488 diff changeset	26 #include "../../events/SDL_mouse_c.h"
4677 31607094315c Added Iphone project. Iphone multi-touch is now functional. jimtla parents: 4662 diff changeset	27 #include "../../events/SDL_touch_c.h"
4490 06c7423f8c60 Updated iPhone keyboard code (which builds and runs on the iPad and iPhone simulator now) Sam Lantinga <slouken@libsdl.org> parents: 4488 diff changeset	28
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 #if SDL_IPHONE_KEYBOARD
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30 #import "keyinfotable.h"
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31 #import "SDL_uikitappdelegate.h"
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32 #import "SDL_uikitwindow.h"
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	33 #endif
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35 @implementation SDL_uikitview
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	36
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	37 - (void)dealloc {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38 [super dealloc];
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	41 - (id)initWithFrame:(CGRect)frame {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	43 self = [super initWithFrame: frame];
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45 #if SDL_IPHONE_KEYBOARD
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46 [self initializeKeyboard];
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	47 #endif
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48
4677 31607094315c Added Iphone project. Iphone multi-touch is now functional. jimtla parents: 4662 diff changeset	49 #ifdef FIXED_MULTITOUCH
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	50 SDL_Touch touch;
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	51 touch.id = 0; //TODO: Should be -1?
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	52
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	53 //touch.driverdata = SDL_malloc(sizeof(EventTouchData));
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	54 //EventTouchData* data = (EventTouchData*)(touch.driverdata);
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	55
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	56 touch.x_min = 0;
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	57 touch.x_max = frame.size.width;
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4677 diff changeset	58 touch.native_xres = touch.x_max - touch.x_min;
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	59 touch.y_min = 0;
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	60 touch.y_max = frame.size.height;
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4677 diff changeset	61 touch.native_yres = touch.y_max - touch.y_min;
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	62 touch.pressure_min = 0;
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	63 touch.pressure_max = 1;
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4677 diff changeset	64 touch.native_pressureres = touch.pressure_max - touch.pressure_min;
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	65
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	66
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	67 touchId = SDL_AddTouch(&touch, "IPHONE SCREEN");
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	68 #endif
4661 03dcb795c583 Merged changes from the main SDL codebase Sam Lantinga <slouken@libsdl.org> parents: 4660 4490 diff changeset	69
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70 return self;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74 - (void)touchesBegan:(NSSet )touches withEvent:(UIEvent )event {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	75
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76 NSEnumerator *enumerator = [touches objectEnumerator];
4488 6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	77 UITouch touch = (UITouch)[enumerator nextObject];
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78
4677 31607094315c Added Iphone project. Iphone multi-touch is now functional. jimtla parents: 4662 diff changeset	79 //NSLog("Click");
31607094315c Added Iphone project. Iphone multi-touch is now functional. jimtla parents: 4662 diff changeset	80
4488 6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	81 if (touch) {
6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	82 CGPoint locationInView = [touch locationInView: self];
6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	83
6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	84 /* send moved event */
6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	85 SDL_SendMouseMotion(NULL, 0, locationInView.x, locationInView.y);
6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	86
6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	87 /* send mouse down event */
6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	88 SDL_SendMouseButton(NULL, SDL_PRESSED, SDL_BUTTON_LEFT);
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	89 }
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	90
4677 31607094315c Added Iphone project. Iphone multi-touch is now functional. jimtla parents: 4662 diff changeset	91 #ifdef FIXED_MULTITOUCH
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	92 while(touch) {
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	93 CGPoint locationInView = [touch locationInView: self];
4662 3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	94
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	95
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	96 #ifdef IPHONE_TOUCH_EFFICIENT_DANGEROUS
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	97 //FIXME: TODO: Using touch as the fingerId is potentially dangerous
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	98 //It is also much more efficient than storing the UITouch pointer
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	99 //and comparing it to the incoming event.
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	100 SDL_SendFingerDown(touchId,(long)touch,
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	101 SDL_TRUE,locationInView.x,locationInView.y,
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	102 1);
4662 3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	103 #else
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	104 int i;
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	105 for(i = 0;i < MAX_SIMULTANEOUS_TOUCHES;i++) {
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	106 if(finger[i] == NULL) {
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	107 finger[i] = touch;
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	108 SDL_SendFingerDown(touchId,i,
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	109 SDL_TRUE,locationInView.x,locationInView.y,
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	110 1);
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	111 break;
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	112 }
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	113 }
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	114 #endif
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	115
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	116
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	117
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	118
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	119 touch = (UITouch*)[enumerator nextObject];
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	120 }
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	121 #endif
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	122 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	123
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	124 - (void)touchesEnded:(NSSet )touches withEvent:(UIEvent )event {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	125
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 NSEnumerator *enumerator = [touches objectEnumerator];
4488 6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	127 UITouch touch = (UITouch)[enumerator nextObject];
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	128
4488 6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	129 if (touch) {
6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	130 /* send mouse up */
6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	131 SDL_SendMouseButton(NULL, SDL_RELEASED, SDL_BUTTON_LEFT);
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132 }
4661 03dcb795c583 Merged changes from the main SDL codebase Sam Lantinga <slouken@libsdl.org> parents: 4660 4490 diff changeset	133
4677 31607094315c Added Iphone project. Iphone multi-touch is now functional. jimtla parents: 4662 diff changeset	134 #ifdef FIXED_MULTITOUCH
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	135 while(touch) {
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	136 CGPoint locationInView = [touch locationInView: self];
4662 3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	137
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	138
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	139 #ifdef IPHONE_TOUCH_EFFICIENT_DANGEROUS
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	140 SDL_SendFingerDown(touchId,(long)touch,
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	141 SDL_FALSE,locationInView.x,locationInView.y,
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	142 1);
4662 3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	143 #else
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	144 int i;
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	145 for(i = 0;i < MAX_SIMULTANEOUS_TOUCHES;i++) {
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	146 if(finger[i] == touch) {
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	147 SDL_SendFingerDown(touchId,i,
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	148 SDL_FALSE,locationInView.x,locationInView.y,
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	149 1);
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	150 break;
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	151 }
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	152 }
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	153 #endif
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	154
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	155 touch = (UITouch*)[enumerator nextObject];
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	156 }
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	157 #endif
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	158 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	159
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	160 - (void)touchesCancelled:(NSSet )touches withEvent:(UIEvent )event {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	161 /*
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	162 this can happen if the user puts more than 5 touches on the screen
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	163 at once, or perhaps in other circumstances. Usually (it seems)
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	164 all active touches are canceled.
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	165 */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	166 [self touchesEnded: touches withEvent: event];
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	167 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	168
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	169 - (void)touchesMoved:(NSSet )touches withEvent:(UIEvent )event {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	170
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	171 NSEnumerator *enumerator = [touches objectEnumerator];
4488 6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	172 UITouch touch = (UITouch)[enumerator nextObject];
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	173
4488 6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	174 if (touch) {
6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	175 CGPoint locationInView = [touch locationInView: self];
6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	176
6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	177 /* send moved event */
6dc6a2bdd55e Re-implemented single mouse touches on the iPhone/iPad Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	178 SDL_SendMouseMotion(NULL, 0, locationInView.x, locationInView.y);
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	179 }
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	180
4677 31607094315c Added Iphone project. Iphone multi-touch is now functional. jimtla parents: 4662 diff changeset	181 #ifdef FIXED_MULTITOUCH
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	182 while(touch) {
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	183 CGPoint locationInView = [touch locationInView: self];
4662 3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	184
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	185
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	186 #ifdef IPHONE_TOUCH_EFFICIENT_DANGEROUS
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	187 SDL_SendTouchMotion(touchId,(long)touch,
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	188 SDL_FALSE,locationInView.x,locationInView.y,
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	189 1);
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	190 #else
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	191 int i;
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	192 for(i = 0;i < MAX_SIMULTANEOUS_TOUCHES;i++) {
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	193 if(finger[i] == touch) {
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	194 SDL_SendTouchMotion(touchId,i,
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	195 SDL_FALSE,locationInView.x,locationInView.y,
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	196 1);
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	197 break;
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	198 }
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	199 }
3c4e0130c9b1 Added alternative finger tracking method. Still prefer IPHONE_TOUCH_EFFICIENT_DANGEROUS. Jim Grandpre <jim.tla@gmail.com> parents: 4661 diff changeset	200 #endif
4660 b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	201
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	202 touch = (UITouch*)[enumerator nextObject];
b15e7017409b Added Iphone support (untested) Jim Grandpre <jim.tla@gmail.com> parents: 3685 diff changeset	203 }
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	204 #endif
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	205 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	206
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	207 /*
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	208 ---- Keyboard related functionality below this line ----
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	209 */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	210 #if SDL_IPHONE_KEYBOARD
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	211
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	212 /* Is the iPhone virtual keyboard visible onscreen? */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	213 - (BOOL)keyboardVisible {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	214 return keyboardVisible;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	215 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	216
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	217 /* Set ourselves up as a UITextFieldDelegate */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	218 - (void)initializeKeyboard {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	219
5051 a69e36365766 Fixed bug #1027 Sam Lantinga <slouken@libsdl.org> parents: 4694 diff changeset	220 textField = [[UITextField alloc] initWithFrame: CGRectZero];
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	221 textField.delegate = self;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	222 /* placeholder so there is something to delete! */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	223 textField.text = @" ";
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	224
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	225 /* set UITextInputTrait properties, mostly to defaults */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	226 textField.autocapitalizationType = UITextAutocapitalizationTypeNone;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	227 textField.autocorrectionType = UITextAutocorrectionTypeNo;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	228 textField.enablesReturnKeyAutomatically = NO;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	229 textField.keyboardAppearance = UIKeyboardAppearanceDefault;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	230 textField.keyboardType = UIKeyboardTypeDefault;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	231 textField.returnKeyType = UIReturnKeyDefault;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	232 textField.secureTextEntry = NO;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	233
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	234 textField.hidden = YES;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	235 keyboardVisible = NO;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	236 /* add the UITextField (hidden) to our view */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	237 [self addSubview: textField];
5051 a69e36365766 Fixed bug #1027 Sam Lantinga <slouken@libsdl.org> parents: 4694 diff changeset	238 [textField release];
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	239 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	240
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	241 /* reveal onscreen virtual keyboard */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	242 - (void)showKeyboard {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	243 keyboardVisible = YES;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	244 [textField becomeFirstResponder];
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	245 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	246
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	247 /* hide onscreen virtual keyboard */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	248 - (void)hideKeyboard {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	249 keyboardVisible = NO;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	250 [textField resignFirstResponder];
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	251 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	252
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	253 /* UITextFieldDelegate method. Invoked when user types something. */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	254 - (BOOL)textField:(UITextField )_textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString )string {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	255
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	256 if ([string length] == 0) {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	257 /* it wants to replace text with nothing, ie a delete */
4490 06c7423f8c60 Updated iPhone keyboard code (which builds and runs on the iPad and iPhone simulator now) Sam Lantinga <slouken@libsdl.org> parents: 4488 diff changeset	258 SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_DELETE);
06c7423f8c60 Updated iPhone keyboard code (which builds and runs on the iPad and iPhone simulator now) Sam Lantinga <slouken@libsdl.org> parents: 4488 diff changeset	259 SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_DELETE);
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	260 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	261 else {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	262 /* go through all the characters in the string we've been sent
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	263 and convert them to key presses */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	264 int i;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	265 for (i=0; i<[string length]; i++) {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	266
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	267 unichar c = [string characterAtIndex: i];
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	268
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	269 Uint16 mod = 0;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	270 SDL_scancode code;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	271
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	272 if (c < 127) {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	273 /* figure out the SDL_scancode and SDL_keymod for this unichar */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	274 code = unicharToUIKeyInfoTable[c].code;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	275 mod = unicharToUIKeyInfoTable[c].mod;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	276 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	277 else {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	278 /* we only deal with ASCII right now */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	279 code = SDL_SCANCODE_UNKNOWN;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	280 mod = 0;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	281 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	282
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	283 if (mod & KMOD_SHIFT) {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	284 /* If character uses shift, press shift down */
4490 06c7423f8c60 Updated iPhone keyboard code (which builds and runs on the iPad and iPhone simulator now) Sam Lantinga <slouken@libsdl.org> parents: 4488 diff changeset	285 SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_LSHIFT);
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	286 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	287 /* send a keydown and keyup even for the character */
4490 06c7423f8c60 Updated iPhone keyboard code (which builds and runs on the iPad and iPhone simulator now) Sam Lantinga <slouken@libsdl.org> parents: 4488 diff changeset	288 SDL_SendKeyboardKey(SDL_PRESSED, code);
06c7423f8c60 Updated iPhone keyboard code (which builds and runs on the iPad and iPhone simulator now) Sam Lantinga <slouken@libsdl.org> parents: 4488 diff changeset	289 SDL_SendKeyboardKey(SDL_RELEASED, code);
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	290 if (mod & KMOD_SHIFT) {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	291 /* If character uses shift, press shift back up */
4490 06c7423f8c60 Updated iPhone keyboard code (which builds and runs on the iPad and iPhone simulator now) Sam Lantinga <slouken@libsdl.org> parents: 4488 diff changeset	292 SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_LSHIFT);
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	293 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	294 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	295 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	296 return NO; /* don't allow the edit! (keep placeholder text there) */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	297 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	298
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	299 /* Terminates the editing session */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	300 - (BOOL)textFieldShouldReturn:(UITextField*)_textField {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	301 [self hideKeyboard];
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	302 return YES;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	303 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	304
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	305 #endif
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	306
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	307 @end
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	308
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	309 /* iPhone keyboard addition functions */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	310 #if SDL_IPHONE_KEYBOARD
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	311
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	312 int SDL_iPhoneKeyboardShow(SDL_Window * window) {
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	313
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	314 SDL_WindowData *data;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	315 SDL_uikitview *view;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	316
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	317 if (NULL == window) {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	318 SDL_SetError("Window does not exist");
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	319 return -1;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	320 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	321
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	322 data = (SDL_WindowData *)window->driverdata;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	323 view = data->view;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	324
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	325 if (nil == view) {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	326 SDL_SetError("Window has no view");
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	327 return -1;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	328 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	329 else {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	330 [view showKeyboard];
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	331 return 0;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	332 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	333 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	334
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	335 int SDL_iPhoneKeyboardHide(SDL_Window * window) {
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	336
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	337 SDL_WindowData *data;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	338 SDL_uikitview *view;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	339
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	340 if (NULL == window) {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	341 SDL_SetError("Window does not exist");
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	342 return -1;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	343 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	344
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	345 data = (SDL_WindowData *)window->driverdata;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	346 view = data->view;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	347
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	348 if (NULL == view) {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	349 SDL_SetError("Window has no view");
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	350 return -1;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	351 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	352 else {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	353 [view hideKeyboard];
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	354 return 0;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	355 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	356 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	357
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	358 SDL_bool SDL_iPhoneKeyboardIsShown(SDL_Window * window) {
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	359
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	360 SDL_WindowData *data;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	361 SDL_uikitview *view;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	362
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	363 if (NULL == window) {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	364 SDL_SetError("Window does not exist");
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	365 return -1;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	366 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	367
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	368 data = (SDL_WindowData *)window->driverdata;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	369 view = data->view;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	370
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	371 if (NULL == view) {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	372 SDL_SetError("Window has no view");
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	373 return 0;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	374 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	375 else {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	376 return view.keyboardVisible;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	377 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	378 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	379
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	380 int SDL_iPhoneKeyboardToggle(SDL_Window * window) {
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	381
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	382 SDL_WindowData *data;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	383 SDL_uikitview *view;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	384
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	385 if (NULL == window) {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	386 SDL_SetError("Window does not exist");
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	387 return -1;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	388 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	389
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	390 data = (SDL_WindowData *)window->driverdata;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	391 view = data->view;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	392
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	393 if (NULL == view) {
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	394 SDL_SetError("Window has no view");
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	395 return -1;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	396 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	397 else {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	398 if (SDL_iPhoneKeyboardIsShown(window)) {
64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	399 SDL_iPhoneKeyboardHide(window);
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	400 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	401 else {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	402 SDL_iPhoneKeyboardShow(window);
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	403 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	404 return 0;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	405 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	406 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	407
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	408 #else
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	409
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	410 /* stubs, used if compiled without keyboard support */
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	411
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	412 int SDL_iPhoneKeyboardShow(SDL_Window * window) {
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	413 SDL_SetError("Not compiled with keyboard support");
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	414 return -1;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	415 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	416
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	417 int SDL_iPhoneKeyboardHide(SDL_Window * window) {
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	418 SDL_SetError("Not compiled with keyboard support");
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	419 return -1;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	420 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	421
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	422 SDL_bool SDL_iPhoneKeyboardIsShown(SDL_Window * window) {
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	423 return 0;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	424 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	425
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	426 int SDL_iPhoneKeyboardToggle(SDL_Window * window) {
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	427 SDL_SetError("Not compiled with keyboard support");
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	428 return -1;
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	429 }
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	430
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	431
2859 99210400e8b9 Updated copyright date Sam Lantinga <slouken@libsdl.org> parents: 2765 diff changeset	432 #endif /* SDL_IPHONE_KEYBOARD */

Mercurial > sdl-ios-xcode

annotate src/video/uikit/SDL_uikitview.m @ 5051:a69e36365766