Transfer the key handling logic to QWasmWindow

Also, use the embind approach as the rest of the events do, and introduce a KeyEvent class which simplifies and streamlines event support. The event translator has been given a more specific function of just handling the dead keys. Rest of the translation functionality is coded directly in KeyEvent for more encapsulation. Change-Id: I11b0262fc42fe920206ecc6de0d434b9d9ab9998 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> 

1 files changed, 2 insertions, 45 deletions

diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp
index a66c5f5beb1..e020d507289 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.cpp
+++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp
@@ -3,7 +3,6 @@

 #include "qwasmcompositor.h"
 #include "qwasmwindow.h"
-#include "qwasmeventtranslator.h"
 #include "qwasmeventdispatcher.h"
 #include "qwasmclipboard.h"
 #include "qwasmevent.h"
@@ -30,9 +29,7 @@ using namespace emscripten;
 Q_GUI_EXPORT int qt_defaultDpiX();

 QWasmCompositor::QWasmCompositor(QWasmScreen *screen)
- : QObject(screen),
- m_windowStack(std::bind(&QWasmCompositor::onTopWindowChanged, this)),
- m_eventTranslator(std::make_unique<QWasmEventTranslator>())
+ : QObject(screen), m_windowStack(std::bind(&QWasmCompositor::onTopWindowChanged, this))
 {
 m_touchDevice = std::make_unique<QPointingDevice>(
 "touchscreen", 1, QInputDevice::DeviceType::TouchScreen,
@@ -61,12 +58,11 @@ void QWasmCompositor::onScreenDeleting()
 void QWasmCompositor::deregisterEventHandlers()
 {
 QByteArray screenElementSelector = screen()->eventTargetId().toUtf8();
- emscripten_set_keydown_callback(screenElementSelector.constData(), 0, 0, NULL);
- emscripten_set_keyup_callback(screenElementSelector.constData(), 0, 0, NULL);

 emscripten_set_touchstart_callback(screenElementSelector.constData(), 0, 0, NULL);
 emscripten_set_touchend_callback(screenElementSelector.constData(), 0, 0, NULL);
 emscripten_set_touchmove_callback(screenElementSelector.constData(), 0, 0, NULL);
+
 emscripten_set_touchcancel_callback(screenElementSelector.constData(), 0, 0, NULL);
 }

@@ -82,11 +78,6 @@ void QWasmCompositor::initEventHandlers()
 constexpr EM_BOOL UseCapture = 1;

 const QByteArray screenElementSelector = screen()->eventTargetId().toUtf8();
- emscripten_set_keydown_callback(screenElementSelector.constData(), (void *)this, UseCapture,
- &keyboard_cb);
- emscripten_set_keyup_callback(screenElementSelector.constData(), (void *)this, UseCapture,
- &keyboard_cb);
-
 emscripten_set_touchstart_callback(screenElementSelector.constData(), (void *)this, UseCapture,
 &touchCallback);
 emscripten_set_touchend_callback(screenElementSelector.constData(), (void *)this, UseCapture,
@@ -283,46 +274,12 @@ QWasmScreen *QWasmCompositor::screen()
 return static_cast<QWasmScreen *>(parent());
 }

-int QWasmCompositor::keyboard_cb(int eventType, const EmscriptenKeyboardEvent *keyEvent, void *userData)
-{
- QWasmCompositor *wasmCompositor = reinterpret_cast<QWasmCompositor *>(userData);
- return static_cast<int>(wasmCompositor->processKeyboard(eventType, keyEvent));
-}
-
 int QWasmCompositor::touchCallback(int eventType, const EmscriptenTouchEvent *touchEvent, void *userData)
 {
 auto compositor = reinterpret_cast<QWasmCompositor*>(userData);
 return static_cast<int>(compositor->processTouch(eventType, touchEvent));
 }

-bool QWasmCompositor::processKeyboard(int eventType, const EmscriptenKeyboardEvent *emKeyEvent)
-{
- constexpr bool ProceedToNativeEvent = false;
- Q_ASSERT(eventType == EMSCRIPTEN_EVENT_KEYDOWN || eventType == EMSCRIPTEN_EVENT_KEYUP);
-
- auto translatedEvent = m_eventTranslator->translateKeyEvent(eventType, emKeyEvent);
-
- const QFlags<Qt::KeyboardModifier> modifiers = KeyboardModifier::getForEvent(*emKeyEvent);
-
- const auto clipboardResult = QWasmIntegration::get()->getWasmClipboard()->processKeyboard(
- translatedEvent, modifiers);
-
- using ProcessKeyboardResult = QWasmClipboard::ProcessKeyboardResult;
- if (clipboardResult == ProcessKeyboardResult::NativeClipboardEventNeeded)
- return ProceedToNativeEvent;
-
- if (translatedEvent.text.isEmpty())
- translatedEvent.text = QString(emKeyEvent->key);
- if (translatedEvent.text.size() > 1)
- translatedEvent.text.clear();
- const auto result =
- QWindowSystemInterface::handleKeyEvent(
- 0, translatedEvent.type, translatedEvent.key, modifiers, translatedEvent.text);
- return clipboardResult == ProcessKeyboardResult::NativeClipboardEventAndCopiedDataNeeded
- ? ProceedToNativeEvent
- : result;
-}
-
 bool QWasmCompositor::processTouch(int eventType, const EmscriptenTouchEvent *touchEvent)
 {
 QList<QWindowSystemInterface::TouchPoint> touchPointList;