comparison src/video/uikit/SDL_uikitview.h @ 4694:c24ba2cc9583

Merged Jim's Google Summer of Code work from SDL-gsoc2010_gesture
author Sam Lantinga <slouken@libsdl.org>
date Sun, 22 Aug 2010 12:07:55 -0700
parents 31607094315c
children b915b3181cc2
comparison
equal deleted inserted replaced
4638:08d22c54a21f 4694:c24ba2cc9583
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Lesser General Public License for more details. 13 Lesser General Public License for more details.
14 14
15 You should have received a copy of the GNU Lesser General Public 15 You should have received a copy of the GNU Lesser General Public
16 License along with this library; if not, write to the Free Software 16 License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
18 17
19 Sam Lantinga 18 Sam Lantinga
20 slouken@libsdl.org 19 slouken@libsdl.org
21 */ 20 */
22 21
23 #import <UIKit/UIKit.h> 22 #import <UIKit/UIKit.h>
24 #include "SDL_stdinc.h" 23 #include "SDL_stdinc.h"
25 #include "SDL_events.h" 24 #include "SDL_events.h"
26 25
27 #if SDL_IPHONE_MULTIPLE_MICE 26 #define IPHONE_TOUCH_EFFICIENT_DANGEROUS
27 #define FIXED_MULTITOUCH
28
29 #ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS
28 #define MAX_SIMULTANEOUS_TOUCHES 5 30 #define MAX_SIMULTANEOUS_TOUCHES 5
29 #else
30 #define MAX_SIMULTANEOUS_TOUCHES 1
31 #endif 31 #endif
32 32
33 /* *INDENT-OFF* */ 33 /* *INDENT-OFF* */
34 #if SDL_IPHONE_KEYBOARD 34 #if SDL_IPHONE_KEYBOARD
35 @interface SDL_uikitview : UIView<UITextFieldDelegate> { 35 @interface SDL_uikitview : UIView<UITextFieldDelegate> {
36 #else 36 #else
37 @interface SDL_uikitview : UIView { 37 @interface SDL_uikitview : UIView {
38 #endif 38 #endif
39 39
40 #if FIXME_MULTITOUCH 40 #ifdef FIXED_MULTITOUCH
41 SDL_Mouse mice[MAX_SIMULTANEOUS_TOUCHES]; 41 long touchId;
42 #ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS
43 UITouch *finger[MAX_SIMULTANEOUS_TOUCHES];
44 #endif
42 #endif 45 #endif
43 46
44 #if SDL_IPHONE_KEYBOARD 47 #if SDL_IPHONE_KEYBOARD
45 UITextField *textField; 48 UITextField *textField;
46 BOOL keyboardVisible; 49 BOOL keyboardVisible;