diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2016-08-04 15:46:20 +0200 |
---|---|---|
committer | Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> | 2016-08-18 13:23:26 +0000 |
commit | 3c6220c4f8893b58af5e68ffaeff5951efe1f331 (patch) | |
tree | 31cf3b462e5c45f888a1646d12e3a818b71801bf /src/plugins | |
parent | bc2cee35c3034b4428dd72a1c228aecba0a6b280 (diff) |
Android selection handles
This commits implement the cursor and selection handle in the platform
plugin.
Task-number: QTBUG-34867
Change-Id: Icb3fd9ddfd9f4152e2004078a92a3d9502e9113c
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/platforms/android/androidjniinput.cpp | 30 | ||||
-rw-r--r-- | src/plugins/platforms/android/androidjniinput.h | 3 | ||||
-rw-r--r-- | src/plugins/platforms/android/qandroidinputcontext.cpp | 171 | ||||
-rw-r--r-- | src/plugins/platforms/android/qandroidinputcontext.h | 12 |
4 files changed, 191 insertions, 25 deletions
diff --git a/src/plugins/platforms/android/androidjniinput.cpp b/src/plugins/platforms/android/androidjniinput.cpp index 5be128a0c5..62140c9816 100644 --- a/src/plugins/platforms/android/androidjniinput.cpp +++ b/src/plugins/platforms/android/androidjniinput.cpp @@ -1,7 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2012 BogDan Vatra <bogdan@kde.org> -** Contact: https://www.qt.io/licensing/ +** Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com> +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the plugins of the Qt Toolkit. ** @@ -120,6 +121,12 @@ namespace QtAndroidInput return m_softwareKeyboardRect; } + void updateHandles(int mode, QPoint cursor, QPoint anchor) + { + QJNIObjectPrivate::callStaticMethod<void>(applicationClass(), "updateHandles", "(IIIII)V", + mode, cursor.x(), cursor.y(), anchor.x(), + anchor.y()); + } static void mouseDown(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint x, jint y) { @@ -225,6 +232,12 @@ namespace QtAndroidInput double(dw*size), double(dh*size)); m_touchPoints.push_back(touchPoint); + + if (state == Qt::TouchPointPressed) { + QAndroidInputContext *inputContext = QAndroidInputContext::androidInputContext(); + if (inputContext && qGuiApp) + QMetaObject::invokeMethod(inputContext, "touchDown", Q_ARG(int, x), Q_ARG(int, y)); + } } static void touchEnd(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint /*action*/) @@ -786,6 +799,18 @@ namespace QtAndroidInput #endif } + static void handleLocationChanged(JNIEnv */*env*/, jobject /*thiz*/, int id, int x, int y) + { +#ifdef QT_DEBUG_ANDROID_IM_PROTOCOL + qDebug() << "@@@ handleLocationChanged" << id << x << y; +#endif + QAndroidInputContext *inputContext = QAndroidInputContext::androidInputContext(); + if (inputContext && qGuiApp) + QMetaObject::invokeMethod(inputContext, "handleLocationChanged", + Q_ARG(int, id), Q_ARG(int, x), Q_ARG(int, y)); + + } + static JNINativeMethod methods[] = { {"touchBegin","(I)V",(void*)touchBegin}, {"touchAdd","(IIIZIIFF)V",(void*)touchAdd}, @@ -799,7 +824,8 @@ namespace QtAndroidInput {"keyDown", "(IIIZ)V", (void *)keyDown}, {"keyUp", "(IIIZ)V", (void *)keyUp}, {"keyboardVisibilityChanged", "(Z)V", (void *)keyboardVisibilityChanged}, - {"keyboardGeometryChanged", "(IIII)V", (void *)keyboardGeometryChanged} + {"keyboardGeometryChanged", "(IIII)V", (void *)keyboardGeometryChanged}, + {"handleLocationChanged", "(III)V", (void *)handleLocationChanged} }; bool registerNatives(JNIEnv *env) diff --git a/src/plugins/platforms/android/androidjniinput.h b/src/plugins/platforms/android/androidjniinput.h index 682abde098..f9d2f1a2a7 100644 --- a/src/plugins/platforms/android/androidjniinput.h +++ b/src/plugins/platforms/android/androidjniinput.h @@ -56,6 +56,9 @@ namespace QtAndroidInput void updateSelection(int selStart, int selEnd, int candidatesStart, int candidatesEnd); // Software keyboard support + // cursor/selection handles + void updateHandles(int handleCount, QPoint cursor = QPoint(), QPoint anchor = QPoint()); + bool registerNatives(JNIEnv *env); } diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp index 125a03469f..c64e80479c 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.cpp +++ b/src/plugins/platforms/android/qandroidinputcontext.cpp @@ -2,6 +2,7 @@ ** ** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2012 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the plugins of the Qt Toolkit. @@ -342,9 +343,28 @@ static JNINativeMethod methods[] = { {"updateCursorPosition", "()Z", (void *)updateCursorPosition} }; +static QRect inputItemRectangle() +{ + QRectF itemRect = qGuiApp->inputMethod()->inputItemRectangle(); + QRect rect = qGuiApp->inputMethod()->inputItemTransform().mapRect(itemRect).toRect(); + QWindow *window = qGuiApp->focusWindow(); + if (window) + rect = QRect(window->mapToGlobal(rect.topLeft()), rect.size()); + double pixelDensity = window + ? QHighDpiScaling::factor(window) + : QHighDpiScaling::factor(QtAndroid::androidPlatformIntegration()->screen()); + if (pixelDensity != 1.0) { + rect.setX(rect.x() * pixelDensity); + rect.setY(rect.y() * pixelDensity); + rect.setWidth(rect.width() * pixelDensity); + rect.setHeight(rect.height() * pixelDensity); + } + return rect; +} QAndroidInputContext::QAndroidInputContext() - : QPlatformInputContext(), m_composingTextStart(-1), m_blockUpdateSelection(false), m_batchEditNestingLevel(0), m_focusObject(0) + : QPlatformInputContext(), m_composingTextStart(-1), m_blockUpdateSelection(false), + m_cursorHandleShown(CursorHandleNotShown), m_batchEditNestingLevel(0), m_focusObject(0) { jclass clazz = QJNIEnvironmentPrivate::findClass(QtNativeInputConnectionClassName); if (Q_UNLIKELY(!clazz)) { @@ -415,6 +435,9 @@ QAndroidInputContext::QAndroidInputContext() qRegisterMetaType<QInputMethodEvent *>("QInputMethodEvent*"); qRegisterMetaType<QInputMethodQueryEvent *>("QInputMethodQueryEvent*"); m_androidInputContext = this; + + QObject::connect(QGuiApplication::inputMethod(), &QInputMethod::cursorRectangleChanged, + this, &QAndroidInputContext::updateSelectionHandles); } QAndroidInputContext::~QAndroidInputContext() @@ -452,6 +475,7 @@ void QAndroidInputContext::reset() { clear(); m_batchEditNestingLevel = 0; + m_cursorHandleShown = QAndroidInputContext::CursorHandleNotShown; if (qGuiApp->focusObject()) { QSharedPointer<QInputMethodQueryEvent> query = focusObjectInputMethodQueryThreadSafe(Qt::ImEnabled); if (!query.isNull() && query->value(Qt::ImEnabled).toBool()) { @@ -500,6 +524,103 @@ void QAndroidInputContext::updateCursorPosition() } } +void QAndroidInputContext::updateSelectionHandles() +{ + auto im = qGuiApp->inputMethod(); + if (!m_focusObject || (m_cursorHandleShown == CursorHandleNotShown)) { + // Hide the handles + QtAndroidInput::updateHandles(0); + return; + } + QWindow *window = qGuiApp->focusWindow(); + double pixelDensity = window + ? QHighDpiScaling::factor(window) + : QHighDpiScaling::factor(QtAndroid::androidPlatformIntegration()->screen()); + + QInputMethodQueryEvent query(Qt::ImCursorPosition | Qt::ImAnchorPosition | Qt::ImEnabled); + QCoreApplication::sendEvent(m_focusObject, &query); + int cpos = query.value(Qt::ImCursorPosition).toInt(); + int anchor = query.value(Qt::ImAnchorPosition).toInt(); + + if (cpos == anchor || im->anchorRectangle().isNull()) { + if (!query.value(Qt::ImEnabled).toBool()) { + QtAndroidInput::updateHandles(0); + return; + } + + auto curRect = im->cursorRectangle(); + QPoint cursorPoint(curRect.center().x(), curRect.bottom()); + QtAndroidInput::updateHandles(m_cursorHandleShown, cursorPoint * pixelDensity); + return; + } + + auto leftRect = im->cursorRectangle(); + auto rightRect = im->anchorRectangle(); + if (cpos > anchor) + std::swap(leftRect, rightRect); + + QPoint leftPoint(leftRect.bottomLeft().toPoint() * pixelDensity); + QPoint righPoint(rightRect.bottomRight().toPoint() * pixelDensity); + QtAndroidInput::updateHandles(CursorHandleShowSelection, leftPoint, righPoint); +} + +/* + Called from Java when a cursor/selection handle was dragged to a new position + + handleId of 1 means the cursor handle, 2 means the left handle, 3 means the right handle + */ +void QAndroidInputContext::handleLocationChanged(int handleId, int x, int y) +{ + auto im = qGuiApp->inputMethod(); + auto leftRect = im->cursorRectangle(); + // The handle is down of the cursor, but we want the position in the middle. + QWindow *window = qGuiApp->focusWindow(); + double pixelDensity = window + ? QHighDpiScaling::factor(window) + : QHighDpiScaling::factor(QtAndroid::androidPlatformIntegration()->screen()); + QPoint point(x / pixelDensity, y / pixelDensity); + y -= leftRect.width() / 2; + if (handleId == 1) { + setSelectionOnFocusObject(point, point); + return; + } + + QInputMethodQueryEvent query(Qt::ImCursorPosition | Qt::ImAnchorPosition); + QCoreApplication::sendEvent(m_focusObject, &query); + int cpos = query.value(Qt::ImCursorPosition).toInt(); + int anchor = query.value(Qt::ImAnchorPosition).toInt(); + + auto rightRect = im->anchorRectangle(); + if (cpos > anchor) + std::swap(leftRect, rightRect); + + if (handleId == 2) { + QPoint rightPoint(rightRect.center().toPoint()); + setSelectionOnFocusObject(point, rightPoint); + } else if (handleId == 3) { + QPoint leftPoint(leftRect.center().toPoint()); + setSelectionOnFocusObject(leftPoint, point); + } +} + +void QAndroidInputContext::touchDown(int x, int y) +{ + if (m_focusObject && inputItemRectangle().contains(x, y) && !m_cursorHandleShown) { + // If the user touch the input rectangle, we can show the cursor handle + m_cursorHandleShown = QAndroidInputContext::CursorHandleShowNormal; + updateSelectionHandles(); + } +} + +void QAndroidInputContext::keyDown() +{ + if (m_cursorHandleShown) { + // When the user enter text on the keyboard, we hide the cursor handle + m_cursorHandleShown = QAndroidInputContext::CursorHandleNotShown; + updateSelectionHandles(); + } +} + void QAndroidInputContext::update(Qt::InputMethodQueries queries) { QSharedPointer<QInputMethodQueryEvent> query = focusObjectInputMethodQueryThreadSafe(queries); @@ -543,22 +664,11 @@ void QAndroidInputContext::showInputPanel() m_updateCursorPosConnection = connect(qGuiApp->focusObject(), SIGNAL(cursorPositionChanged(int,int)), this, SLOT(updateCursorPosition())); else m_updateCursorPosConnection = connect(qGuiApp->focusObject(), SIGNAL(cursorPositionChanged()), this, SLOT(updateCursorPosition())); - QRectF itemRect = qGuiApp->inputMethod()->inputItemRectangle(); - QRect rect = qGuiApp->inputMethod()->inputItemTransform().mapRect(itemRect).toRect(); - QWindow *window = qGuiApp->focusWindow(); - if (window) - rect = QRect(window->mapToGlobal(rect.topLeft()), rect.size()); - double pixelDensity = window ? QHighDpiScaling::factor(window) - : QHighDpiScaling::factor(QtAndroid::androidPlatformIntegration()->screen()); - - QtAndroidInput::showSoftwareKeyboard(rect.left() * pixelDensity, - rect.top() * pixelDensity, - rect.width() * pixelDensity, - rect.height() * pixelDensity, + QRect rect = inputItemRectangle(); + QtAndroidInput::showSoftwareKeyboard(rect.left(), rect.top(), rect.width(), rect.height(), query->value(Qt::ImHints).toUInt(), - query->value(Qt::ImEnterKeyType).toUInt() - ); + query->value(Qt::ImEnterKeyType).toUInt()); } void QAndroidInputContext::showInputPanelLater(Qt::ApplicationState state) @@ -601,6 +711,7 @@ void QAndroidInputContext::setFocusObject(QObject *object) reset(); } QPlatformInputContext::setFocusObject(object); + updateSelectionHandles(); } jboolean QAndroidInputContext::beginBatchEdit() @@ -858,6 +969,8 @@ jboolean QAndroidInputContext::setComposingText(const QString &text, jint newCur QInputMethodEvent event(m_composingText, attributes); sendInputMethodEventThreadSafe(&event); + QMetaObject::invokeMethod(this, "keyDown"); + updateCursorPosition(); return JNI_TRUE; @@ -979,20 +1092,21 @@ jboolean QAndroidInputContext::setSelection(jint start, jint end) jboolean QAndroidInputContext::selectAll() { -#warning TODO - return JNI_FALSE; + sendShortcut(QKeySequence::SelectAll); + return JNI_TRUE; } jboolean QAndroidInputContext::cut() { -#warning TODO - return JNI_FALSE; + m_cursorHandleShown = CursorHandleNotShown; + sendShortcut(QKeySequence::Cut); + return JNI_TRUE; } jboolean QAndroidInputContext::copy() { -#warning TODO - return JNI_FALSE; + sendShortcut(QKeySequence::Copy); + return JNI_TRUE; } jboolean QAndroidInputContext::copyURL() @@ -1003,10 +1117,21 @@ jboolean QAndroidInputContext::copyURL() jboolean QAndroidInputContext::paste() { -#warning TODO - return JNI_FALSE; + m_cursorHandleShown = CursorHandleNotShown; + sendShortcut(QKeySequence::Paste); + return JNI_TRUE; } +void QAndroidInputContext::sendShortcut(const QKeySequence &sequence) +{ + for (int i = 0; i < sequence.count(); ++i) { + const int keys = sequence[i]; + Qt::Key key = Qt::Key(keys & ~Qt::KeyboardModifierMask); + Qt::KeyboardModifiers mod = Qt::KeyboardModifiers(keys & Qt::KeyboardModifierMask); + QGuiApplication::postEvent(m_focusObject, new QKeyEvent(QEvent::KeyPress, key, mod)); + QGuiApplication::postEvent(m_focusObject, new QKeyEvent(QEvent::KeyRelease, key, mod)); + } +} Q_INVOKABLE QVariant QAndroidInputContext::queryFocusObjectUnsafe(Qt::InputMethodQuery query, QVariant argument) { diff --git a/src/plugins/platforms/android/qandroidinputcontext.h b/src/plugins/platforms/android/qandroidinputcontext.h index 5ab85dcab0..c7b2b907b7 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.h +++ b/src/plugins/platforms/android/qandroidinputcontext.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 BogDan Vatra <bogdan@kde.org> +** Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com> ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the plugins of the Qt Toolkit. @@ -94,6 +95,7 @@ public: bool isComposing() const; void clear(); void setFocusObject(QObject *object); + void sendShortcut(const QKeySequence &); //---------------// jboolean beginBatchEdit(); @@ -117,6 +119,10 @@ public: public slots: void updateCursorPosition(); + void updateSelectionHandles(); + void handleLocationChanged(int handleId, int x, int y); + void touchDown(int x, int y); + void keyDown(); private slots: void showInputPanelLater(Qt::ApplicationState); @@ -138,6 +144,12 @@ private: int m_composingCursor; QMetaObject::Connection m_updateCursorPosConnection; bool m_blockUpdateSelection; + enum CursorHandleShowMode { + CursorHandleNotShown, + CursorHandleShowNormal = 1, + CursorHandleShowSelection = 2 + }; + CursorHandleShowMode m_cursorHandleShown; int m_batchEditNestingLevel; QObject *m_focusObject; }; |