Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Added Iphone project. Iphone multi-touch is now functional.

  • Loading branch information
jimtla committed Jul 30, 2010
1 parent 2677e0b commit 9c24bb50c402e2d28ec0a3a887fe0fa6982566e7
Showing with 24,663 additions and 6 deletions.
  1. +1 −1 Xcode-iPhoneOS/Demos/DemosiPhoneOS.xcodeproj/project.pbxproj
  2. +7 −0 src/events/SDL_touch_c.h
  3. +4 −1 src/video/uikit/SDL_uikitview.h
  4. +7 −4 src/video/uikit/SDL_uikitview.m
  5. BIN touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/Default.png
  6. BIN touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/Icon.png
  7. +28 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/Info.plist
  8. +165 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL.h
  9. +241 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_assert.h
  10. +216 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_atomic.h
  11. +510 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_audio.h
  12. +76 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_clipboard.h
  13. +343 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_compat.h
  14. +47 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_config.h.default
  15. +313 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_config.h.generated
  16. +312 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_config.h.in
  17. +155 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_config_iphoneos.h
  18. +165 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_config_macosx.h
  19. +68 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_config_minimal.h
  20. +121 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_config_nintendods.h
  21. +127 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_config_pandora.h
  22. +197 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_config_win32.h
  23. +126 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_config_wiz.h
  24. +21 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_copying.h
  25. +97 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_cpuinfo.h
  26. +253 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_endian.h
  27. +78 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_error.h
  28. +624 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_events.h
  29. +90 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_gesture.h
  30. +1,123 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_haptic.h
  31. +88 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_input.h
  32. +209 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_joystick.h
  33. +170 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_keyboard.h
  34. +342 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_keysym.h
  35. +86 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_loadso.h
  36. +96 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_main.h
  37. +205 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_mouse.h
  38. +223 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_mutex.h
  39. +11 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_name.h
  40. +9,333 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_opengl.h
  41. +1,039 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_opengles.h
  42. +398 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_pixels.h
  43. +154 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_platform.h
  44. +80 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_power.h
  45. +59 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_quit.h
  46. +137 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_rect.h
  47. +206 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_rwops.h
  48. +399 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_scancode.h
  49. +792 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_stdinc.h
  50. +700 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_surface.h
  51. +244 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_syswm.h
  52. +163 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_thread.h
  53. +153 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_timer.h
  54. +119 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_touch.h
  55. +30 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_types.h
  56. +158 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_version.h
  57. +1,458 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/SDL_video.h
  58. +136 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/begin_code.h
  59. +38 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/close_code.h
  60. +1,229 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/include/doxyfile
  61. +1 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/lib/libSDLiPhoneOS.a
  62. +422 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/main.c
  63. +270 −0 touchTest/Iphone Test/touchTestIPhone2/touchTestIPhone/touchTestIPhone.xcodeproj/project.pbxproj
@@ -109,7 +109,7 @@
isa = PBXContainerItemProxy;
containerPortal = FD1B48920E313154007AB34E /* SDLiPhoneOS.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 006E982211955059001DE610 /* testsdl.app */;
remoteGlobalIDString = 006E982211955059001DE610;
remoteInfo = testsdl;
};
FD1B489D0E313154007AB34E /* PBXContainerItemProxy */ = {
@@ -58,6 +58,10 @@ extern void SDL_SetTouchFocus(long id, SDL_Window * window);
extern int SDL_SendTouchMotion(long id, long fingerid,
int relative, float x, float y, float z);

/* Send a touch down/up event for a touch */
extern int SDL_SendFingerDown(long id, long fingerid, SDL_bool down,
float x, float y, float pressure);

/* Send a touch button event for a touch */
extern int SDL_SendTouchButton(long id, Uint8 state, Uint8 button);

@@ -67,6 +71,9 @@ extern void SDL_TouchQuit(void);
/* Get the index of a touch device */
extern int SDL_GetTouchIndexId(long id);

/* Print a debug message for a nonexistent touch */
extern int SDL_TouchNotFoundError(long id);

#endif /* _SDL_touch_c_h */

/* vi: set ts=4 sw=4 expandtab: */
@@ -23,6 +23,9 @@
#include "SDL_stdinc.h"
#include "SDL_events.h"

#define IPHONE_TOUCH_EFFICIENT_DANGEROUS
#define FIXED_MULTITOUCH

#ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS
#define MAX_SIMULTANEOUS_TOUCHES 5
#endif
@@ -34,7 +37,7 @@
@interface SDL_uikitview : UIView {
#endif

#if FIXED_MULTITOUCH
#ifdef FIXED_MULTITOUCH
long touchId;
#ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS
UITouch *finger[MAX_SIMULTANEOUS_TOUCHES];
@@ -24,6 +24,7 @@

#include "../../events/SDL_keyboard_c.h"
#include "../../events/SDL_mouse_c.h"
#include "../../events/SDL_touch_c.h"

#if SDL_IPHONE_KEYBOARD
#import "keyinfotable.h"
@@ -48,7 +49,7 @@ - (id)initWithFrame:(CGRect)frame {
[self initializeKeyboard];
#endif

#if FIXED_MULTITOUCH
#ifdef FIXED_MULTITOUCH
SDL_Touch touch;
touch.id = 0; //TODO: Should be -1?

@@ -78,6 +79,8 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
NSEnumerator *enumerator = [touches objectEnumerator];
UITouch *touch = (UITouch*)[enumerator nextObject];

//NSLog("Click");

if (touch) {
CGPoint locationInView = [touch locationInView: self];

@@ -88,7 +91,7 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
SDL_SendMouseButton(NULL, SDL_PRESSED, SDL_BUTTON_LEFT);
}

#if FIXED_MULTITOUCH
#ifdef FIXED_MULTITOUCH
while(touch) {
CGPoint locationInView = [touch locationInView: self];

@@ -131,7 +134,7 @@ - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
SDL_SendMouseButton(NULL, SDL_RELEASED, SDL_BUTTON_LEFT);
}

#if FIXED_MULTITOUCH
#ifdef FIXED_MULTITOUCH
while(touch) {
CGPoint locationInView = [touch locationInView: self];

@@ -178,7 +181,7 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
SDL_SendMouseMotion(NULL, 0, locationInView.x, locationInView.y);
}

#if FIXED_MULTITOUCH
#ifdef FIXED_MULTITOUCH
while(touch) {
CGPoint locationInView = [touch locationInView: self];

Binary file not shown.
Binary file not shown.
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string>Icon</string>
<key>CFBundleIdentifier</key>
<string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>LSRequiresIPhoneOS</key>
<false/>
</dict>
</plist>
@@ -0,0 +1,165 @@
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997-2010 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Sam Lantinga
slouken@libsdl.org
*/

/**
* \file SDL.h
*
* Main include header for the SDL library
*/

/**
* \mainpage Simple DirectMedia Layer (SDL)
*
* http://www.libsdl.org/
*
* \section intro_sec Introduction
*
* This is the Simple DirectMedia Layer, a general API that provides low
* level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL,
* and 2D framebuffer across multiple platforms.
*
* The current version supports Windows, Windows CE, Mac OS X, Linux,
* FreeBSD, NetBSD, OpenBSD, BSD/OS, Solaris, and QNX. The code contains
* support for other operating systems but those are not officially supported.
*
* SDL is written in C, but works with C++ natively, and has bindings to
* several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,
* Guile, Haskell, Java, Lisp, Lua, ML, Objective C, Pascal, Perl, PHP,
* Pike, Pliant, Python, Ruby, and Smalltalk.
*
* This library is distributed under GNU LGPL version 2, which can be
* found in the file "COPYING". This license allows you to use SDL
* freely in commercial programs as long as you link with the dynamic
* library.
*
* The best way to learn how to use SDL is to check out the header files in
* the "include" subdirectory and the programs in the "test" subdirectory.
* The header files and test programs are well commented and always up to date.
* More documentation is available in HTML format in "docs/index.html", and
* a documentation wiki is available online at:
* http://www.libsdl.org/cgi/docwiki.cgi
*
* The test programs in the "test" subdirectory are in the public domain.
*
* Frequently asked questions are answered online:
* http://www.libsdl.org/faq.php
*
* If you need help with the library, or just want to discuss SDL related
* issues, you can join the developers mailing list:
* http://www.libsdl.org/mailing-list.php
*
* Enjoy!
* Sam Lantinga (slouken@libsdl.org)
*/

#ifndef _SDL_H
#define _SDL_H

#include "SDL_main.h"
#include "SDL_stdinc.h"
#include "SDL_atomic.h"
#include "SDL_audio.h"
#include "SDL_clipboard.h"
#include "SDL_cpuinfo.h"
#include "SDL_endian.h"
#include "SDL_error.h"
#include "SDL_events.h"
#include "SDL_loadso.h"
#include "SDL_mutex.h"
#include "SDL_power.h"
#include "SDL_rwops.h"
#include "SDL_thread.h"
#include "SDL_timer.h"
#include "SDL_version.h"
#include "SDL_video.h"
#include "SDL_compat.h"

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
/* *INDENT-OFF* */
extern "C" {
/* *INDENT-ON* */
#endif

/* As of version 0.5, SDL is loaded dynamically into the application */

/**
* \name SDL_INIT_*
*
* These are the flags which may be passed to SDL_Init(). You should
* specify the subsystems which you will be using in your application.
*/
/*@{*/
#define SDL_INIT_TIMER 0x00000001
#define SDL_INIT_AUDIO 0x00000010
#define SDL_INIT_VIDEO 0x00000020
#define SDL_INIT_JOYSTICK 0x00000200
#define SDL_INIT_HAPTIC 0x00001000
#define SDL_INIT_NOPARACHUTE 0x00100000 /**< Don't catch fatal signals */
#define SDL_INIT_EVENTTHREAD 0x01000000 /**< Not supported on all OS's */
#define SDL_INIT_EVERYTHING 0x0000FFFF
/*@}*/

/**
* This function loads the SDL dynamically linked library and initializes
* the subsystems specified by \c flags (and those satisfying dependencies).
* Unless the ::SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
* signal handlers for some commonly ignored fatal signals (like SIGSEGV).
*/
extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);

/**
* This function initializes specific SDL subsystems
*/
extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);

/**
* This function cleans up specific SDL subsystems
*/
extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);

/**
* This function returns mask of the specified subsystems which have
* been initialized.
*
* If \c flags is 0, it returns a mask of all initialized subsystems.
*/
extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);

/**
* This function cleans up all initialized subsystems and unloads the
* dynamically linked library. You should call it upon all exit conditions.
*/
extern DECLSPEC void SDLCALL SDL_Quit(void);

/* Ends C function definitions when using C++ */
#ifdef __cplusplus
/* *INDENT-OFF* */
}
/* *INDENT-ON* */
#endif
#include "close_code.h"

#endif /* _SDL_H */

/* vi: set ts=4 sw=4 expandtab: */

0 comments on commit 9c24bb5

Please sign in to comment.