1 files changed, 40 insertions, 91 deletions

diff --git a/src/plugins/platforms/android/androidjniinput.cpp b/src/plugins/platforms/android/androidjniinput.cpp
index d074e73b9e..2692488ec6 100644
--- a/src/plugins/platforms/android/androidjniinput.cpp
+++ b/src/plugins/platforms/android/androidjniinput.cpp
@@ -24,6 +24,8 @@ Q_LOGGING_CATEGORY(lcQpaInputMethods, "qt.qpa.input.methods");
 using namespace QtAndroid;
 
 Q_DECLARE_JNI_CLASS(QtLayout, "org/qtproject/qt/android/QtLayout")
+Q_DECLARE_JNI_CLASS(QtLayoutInterface, "org/qtproject/qt/android/QtLayoutInterface")
+Q_DECLARE_JNI_CLASS(QtInputInterface, "org/qtproject/qt/android/QtInputInterface")
 
 namespace QtAndroidInput
 {
@@ -36,110 +38,50 @@ namespace QtAndroidInput
 
     static QPointer<QWindow> m_mouseGrabber;
 
-    GenericMotionEventListener::~GenericMotionEventListener() {}
-    namespace {
-    struct GenericMotionEventListeners {
-        QMutex mutex;
-        QList<QtAndroidInput::GenericMotionEventListener *> listeners;
-    };
-    }
-    Q_GLOBAL_STATIC(GenericMotionEventListeners, g_genericMotionEventListeners)
-
-    static jboolean dispatchGenericMotionEvent(JNIEnv *, jclass, jobject event)
-    {
-        jboolean ret = JNI_FALSE;
-        QMutexLocker locker(&g_genericMotionEventListeners()->mutex);
-        for (auto *listener : std::as_const(g_genericMotionEventListeners()->listeners))
-            ret |= listener->handleGenericMotionEvent(event);
-        return ret;
-    }
-
-    KeyEventListener::~KeyEventListener() {}
-    namespace {
-    struct KeyEventListeners {
-        QMutex mutex;
-        QList<QtAndroidInput::KeyEventListener *> listeners;
-    };
-    }
-    Q_GLOBAL_STATIC(KeyEventListeners, g_keyEventListeners)
-
-    static jboolean dispatchKeyEvent(JNIEnv *, jclass, jobject event)
-    {
-        jboolean ret = JNI_FALSE;
-        QMutexLocker locker(&g_keyEventListeners()->mutex);
-        for (auto *listener : std::as_const(g_keyEventListeners()->listeners))
-            ret |= listener->handleKeyEvent(event);
-        return ret;
-    }
-
-    void registerGenericMotionEventListener(QtAndroidInput::GenericMotionEventListener *listener)
-    {
-        QMutexLocker locker(&g_genericMotionEventListeners()->mutex);
-        g_genericMotionEventListeners()->listeners.push_back(listener);
-    }
-
-    void unregisterGenericMotionEventListener(QtAndroidInput::GenericMotionEventListener *listener)
-    {
-        QMutexLocker locker(&g_genericMotionEventListeners()->mutex);
-        g_genericMotionEventListeners()->listeners.removeOne(listener);
-    }
-
-    void registerKeyEventListener(QtAndroidInput::KeyEventListener *listener)
-    {
-        QMutexLocker locker(&g_keyEventListeners()->mutex);
-        g_keyEventListeners()->listeners.push_back(listener);
-    }
-
-    void unregisterKeyEventListener(QtAndroidInput::KeyEventListener *listener)
-    {
-        QMutexLocker locker(&g_keyEventListeners()->mutex);
-        g_keyEventListeners()->listeners.removeOne(listener);
-    }
-
     QJniObject qtLayout()
     {
-        return qtActivityDelegate().callMethod<QtJniTypes::QtLayout>("getQtLayout");
+        AndroidBackendRegister *reg = QtAndroid::backendRegister();
+        return reg->callInterface<QtJniTypes::QtLayoutInterface, QtJniTypes::QtLayout>(
+                "getQtLayout");
     }
 
     void updateSelection(int selStart, int selEnd, int candidatesStart, int candidatesEnd)
     {
         qCDebug(lcQpaInputMethods) << ">>> UPDATESELECTION" << selStart << selEnd << candidatesStart << candidatesEnd;
-        qtInputDelegate().callMethod<void>("updateSelection",
-                                           selStart,
-                                           selEnd,
-                                           candidatesStart,
-                                           candidatesEnd);
+        AndroidBackendRegister *reg = QtAndroid::backendRegister();
+        reg->callInterface<QtJniTypes::QtInputInterface, void>("updateSelection", selStart, selEnd,
+                                                               candidatesStart, candidatesEnd);
     }
 
     void showSoftwareKeyboard(int left, int top, int width, int height, int inputHints, int enterKeyType)
     {
-        qtInputDelegate().callMethod<void>("showSoftwareKeyboard",
-                                           QtAndroidPrivate::activity(),
-                                           qtLayout().object<QtJniTypes::QtLayout>(),
-                                           left,
-                                           top,
-                                           width,
-                                           height,
-                                           inputHints,
-                                           enterKeyType);
+        AndroidBackendRegister *reg = QtAndroid::backendRegister();
+        reg->callInterface<QtJniTypes::QtInputInterface, void>(
+                "showSoftwareKeyboard", QtAndroidPrivate::activity(),
+                qtLayout().object<QtJniTypes::QtLayout>(), left, top, width, height, inputHints,
+                enterKeyType);
         qCDebug(lcQpaInputMethods) << "@@@ SHOWSOFTWAREKEYBOARD" << left << top << width << height << inputHints << enterKeyType;
     }
 
     void resetSoftwareKeyboard()
     {
-        qtInputDelegate().callMethod<void>("resetSoftwareKeyboard");
+        AndroidBackendRegister *reg = QtAndroid::backendRegister();
+        reg->callInterface<QtJniTypes::QtInputInterface, void>("resetSoftwareKeyboard");
         qCDebug(lcQpaInputMethods) << "@@@ RESETSOFTWAREKEYBOARD";
     }
 
     void hideSoftwareKeyboard()
     {
-        qtInputDelegate().callMethod<void>("hideSoftwareKeyboard");
+        AndroidBackendRegister *reg = QtAndroid::backendRegister();
+        reg->callInterface<QtJniTypes::QtInputInterface, void>("hideSoftwareKeyboard");
         qCDebug(lcQpaInputMethods) << "@@@ HIDESOFTWAREKEYBOARD";
     }
 
     bool isSoftwareKeyboardVisible()
     {
-        return qtInputDelegate().callMethod<jboolean>("isSoftwareKeyboardVisible");
+        AndroidBackendRegister *reg = QtAndroid::backendRegister();
+        return reg->callInterface<QtJniTypes::QtInputInterface, jboolean>(
+                "isSoftwareKeyboardVisible");
     }
 
     QRect softwareKeyboardRect()
@@ -149,17 +91,17 @@ namespace QtAndroidInput
 
     int getSelectHandleWidth()
     {
-        return qtInputDelegate().callMethod<jint>("getSelectHandleWidth");
+        AndroidBackendRegister *reg = QtAndroid::backendRegister();
+        return reg->callInterface<QtJniTypes::QtInputInterface, jint>("getSelectHandleWidth");
     }
 
     void updateHandles(int mode, QPoint editMenuPos, uint32_t editButtons, QPoint cursor, QPoint anchor, bool rtl)
     {
-        qtInputDelegate().callMethod<void>("updateHandles",
-                                           QtAndroidPrivate::activity(),
-                                           qtLayout().object<QtJniTypes::QtLayout>(),
-                                           mode, editMenuPos.x(), editMenuPos.y(), editButtons,
-                                           cursor.x(), cursor.y(),
-                                           anchor.x(), anchor.y(), rtl);
+        AndroidBackendRegister *reg = QtAndroid::backendRegister();
+        reg->callInterface<QtJniTypes::QtInputInterface, void>(
+                "updateHandles", QtAndroidPrivate::activity(),
+                qtLayout().object<QtJniTypes::QtLayout>(), mode, editMenuPos.x(), editMenuPos.y(),
+                editButtons, cursor.x(), cursor.y(), anchor.x(), anchor.y(), rtl);
     }
 
     // from https://developer.android.com/reference/android/view/MotionEvent#getButtonState()
@@ -324,7 +266,7 @@ namespace QtAndroidInput
         m_touchPoints.clear();
     }
 
-    static void touchAdd(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint id, jint action, jboolean /*primary*/, jint x, jint y,
+    static void touchAdd(JNIEnv */*env*/, jobject /*thiz*/, jint winId, jint id, jint action, jboolean /*primary*/, jint x, jint y,
         jfloat major, jfloat minor, jfloat rotation, jfloat pressure)
     {
         QEventPoint::State state = QEventPoint::State::Stationary;
@@ -345,16 +287,25 @@ namespace QtAndroidInput
 
         const int dw = availableWidthPixels();
         const int dh = availableHeightPixels();
+        QWindow *window = QtAndroid::windowFromId(winId);
+        if (!window) {
+            qCWarning(lcQpaInputMethods, "Touch event received for non-existing window %d", winId);
+            return;
+        }
+
+        QPointF mappedTouchPoint = window->mapToGlobal(QPointF(x, y));
         QWindowSystemInterface::TouchPoint touchPoint;
         touchPoint.id = id;
         touchPoint.pressure = pressure;
         touchPoint.rotation = qRadiansToDegrees(rotation);
-        touchPoint.normalPosition = QPointF(double(x / dw), double(y / dh));
+        touchPoint.normalPosition = QPointF((mappedTouchPoint.x() / dw),
+                                            (mappedTouchPoint.y() / dh));
         touchPoint.state = state;
-        touchPoint.area = QRectF(x - double(minor * 0.5f),
-                                 y - double(major * 0.5f),
+        touchPoint.area = QRectF(mappedTouchPoint.x() - double(minor * 0.5f),
+                                 mappedTouchPoint.y() - double(major * 0.5f),
                                  double(minor),
                                  double(major));
+
         m_touchPoints.push_back(touchPoint);
         if (state == QEventPoint::State::Pressed) {
             QAndroidInputContext *inputContext = QAndroidInputContext::androidInputContext();
@@ -976,8 +927,6 @@ namespace QtAndroidInput
         {"keyboardVisibilityChanged", "(Z)V", (void *)keyboardVisibilityChanged},
         {"keyboardGeometryChanged", "(IIII)V", (void *)keyboardGeometryChanged},
         {"handleLocationChanged", "(III)V", (void *)handleLocationChanged},
-        {"dispatchGenericMotionEvent", "(Landroid/view/MotionEvent;)Z", reinterpret_cast<void *>(dispatchGenericMotionEvent)},
-        {"dispatchKeyEvent", "(Landroid/view/KeyEvent;)Z", reinterpret_cast<void *>(dispatchKeyEvent)},
     };
 
     bool registerNatives(QJniEnvironment &env)