Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: I33e0abc771a2a772d3334172d50e7b0efe896590

4 files changed, 38 insertions, 27 deletions

diff --git a/src/plugins/platforms/windows/qtwindowsglobal.h b/src/plugins/platforms/windows/qtwindowsglobal.h
index ef22a4451a..985f13bdc5 100644
--- a/src/plugins/platforms/windows/qtwindowsglobal.h
+++ b/src/plugins/platforms/windows/qtwindowsglobal.h
@@ -71,6 +71,7 @@
 #  define WM_POINTERENTER    0x0249
 #  define WM_POINTERLEAVE    0x024A
 #  define WM_POINTERACTIVATE 0x024B
+#  define WM_POINTERCAPTURECHANGED 0x024C
 #  define WM_POINTERWHEEL    0x024E
 #  define WM_POINTERHWHEEL   0x024F
 #endif // WM_POINTERUPDATE
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index 0df6264bcb..03bb1bee48 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -65,6 +65,7 @@
 
 #include <QtGui/qwindow.h>
 #include <qpa/qwindowsysteminterface.h>
+#include <qpa/qwindowsysteminterface_p.h>
 #include <qpa/qplatformnativeinterface.h>
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qopenglcontext.h>
@@ -201,6 +202,7 @@ void QWindowsUser32DLL::init()
         getPointerTouchInfo = (GetPointerTouchInfo)library.resolve("GetPointerTouchInfo");
         getPointerFrameTouchInfo = (GetPointerFrameTouchInfo)library.resolve("GetPointerFrameTouchInfo");
         getPointerPenInfo = (GetPointerPenInfo)library.resolve("GetPointerPenInfo");
+        skipPointerFrameMessages = (SkipPointerFrameMessages)library.resolve("SkipPointerFrameMessages");
     }
 
     if (QOperatingSystemVersion::current()
@@ -214,7 +216,8 @@ void QWindowsUser32DLL::init()
 bool QWindowsUser32DLL::supportsPointerApi()
 {
     return enableMouseInPointer && getPointerType && getPointerInfo && getPointerDeviceRects
-            && getPointerTouchInfo && getPointerFrameTouchInfo && getPointerPenInfo;
+            && getPointerTouchInfo && getPointerFrameTouchInfo && getPointerPenInfo
+            && skipPointerFrameMessages;
 }
 
 void QWindowsShcoreDLL::init()
@@ -327,8 +330,12 @@ bool QWindowsContext::initTouch(unsigned integrationOptions)
     if (!touchDevice)
         return false;
 
-    if (!(integrationOptions & QWindowsIntegration::DontPassOsMouseEventsSynthesizedFromTouch))
-        touchDevice->setCapabilities(touchDevice->capabilities() | QTouchDevice::MouseEmulation);
+    if (d->m_systemInfo & QWindowsContext::SI_SupportsPointer) {
+        QWindowSystemInterfacePrivate::TabletEvent::setPlatformSynthesizesMouse(false);
+    } else {
+        if (!(integrationOptions & QWindowsIntegration::DontPassOsMouseEventsSynthesizedFromTouch))
+            touchDevice->setCapabilities(touchDevice->capabilities() | QTouchDevice::MouseEmulation);
+    }
 
     QWindowSystemInterface::registerTouchDevice(touchDevice);
 
diff --git a/src/plugins/platforms/windows/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h
index 33bd42a669..8102e0bf19 100644
--- a/src/plugins/platforms/windows/qwindowscontext.h
+++ b/src/plugins/platforms/windows/qwindowscontext.h
@@ -93,6 +93,7 @@ struct QWindowsUser32DLL
     typedef BOOL (WINAPI *GetPointerTouchInfo)(UINT32, PVOID);
     typedef BOOL (WINAPI *GetPointerFrameTouchInfo)(UINT32, UINT32 *, PVOID);
     typedef BOOL (WINAPI *GetPointerPenInfo)(UINT32, PVOID);
+    typedef BOOL (WINAPI *SkipPointerFrameMessages)(UINT32);
     typedef BOOL (WINAPI *SetProcessDPIAware)();
     typedef BOOL (WINAPI *AddClipboardFormatListener)(HWND);
     typedef BOOL (WINAPI *RemoveClipboardFormatListener)(HWND);
@@ -110,6 +111,7 @@ struct QWindowsUser32DLL
     GetPointerTouchInfo getPointerTouchInfo = nullptr;
     GetPointerFrameTouchInfo getPointerFrameTouchInfo = nullptr;
     GetPointerPenInfo getPointerPenInfo = nullptr;
+    SkipPointerFrameMessages skipPointerFrameMessages = nullptr;
 
     // Windows Vista onwards
     SetProcessDPIAware setProcessDPIAware = nullptr;
diff --git a/src/plugins/platforms/windows/qwindowspointerhandler.cpp b/src/plugins/platforms/windows/qwindowspointerhandler.cpp
index abd4d56da0..d8918d1b3d 100644
--- a/src/plugins/platforms/windows/qwindowspointerhandler.cpp
+++ b/src/plugins/platforms/windows/qwindowspointerhandler.cpp
@@ -354,6 +354,17 @@ bool QWindowsPointerHandler::translateTouchEvent(QWindow *window, HWND hwnd,
     if (count < 1)
         return false;
 
+    if (msg.message == WM_POINTERCAPTURECHANGED) {
+        QWindowSystemInterface::handleTouchCancelEvent(window, m_touchDevice,
+                                                       QWindowsKeyMapper::queryKeyboardModifiers());
+        m_lastTouchPositions.clear();
+        return true;
+    }
+
+    // Only handle down/up/update, ignore others like WM_POINTERENTER, WM_POINTERLEAVE, etc.
+    if (msg.message > WM_POINTERUP)
+        return false;
+
     const QScreen *screen = window->screen();
     if (!screen)
         screen = QGuiApplication::primaryScreen();
@@ -366,7 +377,18 @@ bool QWindowsPointerHandler::translateTouchEvent(QWindow *window, HWND hwnd,
 
     QList<QWindowSystemInterface::TouchPoint> touchPoints;
 
+    if (QWindowsContext::verbose > 1)
+        qCDebug(lcQpaEvents).noquote().nospace() << showbase
+                << __FUNCTION__
+                << " message=" << hex << msg.message
+                << " count=" << dec << count;
+
     for (quint32 i = 0; i < count; ++i) {
+        if (QWindowsContext::verbose > 1)
+            qCDebug(lcQpaEvents).noquote().nospace() << showbase
+                    << "    TouchPoint id=" << touchInfo[i].pointerInfo.pointerId
+                    << " frame=" << touchInfo[i].pointerInfo.frameId
+                    << " flags=" << hex << touchInfo[i].pointerInfo.pointerFlags;
 
         QWindowSystemInterface::TouchPoint touchPoint;
         touchPoint.id = touchInfo[i].pointerInfo.pointerId;
@@ -398,26 +420,14 @@ bool QWindowsPointerHandler::translateTouchEvent(QWindow *window, HWND hwnd,
             m_lastTouchPositions.insert(touchPoint.id, touchPoint.normalPosition);
         }
         touchPoints.append(touchPoint);
+
+        // Avoid getting repeated messages for this frame if there are multiple pointerIds
+        QWindowsContext::user32dll.skipPointerFrameMessages(touchInfo[i].pointerInfo.pointerId);
     }
 
     QWindowSystemInterface::handleTouchEvent(window, m_touchDevice, touchPoints,
                                              QWindowsKeyMapper::queryKeyboardModifiers());
 
-    if (!(QWindowsIntegration::instance()->options() & QWindowsIntegration::DontPassOsMouseEventsSynthesizedFromTouch)) {
-
-        const QPoint globalPos = QPoint(touchInfo->pointerInfo.ptPixelLocation.x, touchInfo->pointerInfo.ptPixelLocation.y);
-        const QPoint localPos = QWindowsGeometryHint::mapFromGlobal(hwnd, globalPos);
-        const Qt::KeyboardModifiers keyModifiers = QWindowsKeyMapper::queryKeyboardModifiers();
-        const Qt::MouseButtons mouseButtons = queryMouseButtons();
-
-        QEvent::Type eventType;
-        Qt::MouseButton button;
-        getMouseEventInfo(msg.message, touchInfo->pointerInfo.ButtonChangeType, globalPos, &eventType, &button);
-
-        QWindowSystemInterface::handleMouseEvent(window, localPos, globalPos, mouseButtons, button, eventType,
-                                                 keyModifiers, Qt::MouseEventSynthesizedByQt);
-    }
-
     return true;
 }
 
@@ -510,15 +520,6 @@ bool QWindowsPointerHandler::translatePenEvent(QWindow *window, HWND hwnd, QtWin
         QWindowSystemInterface::handleTabletEvent(target, localPos, hiResGlobalPos, device, type, mouseButtons,
                                                   pressure, xTilt, yTilt, tangentialPressure, rotation, z,
                                                   pointerId, keyModifiers);
-
-        if (!(QWindowsIntegration::instance()->options() & QWindowsIntegration::DontPassOsMouseEventsSynthesizedFromTouch)) {
-            QEvent::Type eventType;
-            Qt::MouseButton button;
-            getMouseEventInfo(msg.message, penInfo->pointerInfo.ButtonChangeType, globalPos, &eventType, &button);
-
-            QWindowSystemInterface::handleMouseEvent(target, localPos, globalPos, mouseButtons, button, eventType,
-                                                     keyModifiers, Qt::MouseEventSynthesizedByQt);
-        }
         break;
     }
     }