From 89cf733d24411b76bb3ef95e18a003f39a55a36b Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 12 Dec 2018 12:59:51 +0400 Subject: [PATCH] Add Ui::PostponeCall() on return to event loop. --- Telegram/SourceFiles/application.cpp | 54 ++++++++++++++++++++ Telegram/SourceFiles/application.h | 22 +++++++- Telegram/SourceFiles/ui/twidget.cpp | 5 ++ Telegram/SourceFiles/ui/twidget.h | 14 +++++ Telegram/SourceFiles/window/layer_widget.cpp | 2 +- 5 files changed, 95 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index 9038f1273..ed5df5917 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -102,6 +102,7 @@ Application::Application( int &argc, char **argv) : QApplication(argc, argv) +, _mainThreadId(QThread::currentThreadId()) , _launcher(launcher) , _updateChecker(Core::UpdaterDisabled() ? nullptr @@ -356,6 +357,12 @@ void Application::createMessenger() { Expects(!App::quitting()); _messengerInstance = std::make_unique(_launcher); + + // Ideally this should go to constructor. + // But we want to catch all native events and Messenger installs + // its own filter that can filter out some of them. So we install + // our filter after the Messenger constructor installs his. + installNativeEventFilter(this); } void Application::refreshGlobalProxy() { @@ -381,6 +388,53 @@ void Application::refreshGlobalProxy() { #endif // TDESKTOP_DISABLE_NETWORK_PROXY } +void Application::postponeCall(FnMut &&callable) { + Expects(callable != nullptr); + Expects(_eventNestingLevel > _loopNestingLevel); + + _postponedCalls.push_back({ + _loopNestingLevel, + std::move(callable) + }); +} + +bool Application::notify(QObject *receiver, QEvent *e) { + if (QThread::currentThreadId() != _mainThreadId) { + return QApplication::notify(receiver, e); + } + ++_eventNestingLevel; + const auto result = QApplication::notify(receiver, e); + if (_eventNestingLevel == _loopNestingLevel) { + _loopNestingLevel = _previousLoopNestingLevels.back(); + _previousLoopNestingLevels.pop_back(); + } + processPostponedCalls(--_eventNestingLevel); + return result; +} + +void Application::processPostponedCalls(int level) { + while (!_postponedCalls.empty()) { + auto &last = _postponedCalls.back(); + if (last.loopNestingLevel != level) { + break; + } + auto taken = std::move(last); + _postponedCalls.pop_back(); + taken.callable(); + } +} + +bool Application::nativeEventFilter( + const QByteArray &eventType, + void *message, + long *result) { + if (_eventNestingLevel > _loopNestingLevel) { + _previousLoopNestingLevels.push_back(_loopNestingLevel); + _loopNestingLevel = _eventNestingLevel; + } + return false; +} + void Application::closeApplication() { if (App::launchState() == App::QuitProcessed) return; App::setLaunchState(App::QuitProcessed); diff --git a/Telegram/SourceFiles/application.h b/Telegram/SourceFiles/application.h index 1ee681f4d..e88e520fb 100644 --- a/Telegram/SourceFiles/application.h +++ b/Telegram/SourceFiles/application.h @@ -15,7 +15,7 @@ class UpdateChecker; bool InternalPassportLink(const QString &url); bool StartUrlRequiresActivate(const QString &url); -class Application : public QApplication { +class Application : public QApplication, private QAbstractNativeEventFilter { Q_OBJECT public: @@ -26,6 +26,9 @@ public: void createMessenger(); void refreshGlobalProxy(); + void postponeCall(FnMut &&callable); + bool notify(QObject *receiver, QEvent *e) override; + ~Application(); signals: @@ -50,6 +53,23 @@ private: typedef QPair LocalClient; typedef QList LocalClients; + struct PostponedCall { + int loopNestingLevel = 0; + FnMut callable; + }; + + bool nativeEventFilter( + const QByteArray &eventType, + void *message, + long *result) override; + void processPostponedCalls(int level); + + const Qt::HANDLE _mainThreadId = nullptr; + int _eventNestingLevel = 0; + int _loopNestingLevel = 0; + std::vector _previousLoopNestingLevels; + std::vector _postponedCalls; + not_null _launcher; std::unique_ptr _messengerInstance; diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp index 0ccc63ed5..69cec0005 100644 --- a/Telegram/SourceFiles/ui/twidget.cpp +++ b/Telegram/SourceFiles/ui/twidget.cpp @@ -233,6 +233,11 @@ void ForceFullRepaint(not_null widget) { refresher->show(); } +void PostponeCall(FnMut &&callable) { + const auto app = static_cast(qApp); + app->postponeCall(std::move(callable)); +} + } // namespace Ui void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton button, const QPoint &globalPoint) { diff --git a/Telegram/SourceFiles/ui/twidget.h b/Telegram/SourceFiles/ui/twidget.h index bf52b63ee..c6051109f 100644 --- a/Telegram/SourceFiles/ui/twidget.h +++ b/Telegram/SourceFiles/ui/twidget.h @@ -59,6 +59,20 @@ QImage GrabWidgetToImage( void ForceFullRepaint(not_null widget); +void PostponeCall(FnMut &&callable); + +template < + typename Guard, + typename Callable, + typename GuardTraits = crl::guard_traits>, + typename = std::enable_if_t< + sizeof(GuardTraits) != crl::details::dependent_zero>> +inline void PostponeCall(Guard &&object, Callable &&callable) { + return PostponeCall(crl::guard( + std::forward(object), + std::forward(callable))); +} + } // namespace Ui enum class RectPart { diff --git a/Telegram/SourceFiles/window/layer_widget.cpp b/Telegram/SourceFiles/window/layer_widget.cpp index d817aba34..76e1e2026 100644 --- a/Telegram/SourceFiles/window/layer_widget.cpp +++ b/Telegram/SourceFiles/window/layer_widget.cpp @@ -375,7 +375,7 @@ void LayerStackWidget::keyPressEvent(QKeyEvent *e) { } void LayerStackWidget::mousePressEvent(QMouseEvent *e) { - crl::on_main(this, [=] { backgroundClicked(); }); + Ui::PostponeCall(this, [=] { backgroundClicked(); }); } void LayerStackWidget::backgroundClicked() {