QQuickWindow: keep a collection of devices which own event instances

That will allow the event instances to hold state, even between events.
So now every QQuickWindow has its own set of them, per device.
Hopefully that means we won't have any trouble delivering events in parallel
in case each window has its own thread. Otherwise maybe it's slightly
wasteful in multi-window apps.

Change-Id: I766b580e1c177255905cc04b5de7d33ae503c6fd
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index 7183d17514..ab704b9adf 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -163,6 +163,7 @@ public:
     void deliverDelayedTouchEvent();
 
     // delivery of pointer events:
+    QQuickPointerEvent *pointerEventInstance(QEvent *ev);
     void deliverPointerEvent(QQuickPointerEvent *);
     void deliverTouchEvent(QQuickPointerEvent *);
     bool deliverTouchCancelEvent(QTouchEvent *);
@@ -245,9 +246,10 @@ public:
     QQuickAnimatorController *animationController;
     QScopedPointer<QTouchEvent> delayedTouch;
 
-    // The current touch or mouse event that is delivered.
-    // This event gets re-used (reset) for every incoming mouse/touch event.
-    QQuickPointerEvent currentPointerEvent;
+    // An event instance for each device that we've seen so far.
+    // One of these gets re-used (reset) for every incoming mouse/touch/tablet event.
+    // One reason to keep them separate is so that m_touchPoints will be only those from a single device.
+    QVector<QQuickPointerEvent> pointerEventsByDevice;
     int pointerEventRecursionGuard;
     QQuickCustomRenderStage *customRenderStage;