Move pointerEvent instance to QQuickWindow

With two or more windows, if events are being delivered to each, the
grabbers can be different in each.  We need unique instances of the
QQuickPointerEvent objects for each window to avoid losing the grab state in
the parent window while delivering a synthesized event to a subwindow, for
example.

Change-Id: I51da1212d573853969e32ad78f5b219d979a8a5c
Task-number: QTBUG-57253
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

1 files changed, 7 insertions, 18 deletions

diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h
index cf6f83e5b1..3735d68a85 100644
--- a/src/quick/items/qquickevents_p_p.h
+++ b/src/quick/items/qquickevents_p_p.h
@@ -332,9 +332,9 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPointerEvent : public QObject
     Q_PROPERTY(Qt::MouseButtons buttons READ buttons)
 
 public:
-    QQuickPointerEvent(QObject *parent = nullptr)
+    QQuickPointerEvent(QObject *parent = nullptr, QQuickPointerDevice *device = nullptr)
       : QObject(parent)
-      , m_device(nullptr)
+      , m_device(device)
       , m_event(nullptr)
       , m_button(Qt::NoButton)
       , m_pressedButtons(Qt::NoButton)
@@ -385,8 +385,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPointerMouseEvent : public QQuickPointerEvent
 {
     Q_OBJECT
 public:
-    QQuickPointerMouseEvent(QObject *parent = nullptr)
-        : QQuickPointerEvent(parent), m_mousePoint(new QQuickEventPoint(this)) { }
+    QQuickPointerMouseEvent(QObject *parent = nullptr, QQuickPointerDevice *device = nullptr)
+        : QQuickPointerEvent(parent, device), m_mousePoint(new QQuickEventPoint(this)) { }
 
     QQuickPointerEvent *reset(QEvent *) override;
     bool isPressEvent() const override;
@@ -411,8 +411,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPointerTouchEvent : public QQuickPointerEvent
 {
     Q_OBJECT
 public:
-    QQuickPointerTouchEvent(QObject *parent = nullptr)
-        : QQuickPointerEvent(parent)
+    QQuickPointerTouchEvent(QObject *parent = nullptr, QQuickPointerDevice *device = nullptr)
+        : QQuickPointerEvent(parent, device)
         , m_pointCount(0)
         , m_synthMouseEvent(QEvent::MouseMove, QPointF(), Qt::NoButton, Qt::NoButton, Qt::NoModifier)
     { }
@@ -500,18 +500,10 @@ public:
     QQuickPointerDevice(DeviceType devType, PointerType pType, Capabilities caps, int maxPoints, int buttonCount, const QString &name, qint64 uniqueId = 0)
       : m_deviceType(devType), m_pointerType(pType), m_capabilities(caps)
       , m_maximumTouchPoints(maxPoints), m_buttonCount(buttonCount), m_name(name)
-      , m_uniqueId(QPointingDeviceUniqueId::fromNumericId(uniqueId)), m_event(nullptr)
+      , m_uniqueId(QPointingDeviceUniqueId::fromNumericId(uniqueId))
     {
-        if (m_deviceType == Mouse) {
-            m_event = new QQuickPointerMouseEvent;
-        } else if (m_deviceType == TouchScreen || m_deviceType == TouchPad) {
-            m_event = new QQuickPointerTouchEvent;
-        } else {
-            Q_ASSERT(false);
-        }
     }
 
-    ~QQuickPointerDevice() { delete m_event; }
     DeviceType type() const { return m_deviceType; }
     PointerType pointerType() const { return m_pointerType; }
     Capabilities capabilities() const { return m_capabilities; }
@@ -520,7 +512,6 @@ public:
     int buttonCount() const { return m_buttonCount; }
     QString name() const { return m_name; }
     QPointingDeviceUniqueId uniqueId() const { return m_uniqueId; }
-    QQuickPointerEvent *pointerEvent() const { return m_event; }
 
     static QQuickPointerDevice *touchDevice(QTouchDevice *d);
     static QList<QQuickPointerDevice *> touchDevices();
@@ -535,8 +526,6 @@ private:
     int m_buttonCount;
     QString m_name;
     QPointingDeviceUniqueId m_uniqueId;
-    // the device-specific event instance which is reused during event delivery
-    QQuickPointerEvent *m_event;
 
     Q_DISABLE_COPY(QQuickPointerDevice)
 };