Introducing the PlatformPanel event type.

This event can be used by any platform plugin to implement
special application panels/overlayed menus.

Currently used by QNX only.

This replaces sending fake Qt::Key_Menu presses in the QNX
plugin. Qt::Key_Menu is already used when invoking context
menus with the keyboard.

( backport of qtbase/9695df4d44b228e7e778ff17d5cccac30967b1fd )

Change-Id: Id5cf96758f1104f454a2bb977b367d09d4685b62
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>

5 files changed, 35 insertions, 1 deletions

diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 422e6debb8..e270a3265e 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -487,6 +487,7 @@ public:
     static void processKeyEvent(QWindowSystemInterfacePrivate::KeyEvent *e);
     static void processWheelEvent(QWindowSystemInterfacePrivate::WheelEvent *e);
     static void processTouchEvent(QWindowSystemInterfacePrivate::TouchEvent *e);
+    static void processPlatformPanelEvent(QWindowSystemInterfacePrivate::PlatformPanelEvent *e);
 
     static void processCloseEvent(QWindowSystemInterfacePrivate::CloseEvent *e);
 
diff --git a/src/gui/kernel/qapplication_qpa.cpp b/src/gui/kernel/qapplication_qpa.cpp
index aed539e6d1..011d81bcde 100644
--- a/src/gui/kernel/qapplication_qpa.cpp
+++ b/src/gui/kernel/qapplication_qpa.cpp
@@ -137,6 +137,10 @@ void QApplicationPrivate::processWindowSystemEvent(QWindowSystemInterfacePrivate
     case QWindowSystemInterfacePrivate::LocaleChange:
         QApplicationPrivate::reportLocaleChange();
         break;
+    case QWindowSystemInterfacePrivate::PlatformPanel:
+        QApplicationPrivate::processPlatformPanelEvent(
+                static_cast<QWindowSystemInterfacePrivate::PlatformPanelEvent *>(e));
+        break;
     default:
         qWarning() << "Unknown user input event type:" << e->type;
         break;
@@ -185,6 +189,7 @@ static bool qt_try_modal(QWidget *widget, QEvent::Type type)
     case QEvent::MouseMove:
     case QEvent::KeyPress:
     case QEvent::KeyRelease:
+    case QEvent::PlatformPanel:
         block_event         = true;
         break;
     default:
@@ -777,6 +782,19 @@ void QApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mouse
 #endif // QT_NO_CONTEXTMENU
 }
 
+void QApplicationPrivate::processPlatformPanelEvent(QWindowSystemInterfacePrivate::PlatformPanelEvent *e)
+{
+    if (!e->widget)
+        return;
+
+    if (app_do_modal && !qt_try_modal(e->widget.data(), QEvent::PlatformPanel)) {
+        // a modal window is blocking this window, don't allow events through
+        return;
+    }
+
+    QEvent ev(QEvent::PlatformPanel);
+    QApplication::sendSpontaneousEvent(e->widget.data(), &ev);
+}
 
 //### there's a lot of duplicated logic here -- refactoring required!
 
diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface_qpa.cpp
index 25c01ca8df..891ae6e7b4 100644
--- a/src/gui/kernel/qwindowsysteminterface_qpa.cpp
+++ b/src/gui/kernel/qwindowsysteminterface_qpa.cpp
@@ -298,5 +298,11 @@ void QWindowSystemInterface::handleLocaleChange()
     QWindowSystemInterfacePrivate::queueWindowSystemEvent(e);
 }
 
+void QWindowSystemInterface::handlePlatformPanelEvent(QWidget *w)
+{
+    QWindowSystemInterfacePrivate::PlatformPanelEvent *e =
+            new QWindowSystemInterfacePrivate::PlatformPanelEvent(w);
+    QWindowSystemInterfacePrivate::queueWindowSystemEvent(e);
+}
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.h b/src/gui/kernel/qwindowsysteminterface_qpa.h
index efd0681aa4..26fce4f9f1 100644
--- a/src/gui/kernel/qwindowsysteminterface_qpa.h
+++ b/src/gui/kernel/qwindowsysteminterface_qpa.h
@@ -102,6 +102,8 @@ public:
     static void handleScreenCountChange(int count);
 
     static void handleLocaleChange();
+
+    static void handlePlatformPanelEvent(QWidget *w);
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qwindowsysteminterface_qpa_p.h b/src/gui/kernel/qwindowsysteminterface_qpa_p.h
index 1e763e3463..cd59ad648c 100644
--- a/src/gui/kernel/qwindowsysteminterface_qpa_p.h
+++ b/src/gui/kernel/qwindowsysteminterface_qpa_p.h
@@ -62,7 +62,8 @@ public:
         ScreenGeometry,
         ScreenAvailableGeometry,
         ScreenCountChange,
-        LocaleChange
+        LocaleChange,
+        PlatformPanel
     };
 
     class WindowSystemEvent {
@@ -200,6 +201,12 @@ public:
             : WindowSystemEvent(LocaleChange) { }
     };
 
+   class PlatformPanelEvent : public WindowSystemEvent {
+   public:
+        explicit PlatformPanelEvent(QWidget *w)
+            : WindowSystemEvent(PlatformPanel), widget(w) { }
+        QWeakPointer<QWidget> widget;
+    };
 
     static QList<WindowSystemEvent *> windowSystemEventQueue;
     static QMutex queueMutex;