diff options
| -rw-r--r-- | src/plugins/platforms/ios/qioseventdispatcher.h | 15 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qioseventdispatcher.mm | 62 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qiosintegration.mm | 5 |
3 files changed, 50 insertions, 32 deletions
diff --git a/src/plugins/platforms/ios/qioseventdispatcher.h b/src/plugins/platforms/ios/qioseventdispatcher.h index 62133b9510..1f4c78dc74 100644 --- a/src/plugins/platforms/ios/qioseventdispatcher.h +++ b/src/plugins/platforms/ios/qioseventdispatcher.h @@ -49,18 +49,29 @@ class QIOSEventDispatcher : public QEventDispatcherCoreFoundation Q_OBJECT public: + static QIOSEventDispatcher* create(); + bool processPostedEvents() override; + +protected: explicit QIOSEventDispatcher(QObject *parent = 0); +}; + +class QIOSJumpingEventDispatcher : public QIOSEventDispatcher +{ + Q_OBJECT +public: + QIOSJumpingEventDispatcher(QObject *parent = 0); bool processEvents(QEventLoop::ProcessEventsFlags flags) override; - bool processPostedEvents() override; + // Public since we can't friend Objective-C methods void handleRunLoopExit(CFRunLoopActivity activity); void interruptEventLoopExec(); private: uint m_processEventLevel; - RunLoopObserver<QIOSEventDispatcher> m_runLoopExitObserver; + RunLoopObserver<QIOSJumpingEventDispatcher> m_runLoopExitObserver; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/ios/qioseventdispatcher.mm b/src/plugins/platforms/ios/qioseventdispatcher.mm index a6f6a7aac9..06e5e6cb80 100644 --- a/src/plugins/platforms/ios/qioseventdispatcher.mm +++ b/src/plugins/platforms/ios/qioseventdispatcher.mm @@ -403,7 +403,7 @@ static const char kApplicationWillTerminateExitCode = char(SIGTERM | 0x80); // so we'll never see the exit activity and have a chance to return from // QEventLoop::exec(). We initiate the return manually as a workaround. qCDebug(lcEventDispatcher) << "Manually triggering return from event loop exec"; - static_cast<QIOSEventDispatcher *>(qApp->eventDispatcher())->interruptEventLoopExec(); + static_cast<QIOSJumpingEventDispatcher *>(qApp->eventDispatcher())->interruptEventLoopExec(); break; case kJumpedFromUserMainTrampoline: // The user's main has returned, so we're ready to let iOS terminate the application @@ -419,20 +419,48 @@ static const char kApplicationWillTerminateExitCode = char(SIGTERM | 0x80); QT_BEGIN_NAMESPACE QT_USE_NAMESPACE +QIOSEventDispatcher *QIOSEventDispatcher::create() +{ + if (isQtApplication() && rootLevelRunLoopIntegration()) + return new QIOSJumpingEventDispatcher; + + return new QIOSEventDispatcher; +} + QIOSEventDispatcher::QIOSEventDispatcher(QObject *parent) : QEventDispatcherCoreFoundation(parent) - , m_processEventLevel(0) - , m_runLoopExitObserver(this, &QIOSEventDispatcher::handleRunLoopExit, kCFRunLoopExit) { // We want all delivery of events from the system to be handled synchronously QWindowSystemInterface::setSynchronousWindowSystemEvents(true); } -bool __attribute__((returns_twice)) QIOSEventDispatcher::processEvents(QEventLoop::ProcessEventsFlags flags) +/*! + Override of the CoreFoundation posted events runloop source callback + so that we can send window system (QPA) events in addition to sending + normal Qt events. +*/ +bool QIOSEventDispatcher::processPostedEvents() { - if (!rootLevelRunLoopIntegration()) - return QEventDispatcherCoreFoundation::processEvents(flags); + // Don't send window system events if the base CF dispatcher has determined + // that events should not be sent for this pass of the runloop source. + if (!QEventDispatcherCoreFoundation::processPostedEvents()) + return false; + qCDebug(lcEventDispatcher) << "Sending window system events for" << m_processEvents.flags; + QWindowSystemInterface::sendWindowSystemEvents(m_processEvents.flags); + + return true; +} + +QIOSJumpingEventDispatcher::QIOSJumpingEventDispatcher(QObject *parent) + : QIOSEventDispatcher(parent) + , m_processEventLevel(0) + , m_runLoopExitObserver(this, &QIOSJumpingEventDispatcher::handleRunLoopExit, kCFRunLoopExit) +{ +} + +bool __attribute__((returns_twice)) QIOSJumpingEventDispatcher::processEvents(QEventLoop::ProcessEventsFlags flags) +{ if (applicationAboutToTerminate) { qCDebug(lcEventDispatcher) << "Detected QEventLoop exec after application termination"; // Re-issue exit, and return immediately @@ -475,25 +503,7 @@ bool __attribute__((returns_twice)) QIOSEventDispatcher::processEvents(QEventLoo return processedEvents; } -/*! - Override of the CoreFoundation posted events runloop source callback - so that we can send window system (QPA) events in addition to sending - normal Qt events. -*/ -bool QIOSEventDispatcher::processPostedEvents() -{ - // Don't send window system events if the base CF dispatcher has determined - // that events should not be sent for this pass of the runloop source. - if (!QEventDispatcherCoreFoundation::processPostedEvents()) - return false; - - qCDebug(lcEventDispatcher) << "Sending window system events for" << m_processEvents.flags; - QWindowSystemInterface::sendWindowSystemEvents(m_processEvents.flags); - - return true; -} - -void QIOSEventDispatcher::handleRunLoopExit(CFRunLoopActivity activity) +void QIOSJumpingEventDispatcher::handleRunLoopExit(CFRunLoopActivity activity) { Q_UNUSED(activity); Q_ASSERT(activity == kCFRunLoopExit); @@ -502,7 +512,7 @@ void QIOSEventDispatcher::handleRunLoopExit(CFRunLoopActivity activity) interruptEventLoopExec(); } -void QIOSEventDispatcher::interruptEventLoopExec() +void QIOSJumpingEventDispatcher::interruptEventLoopExec() { Q_ASSERT(m_processEventLevel == 1); diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm index 2e657b3798..b8ce49aaca 100644 --- a/src/plugins/platforms/ios/qiosintegration.mm +++ b/src/plugins/platforms/ios/qiosintegration.mm @@ -217,10 +217,7 @@ QPlatformOffscreenSurface *QIOSIntegration::createPlatformOffscreenSurface(QOffs QAbstractEventDispatcher *QIOSIntegration::createEventDispatcher() const { - if (isQtApplication()) - return new QIOSEventDispatcher; - else - return new QEventDispatcherCoreFoundation; + return QIOSEventDispatcher::create(); } QPlatformFontDatabase * QIOSIntegration::fontDatabase() const |