ibus: allow filterEvent() from QWindowSystemEventHandler::sendEvent()

The async mode, which is also default mode will recurs if
QIBusPlatformInputContext::filterEvent() is called from
QWindowSystemEventHandler::sendEvent() callback.

The sync mode works fine without this patch.
Modes can be toggled via IBUS_ENABLE_SYNC_MODE envvar.

Removed redundant #ifndef and renamed one variable to
something more meaningful.

Change-Id: I8773445cef10212464cff09e3a70487fb38ac3fd
Reviewed-by: Takao Fujiwara <takao.fujiwara1@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 16 insertions, 15 deletions

diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
index c0979e7864..98362f2116 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
@@ -47,7 +47,9 @@
 
 #include <qpa/qplatformcursor.h>
 #include <qpa/qplatformscreen.h>
-#include <qpa/qwindowsysteminterface.h>
+#include <qpa/qwindowsysteminterface_p.h>
+
+#include <QtGui/private/qguiapplication_p.h>
 
 #include "qibusproxy.h"
 #include "qibusproxyportal.h"
@@ -419,9 +421,9 @@ bool QIBusPlatformInputContext::filterEvent(const QEvent *event)
     QDBusPendingReply<bool> reply = d->context->ProcessKeyEvent(sym, code - 8, ibusState);
 
     if (m_eventFilterUseSynchronousMode || reply.isFinished()) {
-        bool retval = reply.value();
-        qCDebug(qtQpaInputMethods) << "filterEvent return" << code << sym << state << retval;
-        return retval;
+        bool filtered = reply.value();
+        qCDebug(qtQpaInputMethods) << "filterEvent return" << code << sym << state << filtered;
+        return filtered;
     }
 
     Qt::KeyboardModifiers modifiers = keyEvent->modifiers();
@@ -491,23 +493,22 @@ void QIBusPlatformInputContext::filterEventFinished(QDBusPendingCallWatcher *cal
     const bool isAutoRepeat = args.at(7).toBool();
 
     // copied from QXcbKeyboard::handleKeyEvent()
-    bool retval = reply.value();
-    qCDebug(qtQpaInputMethods) << "filterEventFinished return" << code << sym << state << retval;
-    if (!retval) {
+    bool filtered = reply.value();
+    qCDebug(qtQpaInputMethods) << "filterEventFinished return" << code << sym << state << filtered;
+    if (!filtered) {
 #ifndef QT_NO_CONTEXTMENU
         if (type == QEvent::KeyPress && qtcode == Qt::Key_Menu
             && window != NULL) {
             const QPoint globalPos = window->screen()->handle()->cursor()->pos();
             const QPoint pos = window->mapFromGlobal(globalPos);
-#ifndef QT_NO_CONTEXTMENU
-            QWindowSystemInterface::handleContextMenuEvent(window, false, pos,
-                                                           globalPos, modifiers);
-#endif
+            QWindowSystemInterfacePrivate::ContextMenuEvent contextMenuEvent(window, false, pos,
+                                                                             globalPos, modifiers);
+            QGuiApplicationPrivate::processWindowSystemEvent(&contextMenuEvent);
         }
-#endif // QT_NO_CONTEXTMENU
-        QWindowSystemInterface::handleExtendedKeyEvent(window, time, type, qtcode, modifiers,
-                                                       code, sym, state, string, isAutoRepeat);
-
+#endif
+        QWindowSystemInterfacePrivate::KeyEvent keyEvent(window, time, type, qtcode, modifiers,
+                                                         code, sym, state, string, isAutoRepeat);
+        QGuiApplicationPrivate::processWindowSystemEvent(&keyEvent);
     }
     call->deleteLater();
 }