diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java index ca1e1a304d..5fc4c386e3 100644 --- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java +++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java @@ -1086,9 +1086,9 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh public static native boolean nativeAllowRecreateActivity(); public static native int nativeCheckSDLThreadCounter(); public static native void onNativeFileDialog(int requestCode, String[] filelist, int filter); - public static native void onNativePinchStart(); + public static native void onNativePinchStart(float span_x, float span_y, float focus_x, float focus_y); public static native void onNativePinchUpdate(float scale, float span_x, float span_y, float focus_x, float focus_y); - public static native void onNativePinchEnd(); + public static native void onNativePinchEnd(float span_x, float span_y, float focus_x, float focus_y); /** * This method is called by SDL using JNI. diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLSurface.java b/android-project/app/src/main/java/org/libsdl/app/SDLSurface.java index 4ff154aa30..1314cee329 100644 --- a/android-project/app/src/main/java/org/libsdl/app/SDLSurface.java +++ b/android-project/app/src/main/java/org/libsdl/app/SDLSurface.java @@ -441,13 +441,21 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, @Override public boolean onScaleBegin(ScaleGestureDetector detector) { - SDLActivity.onNativePinchStart(); + float span_x = getNormalizedX(detector.getCurrentSpanX()); + float span_y = getNormalizedY(detector.getCurrentSpanY()); + float focus_x = getNormalizedX(detector.getFocusX()); + float focus_y = getNormalizedY(detector.getFocusY()); + SDLActivity.onNativePinchStart(span_x, span_y, focus_x, focus_y); return true; } @Override public void onScaleEnd(ScaleGestureDetector detector) { - SDLActivity.onNativePinchEnd(); + float span_x = getNormalizedX(detector.getCurrentSpanX()); + float span_y = getNormalizedY(detector.getCurrentSpanY()); + float focus_x = getNormalizedX(detector.getFocusX()); + float focus_y = getNormalizedY(detector.getFocusY()); + SDLActivity.onNativePinchEnd(span_x, span_y, focus_x, focus_y); } } diff --git a/include/SDL3/SDL_events.h b/include/SDL3/SDL_events.h index def949309b..54ea84055c 100644 --- a/include/SDL3/SDL_events.h +++ b/include/SDL3/SDL_events.h @@ -802,11 +802,11 @@ typedef struct SDL_PinchFingerEvent Uint32 reserved; Uint64 timestamp; /**< In nanoseconds, populated using SDL_GetTicksNS() */ float scale; /**< The scale change since the last SDL_EVENT_PINCH_UPDATE. Scale < 1 is "zoom out". Scale > 1 is "zoom in". */ + float span_x; /**< The average X distance between each of the pointers forming the pinch in screen pixel coordinates. Or, -1 if this information is unavailable. */ + float span_y; /**< The average Y distance between each of the pointers forming the pinch in screen pixel coordinates. Or, -1 if this information is unavailable. */ + float focus_x; /**< The X coordinate of the current gesture's focal point in screen pixel coordinates. Or, -1 if this information is unavailable. */ + float focus_y; /**< The Y coordinate of the current gesture's focal point in screen pixel coordinates. Or, -1 if this information is unavailable. */ SDL_WindowID windowID; /**< The window underneath the finger, if any */ - float span_x; /**< The average X distance between each of the pointers forming the pinch in screen pixel coordinates. */ - float span_y; /**< The average Y distance between each of the pointers forming the pinch in screen pixel coordinates. */ - float focus_x; /**< The X coordinate of the current gesture's focal point in screen pixel coordinates. */ - float focus_y; /**< The Y coordinate of the current gesture's focal point in screen pixel coordinates. */ } SDL_PinchFingerEvent; /** diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c index 681178d83b..9307f4a2fd 100644 --- a/src/core/android/SDL_android.c +++ b/src/core/android/SDL_android.c @@ -122,14 +122,16 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeTouch)( jint action, jfloat x, jfloat y, jfloat p); JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativePinchStart)( - JNIEnv *env, jclass jcls); + JNIEnv *env, jclass jcls, + jfloat span_x, jfloat span_y, jfloat focus_x, jfloat focus_y); JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativePinchUpdate)( JNIEnv *env, jclass jcls, jfloat scale, jfloat span_x, jfloat span_y, jfloat focus_x, jfloat focus_y); JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativePinchEnd)( - JNIEnv *env, jclass jcls); + JNIEnv *env, jclass jcls, + jfloat span_x, jfloat span_y, jfloat focus_x, jfloat focus_y); JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeMouse)( JNIEnv *env, jclass jcls, @@ -231,9 +233,9 @@ static JNINativeMethod SDLActivity_tab[] = { { "onNativeSoftReturnKey", "()Z", SDL_JAVA_INTERFACE(onNativeSoftReturnKey) }, { "onNativeKeyboardFocusLost", "()V", SDL_JAVA_INTERFACE(onNativeKeyboardFocusLost) }, { "onNativeTouch", "(IIIFFF)V", SDL_JAVA_INTERFACE(onNativeTouch) }, - { "onNativePinchStart", "()V", SDL_JAVA_INTERFACE(onNativePinchStart) }, + { "onNativePinchStart", "(FFFF)V", SDL_JAVA_INTERFACE(onNativePinchStart) }, { "onNativePinchUpdate", "(FFFFF)V", SDL_JAVA_INTERFACE(onNativePinchUpdate) }, - { "onNativePinchEnd", "()V", SDL_JAVA_INTERFACE(onNativePinchEnd) }, + { "onNativePinchEnd", "(FFFF)V", SDL_JAVA_INTERFACE(onNativePinchEnd) }, { "onNativeMouse", "(IIFFZ)V", SDL_JAVA_INTERFACE(onNativeMouse) }, { "onNativePen", "(IIIIFFF)V", SDL_JAVA_INTERFACE(onNativePen) }, { "onNativeAccel", "(FFF)V", SDL_JAVA_INTERFACE(onNativeAccel) }, @@ -1395,12 +1397,12 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeTouch)( // Pinch JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativePinchStart)( - JNIEnv *env, jclass jcls) + JNIEnv *env, jclass jcls, jfloat span_x, jfloat span_y, jfloat focus_x, jfloat focus_y) { SDL_LockMutex(Android_ActivityMutex); if (Android_Window) { - SDL_SendPinch(SDL_EVENT_PINCH_BEGIN, 0, Android_Window, 0, 0, 0, 0, 0); + SDL_SendPinch(SDL_EVENT_PINCH_BEGIN, 0, Android_Window, 0, span_x, span_y, focus_x, focus_y); } SDL_UnlockMutex(Android_ActivityMutex); @@ -1419,12 +1421,12 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativePinchUpdate)( } JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativePinchEnd)( - JNIEnv *env, jclass jcls) + JNIEnv *env, jclass jcls, jfloat span_x, jfloat span_y, jfloat focus_x, jfloat focus_y) { SDL_LockMutex(Android_ActivityMutex); if (Android_Window) { - SDL_SendPinch(SDL_EVENT_PINCH_END, 0, Android_Window, 0, 0, 0, 0, 0); + SDL_SendPinch(SDL_EVENT_PINCH_END, 0, Android_Window, 0, span_x, span_y, focus_x, focus_y); } SDL_UnlockMutex(Android_ActivityMutex); diff --git a/src/events/SDL_touch.c b/src/events/SDL_touch.c index a14ad2d366..60d6a6489e 100644 --- a/src/events/SDL_touch.c +++ b/src/events/SDL_touch.c @@ -628,10 +628,10 @@ int SDL_SendPinch(SDL_EventType type, Uint64 timestamp, SDL_Window *window, floa event.type = type; event.common.timestamp = timestamp; event.pinch.scale = scale; - event.pinch.span_x = (span_x * (float)window->w); - event.pinch.span_y = (span_y * (float)window->h); - event.pinch.focus_x = (focus_x * (float)window->w); - event.pinch.focus_y = (focus_y * (float)window->h); + event.pinch.span_x = span_x > 0 ? (span_x * (float)window->w) : -1.f; + event.pinch.span_y = span_y > 0 ? (span_y * (float)window->h) : -1.f; + event.pinch.focus_x = focus_x > 0 ? (focus_x * (float)window->w) : -1.f; + event.pinch.focus_y = focus_y > 0 ? (focus_y * (float)window->h) : -1.f; event.pinch.windowID = window ? SDL_GetWindowID(window) : 0; posted = (SDL_PushEvent(&event) > 0); } diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m index 3719f75baa..b9f488564f 100644 --- a/src/video/cocoa/SDL_cocoawindow.m +++ b/src/video/cocoa/SDL_cocoawindow.m @@ -2038,17 +2038,17 @@ static void Cocoa_SendMouseButtonClicks(SDL_Mouse *mouse, NSEvent *theEvent, SDL { switch ([theEvent phase]) { case NSEventPhaseBegan: - SDL_SendPinch(SDL_EVENT_PINCH_BEGIN, Cocoa_GetEventTimestamp([theEvent timestamp]), NULL, 0, 0, 0, 0, 0); + SDL_SendPinch(SDL_EVENT_PINCH_BEGIN, Cocoa_GetEventTimestamp([theEvent timestamp]), NULL, 0, -1, -1, -1, -1); break; case NSEventPhaseChanged: { CGFloat scale = 1.0f + [theEvent magnification]; - SDL_SendPinch(SDL_EVENT_PINCH_UPDATE, Cocoa_GetEventTimestamp([theEvent timestamp]), NULL, scale, 0, 0, 0, 0); + SDL_SendPinch(SDL_EVENT_PINCH_UPDATE, Cocoa_GetEventTimestamp([theEvent timestamp]), NULL, scale, -1, -1, -1, -1); } break; case NSEventPhaseEnded: case NSEventPhaseCancelled: - SDL_SendPinch(SDL_EVENT_PINCH_END, Cocoa_GetEventTimestamp([theEvent timestamp]), NULL, 0, 0, 0, 0, 0); + SDL_SendPinch(SDL_EVENT_PINCH_END, Cocoa_GetEventTimestamp([theEvent timestamp]), NULL, 0, -1, -1, -1, -1); break; default: break; diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m index 995288e073..19395c98fd 100644 --- a/src/video/uikit/SDL_uikitview.m +++ b/src/video/uikit/SDL_uikitview.m @@ -484,17 +484,28 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; { CGFloat scale = sender.scale; UIGestureRecognizerState state = sender.state; + CGPoint point1 = [sender locationOfTouch:0 inView:self]; + CGPoint point2 = [sender locationOfTouch:1 inView:self]; + CGFloat focus_x = (point1.x + point2.x)/2; + CGFloat focus_y = (point1.y + point2.y)/2; + CGFloat span_x = SDL_fabs(point1.x - point2.x); + CGFloat span_y = SDL_fabs(point1.y - point2.y); + CGRect bounds = self.bounds; + focus_x /= bounds.size.width; + focus_y /= bounds.size.height; + span_x /= bounds.size.width; + span_y /= bounds.size.height; switch (state) { case UIGestureRecognizerStateBegan: pinch_scale = 1.0f; - SDL_SendPinch(SDL_EVENT_PINCH_BEGIN, 0, sdlwindow, 0, 0, 0, 0, 0); + SDL_SendPinch(SDL_EVENT_PINCH_BEGIN, 0, sdlwindow, 0, span_x, span_y, focus_x, focus_y); break; case UIGestureRecognizerStateChanged: if (pinch_scale > 0.0f) { - SDL_SendPinch(SDL_EVENT_PINCH_UPDATE, 0, sdlwindow, scale / pinch_scale, 0, 0, 0, 0); + SDL_SendPinch(SDL_EVENT_PINCH_UPDATE, 0, sdlwindow, scale / pinch_scale, span_x, span_y, focus_x, focus_y); } pinch_scale = scale; break; @@ -502,7 +513,7 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick; case UIGestureRecognizerStateFailed: case UIGestureRecognizerStateEnded: case UIGestureRecognizerStateCancelled: - SDL_SendPinch(SDL_EVENT_PINCH_END, 0, sdlwindow, 0, 0, 0, 0, 0); + SDL_SendPinch(SDL_EVENT_PINCH_END, 0, sdlwindow, 0, span_x, span_y, focus_x, focus_y); break; default: diff --git a/src/video/wayland/SDL_waylandevents.c b/src/video/wayland/SDL_waylandevents.c index 280e0395ed..3e46bbc71a 100644 --- a/src/video/wayland/SDL_waylandevents.c +++ b/src/video/wayland/SDL_waylandevents.c @@ -322,7 +322,7 @@ static void handle_pinch_begin(void *data, struct zwp_pointer_gesture_pinch_v1 * seat->pointer.gesture_focus = wind; const Uint64 timestamp = Wayland_GetPointerTimestamp(seat, time); - SDL_SendPinch(SDL_EVENT_PINCH_BEGIN, timestamp, wind->sdlwindow, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); + SDL_SendPinch(SDL_EVENT_PINCH_BEGIN, timestamp, wind->sdlwindow, 0.0f, -1.0f, -1.0f, -1.0f, -1.0f); } } @@ -334,7 +334,7 @@ static void handle_pinch_update(void *data, struct zwp_pointer_gesture_pinch_v1 if (seat->pointer.gesture_focus) { const Uint64 timestamp = Wayland_GetPointerTimestamp(seat, time); const float s = (float)wl_fixed_to_double(scale); - SDL_SendPinch(SDL_EVENT_PINCH_UPDATE, timestamp, seat->pointer.gesture_focus->sdlwindow, s, 0.0f, 0.0f, 0.0f, 0.0f); + SDL_SendPinch(SDL_EVENT_PINCH_UPDATE, timestamp, seat->pointer.gesture_focus->sdlwindow, s, -1.0f, -1.0f, -1.0f, -1.0f); } } @@ -344,7 +344,7 @@ static void handle_pinch_end(void *data, struct zwp_pointer_gesture_pinch_v1 *zw if (seat->pointer.gesture_focus) { const Uint64 timestamp = Wayland_GetPointerTimestamp(seat, time); - SDL_SendPinch(SDL_EVENT_PINCH_END, timestamp, seat->pointer.gesture_focus->sdlwindow, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); + SDL_SendPinch(SDL_EVENT_PINCH_END, timestamp, seat->pointer.gesture_focus->sdlwindow, 0.0f, -1.0f, -1.0f, -1.0f, -1.0f); seat->pointer.gesture_focus = NULL; } @@ -2390,7 +2390,7 @@ static void Wayland_SeatDestroyPointer(SDL_WaylandSeat *seat) // End any active gestures. if (seat->pointer.gesture_focus) { - SDL_SendPinch(SDL_EVENT_PINCH_END, 0, seat->pointer.gesture_focus->sdlwindow, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); + SDL_SendPinch(SDL_EVENT_PINCH_END, 0, seat->pointer.gesture_focus->sdlwindow, 0.0f, -1.0f, -1.0f, -1.0f, -1.0f); } // Make sure focus is removed from a surface before the pointer is destroyed. diff --git a/src/video/x11/SDL_x11xinput2.c b/src/video/x11/SDL_x11xinput2.c index 9b4ba9f823..3bb7c1d8c4 100644 --- a/src/video/x11/SDL_x11xinput2.c +++ b/src/video/x11/SDL_x11xinput2.c @@ -735,11 +735,11 @@ void X11_HandleXinput2Event(SDL_VideoDevice *_this, XGenericEventCookie *cookie) xinput2_normalize_touch_coordinates(window, xev->event_x, xev->event_y, &x, &y); if (cookie->evtype == XI_GesturePinchBegin) { - SDL_SendPinch(SDL_EVENT_PINCH_BEGIN, 0, window, 0, 0, 0, 0, 0); + SDL_SendPinch(SDL_EVENT_PINCH_BEGIN, 0, window, 0, -1, -1, -1, -1); } else if (cookie->evtype == XI_GesturePinchUpdate) { - SDL_SendPinch(SDL_EVENT_PINCH_UPDATE, 0, window, (float)xev->scale, 0, 0, 0, 0); + SDL_SendPinch(SDL_EVENT_PINCH_UPDATE, 0, window, (float)xev->scale, -1, -1, -1, -1); } else { - SDL_SendPinch(SDL_EVENT_PINCH_END, 0, window, 0, 0, 0, 0, 0); + SDL_SendPinch(SDL_EVENT_PINCH_END, 0, window, 0, -1, -1, -1, -1); } } break;