|
@@ -41,8 +41,6 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
|
|
|
|
|
|
SDL_TouchID directTouchId;
|
|
|
SDL_TouchID indirectTouchId;
|
|
|
-
|
|
|
- UITouch * __weak firstFingerDown;
|
|
|
}
|
|
|
|
|
|
- (instancetype)initWithFrame:(CGRect)frame
|
|
@@ -218,18 +216,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- if (!firstFingerDown) {
|
|
|
- CGPoint locationInView = [self touchLocation:touch shouldNormalize:NO];
|
|
|
- int clicks = (int) touch.tapCount;
|
|
|
-
|
|
|
- /* send mouse moved event */
|
|
|
- SDL_SendMouseMotion(sdlwindow, SDL_TOUCH_MOUSEID, 0, locationInView.x, locationInView.y);
|
|
|
-
|
|
|
- /* send mouse down event */
|
|
|
- SDL_SendMouseButtonClicks(sdlwindow, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT, clicks);
|
|
|
-
|
|
|
- firstFingerDown = touch;
|
|
|
- }
|
|
|
+ /* FIXME, need to send: int clicks = (int) touch.tapCount; ? */
|
|
|
|
|
|
CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
|
|
|
SDL_SendTouch(touchId, (SDL_FingerID)((size_t)touch),
|
|
@@ -248,12 +235,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- if (touch == firstFingerDown) {
|
|
|
- /* send mouse up */
|
|
|
- int clicks = (int) touch.tapCount;
|
|
|
- SDL_SendMouseButtonClicks(sdlwindow, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT, clicks);
|
|
|
- firstFingerDown = nil;
|
|
|
- }
|
|
|
+ /* FIXME, need to send: int clicks = (int) touch.tapCount; ? */
|
|
|
|
|
|
CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
|
|
|
SDL_SendTouch(touchId, (SDL_FingerID)((size_t)touch),
|
|
@@ -277,13 +259,6 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- if (touch == firstFingerDown) {
|
|
|
- CGPoint locationInView = [self touchLocation:touch shouldNormalize:NO];
|
|
|
-
|
|
|
- /* send moved event */
|
|
|
- SDL_SendMouseMotion(sdlwindow, SDL_TOUCH_MOUSEID, 0, locationInView.x, locationInView.y);
|
|
|
- }
|
|
|
-
|
|
|
CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
|
|
|
SDL_SendTouchMotion(touchId, (SDL_FingerID)((size_t)touch),
|
|
|
locationInView.x, locationInView.y, pressure);
|