[wpe] Sent multitouch points to webkit

Igalia · Sep 16, 2024 · 9c4c40e · 9c4c40e
1 parent e7ad5c4
commit 9c4c40e
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 17 deletions.
diff --git a/wpe/src/main/cpp/Runtime/WKWebView.cpp b/wpe/src/main/cpp/Runtime/WKWebView.cpp
@@ -254,8 +254,8 @@ class JNIWKWebViewCache final : public JNI::TypedClass<JNIWKWebView> {
         JNIEnv* env, jobject obj, jlong wkWebViewPtr, jint format, jint width, jint height) noexcept;
     static void nativeSurfaceRedrawNeeded(JNIEnv* env, jobject obj, jlong wkWebViewPtr) noexcept;
     static void nativeSetZoomLevel(JNIEnv* env, jobject obj, jlong wkWebViewPtr, jdouble zoomLevel) noexcept;
-    static void nativeOnTouchEvent(
-        JNIEnv* env, jobject obj, jlong wkWebViewPtr, jlong time, jint type, jfloat xCoord, jfloat yCoord) noexcept;
+    static void nativeOnTouchEvent(JNIEnv* env, jobject obj, jlong wkWebViewPtr, jlong time, jint type,
+        jint pointerCount, jintArray ids, jfloatArray xs, jfloatArray ys) noexcept;
     static void nativeSetInputMethodContent(JNIEnv* env, jobject obj, jlong wkWebViewPtr, jint unicodeChar) noexcept;
     static void nativeDeleteInputMethodContent(JNIEnv* env, jobject obj, jlong wkWebViewPtr, jint offset) noexcept;
     static void nativeRequestExitFullscreenMode(JNIEnv* env, jobject obj, jlong wkWebViewPtr) noexcept;
@@ -305,7 +305,7 @@ JNIWKWebViewCache::JNIWKWebViewCache()
         JNI::NativeMethod<void(jlong)>("nativeSurfaceRedrawNeeded", JNIWKWebViewCache::nativeSurfaceRedrawNeeded),
         JNI::NativeMethod<void(jlong)>("nativeSurfaceDestroyed", JNIWKWebViewCache::nativeSurfaceDestroyed),
         JNI::NativeMethod<void(jlong, jdouble)>("nativeSetZoomLevel", JNIWKWebViewCache::nativeSetZoomLevel),
-        JNI::NativeMethod<void(jlong, jlong, jint, jfloat, jfloat)>(
+        JNI::NativeMethod<void(jlong, jlong, jint, jint, jintArray, jfloatArray, jfloatArray)>(
             "nativeOnTouchEvent", JNIWKWebViewCache::nativeOnTouchEvent),
         JNI::NativeMethod<void(jlong, jint)>(
             "nativeSetInputMethodContent", JNIWKWebViewCache::nativeSetInputMethodContent),
@@ -458,8 +458,8 @@ void JNIWKWebViewCache::nativeSetZoomLevel(
         webkit_web_view_set_zoom_level(wkWebView->m_webView, zoomLevel);
 }
 
-void JNIWKWebViewCache::nativeOnTouchEvent(
-    JNIEnv* /*env*/, jobject /*obj*/, jlong wkWebViewPtr, jlong time, jint type, jfloat xCoord, jfloat yCoord) noexcept
+void JNIWKWebViewCache::nativeOnTouchEvent(JNIEnv* env, jobject /*obj*/, jlong wkWebViewPtr, jlong time, jint type,
+    jint pointerCount, jintArray ids, jfloatArray xs, jfloatArray ys) noexcept
 {
     auto* wkWebView = reinterpret_cast<WKWebView*>(wkWebViewPtr); // NOLINT(performance-no-int-to-ptr)
     if ((wkWebView != nullptr) && (wkWebView->m_viewBackend != nullptr)) {
@@ -481,20 +481,35 @@ void JNIWKWebViewCache::nativeOnTouchEvent(
             break;
         }
 
-        const wpe_input_touch_event_raw touchEventRaw = {.type = touchEventType,
+        std::vector<jint> idsVector(pointerCount);
+        std::vector<jfloat> xsVector(pointerCount);
+        std::vector<jfloat> ysVector(pointerCount);
+        env->GetIntArrayRegion(ids, 0, pointerCount, idsVector.data());
+        env->GetFloatArrayRegion(xs, 0, pointerCount, xsVector.data());
+        env->GetFloatArrayRegion(ys, 0, pointerCount, ysVector.data());
+
+        auto* touchPoints = new wpe_input_touch_event_raw[pointerCount];
+        for (int i = 0; i < pointerCount; ++i) {
+            touchPoints[i].type = touchEventType;
+            touchPoints[i].time = static_cast<uint32_t>(time);
+            touchPoints[i].id = idsVector[i];
+            touchPoints[i].x = static_cast<int32_t>(std::round(xsVector[i]));
+            touchPoints[i].y = static_cast<int32_t>(std::round(ysVector[i]));
+        }
+
+        wpe_input_touch_event touchEvent {
+            .touchpoints = touchPoints,
+            .touchpoints_length = static_cast<uint64_t>(pointerCount),
+            .type = static_cast<wpe_input_touch_event_type>(type),
+            .id = touchPoints[0].id, // Use the first touchpoint's ID
             .time = static_cast<uint32_t>(time),
-            .id = 0,
-            .x = static_cast<int32_t>(xCoord),
-            .y = static_cast<int32_t>(yCoord)};
-        wpe_input_touch_event touchEvent = {.touchpoints = &touchEventRaw,
-            .touchpoints_length = 1,
-            .type = touchEventType,
-            .id = 0,
-            .time = touchEventRaw.time,
-            .modifiers = 0};
+            .modifiers = 0, // Set modifiers if any
+        };
 
         wpe_view_backend_dispatch_touch_event(
             WPEAndroidViewBackend_getWPEViewBackend(wkWebView->m_viewBackend), &touchEvent);
+
+        delete[] touchPoints;
     }
 }
 

diff --git a/wpe/src/main/java/org/wpewebkit/wpe/WKWebView.java b/wpe/src/main/java/org/wpewebkit/wpe/WKWebView.java
@@ -318,7 +318,16 @@ public boolean onTouchEvent(MotionEvent event) {
                 return false;
             }
 
-            nativeOnTouchEvent(nativePtr, event.getEventTime(), eventType, event.getX(0), event.getY(0));
+            int[] ids = new int[pointerCount];
+            float[] xs = new float[pointerCount];
+            float[] ys = new float[pointerCount];
+            for (int i = 0; i < pointerCount; i++) {
+                ids[i] = event.getPointerId(i);
+                xs[i] = event.getX(i);
+                ys[i] = event.getY(i);
+            }
+
+            nativeOnTouchEvent(nativePtr, event.getEventTime(), eventType, pointerCount, ids, xs, ys);
             return true;
         }
     }
@@ -631,7 +640,8 @@ private void onReceivedHttpError( // WPEResourceRequest
     private native void nativeSurfaceRedrawNeeded(long nativePtr);
     private native void nativeSurfaceDestroyed(long nativePtr);
     private native void nativeSetZoomLevel(long nativePtr, double zoomLevel);
-    private native void nativeOnTouchEvent(long nativePtr, long time, int type, float x, float y);
+    private native void nativeOnTouchEvent(long nativePtr, long time, int type, int pointerCount, int[] ids, float[] xs,
+                                           float[] ys);
     private native void nativeSetInputMethodContent(long nativePtr, int unicodeChar);
     private native void nativeDeleteInputMethodContent(long nativePtr, int offset);
     private native void nativeRequestExitFullscreenMode(long nativePtr);