pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-implemented single mouse touches on the iPhone/iPad

Browse source
This commit is contained in:
Sam Lantinga 2010-07-06 22:08:19 -07:00
parent 52b4147239
commit 44280ae564
3 changed files with 40 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/video/uikit/SDL_uikitopengles.m
View file

@ -126,6 +126,9 @@ SDL_GLContext UIKit_GL_CreateContext(_THIS, SDL_Window * window)
return NULL;
}
/* Make this window the current mouse focus for touch input */
SDL_SetMouseFocus(window);
return view;
}

41
src/video/uikit/SDL_uikitview.m
View file

@ -101,12 +101,21 @@
/* re-calibrate relative mouse motion */
SDL_GetRelativeMouseState(i, NULL, NULL);
/* grab next touch */
touch = (UITouch*)[enumerator nextObject];
/* switch back to our old mouse */
SDL_SelectMouse(oldMouse);
/* grab next touch */
touch = (UITouch*)[enumerator nextObject];
}
#else
if (touch) {
CGPoint locationInView = [touch locationInView: self];
/* send moved event */
SDL_SendMouseMotion(NULL, 0, locationInView.x, locationInView.y);
/* send mouse down event */
SDL_SendMouseButton(NULL, SDL_PRESSED, SDL_BUTTON_LEFT);
}
#endif
}
@ -114,10 +123,10 @@
- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
NSEnumerator *enumerator = [touches objectEnumerator];
UITouch *touch=nil;
UITouch *touch = (UITouch*)[enumerator nextObject];
#if FIXME_MULTITOUCH
while(touch = (UITouch *)[enumerator nextObject]) {
while(touch) {
/* search for the mouse slot associated with this touch */
int i, found = NO;
for (i=0; i<MAX_SIMULTANEOUS_TOUCHES && !found; i++) {
@ -131,6 +140,14 @@
found = YES;
}
}
/* grab next touch */
touch = (UITouch*)[enumerator nextObject];
}
#else
if (touch) {
/* send mouse up */
SDL_SendMouseButton(NULL, SDL_RELEASED, SDL_BUTTON_LEFT);
}
#endif
}
@ -147,10 +164,10 @@
- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
NSEnumerator *enumerator = [touches objectEnumerator];
UITouch *touch=nil;
UITouch *touch = (UITouch*)[enumerator nextObject];
#if FIXME_MULTITOUCH
while(touch = (UITouch *)[enumerator nextObject]) {
while(touch) {
/* try to find the mouse associated with this touch */
int i, found = NO;
for (i=0; i<MAX_SIMULTANEOUS_TOUCHES && !found; i++) {
@ -163,6 +180,16 @@
found = YES;
}
}
/* grab next touch */
touch = (UITouch*)[enumerator nextObject];
}
#else
if (touch) {
CGPoint locationInView = [touch locationInView: self];
/* send moved event */
SDL_SendMouseMotion(NULL, 0, locationInView.x, locationInView.y);
}
#endif
}