1 files changed, 24 insertions, 11 deletions

diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h
index 58f786b153..677a5ed628 100644
--- a/src/gui/kernel/qwindowsysteminterface_p.h
+++ b/src/gui/kernel/qwindowsysteminterface_p.h
@@ -40,7 +40,7 @@ public:
         GeometryChange = 0x02,
         Enter = UserInputEvent | 0x03,
         Leave = UserInputEvent | 0x04,
-        ActivatedWindow = 0x05,
+        FocusWindow = 0x05,
         WindowStateChanged = 0x06,
         Mouse = UserInputEvent | 0x07,
         Wheel = UserInputEvent | 0x09,
@@ -68,7 +68,8 @@ public:
         WindowScreenChanged = 0x21,
         SafeAreaMarginsChanged = 0x22,
         ApplicationTermination = 0x23,
-        Paint = 0x24
+        Paint = 0x24,
+        WindowDevicePixelRatioChanged = 0x25,
     };
 
     class WindowSystemEvent {
@@ -124,12 +125,12 @@ public:
         QPointer<QWindow> leave;
     };
 
-    class ActivatedWindowEvent : public WindowSystemEvent {
+    class FocusWindowEvent : public WindowSystemEvent {
     public:
-        explicit ActivatedWindowEvent(QWindow *activatedWindow, Qt::FocusReason r)
-            : WindowSystemEvent(ActivatedWindow), activated(activatedWindow), reason(r)
+        explicit FocusWindowEvent(QWindow *focusedWindow, Qt::FocusReason r)
+            : WindowSystemEvent(FocusWindow), focused(focusedWindow), reason(r)
         { }
-        QPointer<QWindow> activated;
+        QPointer<QWindow> focused;
         Qt::FocusReason reason;
     };
 
@@ -154,6 +155,15 @@ public:
         QPointer<QScreen> screen;
     };
 
+    class WindowDevicePixelRatioChangedEvent : public WindowSystemEvent {
+    public:
+        WindowDevicePixelRatioChangedEvent(QWindow *w)
+            : WindowSystemEvent(WindowDevicePixelRatioChanged), window(w)
+        { }
+
+        QPointer<QWindow> window;
+    };
+
     class SafeAreaMarginsChangedEvent : public WindowSystemEvent {
     public:
         SafeAreaMarginsChangedEvent(QWindow *w)
@@ -214,9 +224,11 @@ public:
                    Qt::MouseButtons state, Qt::KeyboardModifiers mods,
                    Qt::MouseButton b, QEvent::Type type,
                    Qt::MouseEventSource src = Qt::MouseEventNotSynthesized, bool frame = false,
-                   const QPointingDevice *device = QPointingDevice::primaryPointingDevice())
+                   const QPointingDevice *device = QPointingDevice::primaryPointingDevice(),
+                   int evPtId = -1)
             : PointerEvent(w, time, Mouse, mods, device), localPos(local), globalPos(global),
-              buttons(state), source(src), nonClientArea(frame), button(b), buttonType(type) { }
+              buttons(state), source(src), nonClientArea(frame), button(b), buttonType(type),
+              eventPointId(evPtId) { }
 
         QPointF localPos;
         QPointF globalPos;
@@ -225,6 +237,7 @@ public:
         bool nonClientArea;
         Qt::MouseButton button;
         QEvent::Type buttonType;
+        int eventPointId; // from the original device if synth-mouse, otherwise -1
     };
 
     class WheelEvent : public PointerEvent {
@@ -463,8 +476,8 @@ public:
         }
         void append(WindowSystemEvent *e)
         { const QMutexLocker locker(&mutex); impl.append(e); }
-        int count() const
-        { const QMutexLocker locker(&mutex); return impl.count(); }
+        qsizetype count() const
+        { const QMutexLocker locker(&mutex); return impl.size(); }
         WindowSystemEvent *peekAtFirstOfType(EventType t) const
         {
             const QMutexLocker locker(&mutex);
@@ -490,7 +503,7 @@ public:
 
     static WindowSystemEventList windowSystemEventQueue;
 
-    static int windowSystemEventsQueued();
+    static qsizetype windowSystemEventsQueued();
     static bool nonUserInputEventsQueued();
     static WindowSystemEvent *getWindowSystemEvent();
     static WindowSystemEvent *getNonUserInputWindowSystemEvent();