From 87b7caada401149efda7bfee5289babdbcd5165f Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 30 4月 2024 14:01:16 +0800
Subject: [PATCH] Update version
---
src/core/contexts/win32windowcontext.cpp | 190 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 157 insertions(+), 33 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index a10b3e0..811fd44 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -6,13 +6,16 @@
#include <optional>
+#include <QtCore/QAbstractEventDispatcher>
+#include <QtCore/QDateTime>
#include <QtCore/QHash>
#include <QtCore/QScopeGuard>
#include <QtCore/QTimer>
-#include <QtCore/QDateTime>
#include <QtGui/QGuiApplication>
#include <QtGui/QPainter>
#include <QtGui/QPalette>
+
+#include <QtGui/qpa/qwindowsysteminterface.h>
#include <QtGui/private/qhighdpiscaling_p.h>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -153,7 +156,7 @@
[[maybe_unused]] const auto &cleaner =
qScopeGuard([windowThreadProcessId, currentThreadId]() {
::AttachThreadInput(windowThreadProcessId, currentThreadId, FALSE); //
- });
+ }); // TODO: Remove it
::BringWindowToTop(hwnd);
// Activate the window too. This will force us to the virtual desktop this
@@ -359,6 +362,107 @@
return true;
}
+ static inline constexpr bool isNonClientMessage(const UINT message) {
+ if (((message >= WM_NCCREATE) && (message <= WM_NCACTIVATE)) ||
+ ((message >= WM_NCMOUSEMOVE) && (message <= WM_NCMBUTTONDBLCLK)) ||
+ ((message >= WM_NCXBUTTONDOWN) && (message <= WM_NCXBUTTONDBLCLK))
+#if (WINVER >= _WIN32_WINNT_WIN8)
+ || ((message >= WM_NCPOINTERUPDATE) && (message <= WM_NCPOINTERUP))
+#endif
+ || ((message == WM_NCMOUSEHOVER) || (message == WM_NCMOUSELEAVE))) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ static MSG createMessageBlock(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
+ MSG msg;
+ msg.hwnd = hWnd; // re-create MSG structure
+ msg.message = message; // time and pt fields ignored
+ msg.wParam = wParam;
+ msg.lParam = lParam;
+
+ const DWORD dwScreenPos = ::GetMessagePos();
+ msg.pt.x = GET_X_LPARAM(dwScreenPos);
+ msg.pt.y = GET_Y_LPARAM(dwScreenPos);
+ if (!isNonClientMessage(message)) {
+ ::ScreenToClient(hWnd, &msg.pt);
+ }
+ return msg;
+ }
+
+ static inline constexpr bool isInputMessage(UINT m) {
+ switch (m) {
+ case WM_IME_STARTCOMPOSITION:
+ case WM_IME_ENDCOMPOSITION:
+ case WM_IME_COMPOSITION:
+ case WM_INPUT:
+ case WM_TOUCH:
+ case WM_MOUSEHOVER:
+ case WM_MOUSELEAVE:
+ case WM_NCMOUSEHOVER:
+ case WM_NCMOUSELEAVE:
+ case WM_SIZING:
+ case WM_MOVING:
+ case WM_SYSCOMMAND:
+ case WM_COMMAND:
+ case WM_DWMNCRENDERINGCHANGED:
+ case WM_PAINT:
+ return true;
+ default:
+ break;
+ }
+ return (m >= WM_MOUSEFIRST && m <= WM_MOUSELAST) ||
+ (m >= WM_NCMOUSEMOVE && m <= WM_NCXBUTTONDBLCLK) ||
+ (m >= WM_KEYFIRST && m <= WM_KEYLAST);
+ }
+
+ static inline QByteArray nativeEventType() {
+ return QByteArrayLiteral("windows_generic_MSG");
+ }
+
+ // Send to QAbstractEventDispatcher
+ bool filterNativeEvent(MSG *msg, LRESULT *result) {
+ auto dispatcher = QAbstractEventDispatcher::instance();
+ QT_NATIVE_EVENT_RESULT_TYPE filterResult = *result;
+ if (dispatcher && dispatcher->filterNativeEvent(nativeEventType(), msg, &filterResult)) {
+ *result = LRESULT(filterResult);
+ return true;
+ }
+ return false;
+ }
+
+ // Send to QWindowSystemInterface
+ bool filterNativeEvent(QWindow *window, MSG *msg, LRESULT *result) {
+ QT_NATIVE_EVENT_RESULT_TYPE filterResult = *result;
+ if (QWindowSystemInterface::handleNativeEvent(window, nativeEventType(), msg,
+ &filterResult)) {
+ *result = LRESULT(filterResult);
+ return true;
+ }
+ return false;
+ }
+
+ static inline bool forwardFilteredEvent(QWindow *window, HWND hWnd, UINT message, WPARAM wParam,
+ LPARAM lParam, LRESULT *result) {
+ MSG msg = createMessageBlock(hWnd, message, wParam, lParam);
+
+ // https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowscontext.cpp#L1025
+ // Do exact the same as what Qt Windows plugin does.
+
+ // Run the native event filters. QTBUG-67095: Exclude input messages which are sent
+ // by QEventDispatcherWin32::processEvents()
+ if (!isInputMessage(msg.message) && filterNativeEvent(&msg, result))
+ return true;
+
+ auto platformWindow = window->handle();
+ if (platformWindow && filterNativeEvent(platformWindow->window(), &msg, result))
+ return true;
+
+ return false;
+ }
+
// https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowscontext.cpp#L1556
// In QWindowsContext::windowsProc(), the messages will be passed to all global native event
// filters, but because we have already filtered the messages in the hook WndProc function for
@@ -378,17 +482,38 @@
return false;
}
- // https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowscontext.cpp#L1546
- // Qt needs to refer to the WM_NCCALCSIZE message data that hasn't been processed, so we
- // have to process it after Qt acquires the initial data.
auto msg = static_cast<const MSG *>(message);
- if (msg->message == WM_NCCALCSIZE && lastMessageContext) {
- LRESULT res;
- if (lastMessageContext->nonClientCalcSizeHandler(msg->hwnd, msg->message,
- msg->wParam, msg->lParam, &res)) {
- *result = decltype(*result)(res);
- return true;
+ switch (msg->message) {
+ case WM_NCCALCSIZE: {
+ // https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowscontext.cpp#L1546
+ // Qt needs to refer to the WM_NCCALCSIZE message data that hasn't been
+ // processed, so we have to process it after Qt acquires the initial data.
+ if (lastMessageContext) {
+ LRESULT res;
+ if (lastMessageContext->nonClientCalcSizeHandler(
+ msg->hwnd, msg->message, msg->wParam, msg->lParam, &res)) {
+ *result = decltype(*result)(res);
+ return true;
+ }
+ }
+ break;
}
+
+ // case WM_NCHITTEST: {
+ // // The child window must return HTTRANSPARENT when processing
+ // WM_NCHITTEST for
+ // // the parent window to receive WM_NCHITTEST.
+ // if (!lastMessageContext) {
+ // auto rootHWnd = ::GetAncestor(msg->hwnd, GA_ROOT);
+ // if (rootHWnd != msg->hwnd) {
+ // if (auto ctx = g_wndProcHash->value(rootHWnd)) {
+ // *result = HTTRANSPARENT;
+ // return true;
+ // }
+ // }
+ // }
+ // break;
+ // }
}
return false;
}
@@ -477,18 +602,24 @@
return ::DefWindowProcW(hWnd, message, wParam, lParam);
}
+ WindowsNativeEventFilter::lastMessageContext = ctx;
+ const auto &contextCleaner = qScopeGuard([]() {
+ WindowsNativeEventFilter::lastMessageContext = nullptr; //
+ });
+
// Since Qt does the necessary processing of the WM_NCCALCSIZE message, we need to
// forward it right away and process it in our native event filter.
if (message == WM_NCCALCSIZE) {
- WindowsNativeEventFilter::lastMessageContext = ctx;
- LRESULT result = ::CallWindowProcW(g_qtWindowProc, hWnd, message, wParam, lParam);
- WindowsNativeEventFilter::lastMessageContext = nullptr;
- return result;
+ return ::CallWindowProcW(g_qtWindowProc, hWnd, message, wParam, lParam);
}
// Try hooked procedure and save result
LRESULT result;
if (ctx->windowProc(hWnd, message, wParam, lParam, &result)) {
+ // Forward the event to user-defined native event filters, there may be some messages
+ // that need to be processed by the user.
+ std::ignore =
+ forwardFilteredEvent(ctx->window(), hWnd, message, wParam, lParam, &result);
return result;
}
@@ -497,18 +628,10 @@
}
static inline void addManagedWindow(QWindow *window, HWND hWnd, Win32WindowContext *ctx) {
- const auto margins = [hWnd]() -> QMargins {
- const auto titleBarHeight = int(getTitleBarHeight(hWnd));
- if (isSystemBorderEnabled()) {
- return {0, -titleBarHeight, 0, 0};
- } else {
- const auto frameSize = int(getResizeBorderThickness(hWnd));
- return {-frameSize, -titleBarHeight, -frameSize, -frameSize};
- }
- }();
-
- // Inform Qt we want and have set custom margins
- setInternalWindowFrameMargins(window, margins);
+ if (isSystemBorderEnabled()) {
+ // Inform Qt we want and have set custom margins
+ setInternalWindowFrameMargins(window, QMargins(0, -int(getTitleBarHeight(hWnd)), 0, 0));
+ }
// Store original window proc
if (!g_qtWindowProc) {
@@ -699,6 +822,11 @@
mouseLeaveBlocked = false;
lastHitTestResult = WindowPart::Outside;
+ if (!isSystemBorderEnabled()) {
+ m_delegate->setWindowFlags(m_host, m_delegate->getWindowFlags(m_host) |
+ Qt::FramelessWindowHint);
+ }
+
// If the original window id is valid, remove all resources related
if (oldWinId) {
removeManagedWindow(reinterpret_cast<HWND>(oldWinId));
@@ -774,13 +902,9 @@
// Forward to native event filter subscribers
if (!m_nativeEventFilters.isEmpty()) {
- MSG msg;
- msg.hwnd = hWnd;
- msg.message = message;
- msg.wParam = wParam;
- msg.lParam = lParam;
+ MSG msg = createMessageBlock(hWnd, message, wParam, lParam);
QT_NATIVE_EVENT_RESULT_TYPE res = 0;
- if (nativeDispatch(QByteArrayLiteral("windows_generic_MSG"), &msg, &res)) {
+ if (nativeDispatch(nativeEventType(), &msg, &res)) {
*result = LRESULT(res);
return true;
}
--
Gitblit v1.9.1