From db00428f146a7daf2c8b5c4de6c8c1e317f950a4 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 10 12月 2023 23:46:31 +0800
Subject: [PATCH] Fix macro definition mistake
---
src/core/contexts/win32windowcontext.cpp | 261 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 204 insertions(+), 57 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index eb4f40d..4d08adc 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -5,7 +5,6 @@
#include <QtCore/QHash>
#include <QtCore/QAbstractNativeEventFilter>
-#include <QtCore/QOperatingSystemVersion>
#include <QtCore/QScopeGuard>
#include <QtGui/QGuiApplication>
@@ -24,8 +23,11 @@
#include <shellscalingapi.h>
#include <dwmapi.h>
#include <timeapi.h>
+#include <versionhelpers.h>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_DECLARE_METATYPE(QMargins)
+#endif
namespace QWK {
@@ -60,46 +62,42 @@
// }
// };
//
-// #define DWM_API_DECLARE(NAME) decltype(&::NAME) p##NAME = DefaultFunc<decltype(&::NAME)>::func
-#define DWM_API_DECLARE(NAME) decltype(&::NAME) p##NAME = nullptr
+// #define DYNAMIC_API_DECLARE(NAME) decltype(&::NAME) p##NAME = DefaultFunc<decltype(&::NAME)>::func
+#define DYNAMIC_API_DECLARE(NAME) decltype(&::NAME) p##NAME = nullptr
- DWM_API_DECLARE(DwmFlush);
- DWM_API_DECLARE(DwmIsCompositionEnabled);
- DWM_API_DECLARE(DwmGetCompositionTimingInfo);
- DWM_API_DECLARE(GetDpiForWindow);
- DWM_API_DECLARE(GetSystemMetricsForDpi);
- DWM_API_DECLARE(GetDpiForMonitor);
- DWM_API_DECLARE(timeGetDevCaps);
- DWM_API_DECLARE(timeBeginPeriod);
- DWM_API_DECLARE(timeEndPeriod);
+ DYNAMIC_API_DECLARE(DwmFlush);
+ DYNAMIC_API_DECLARE(DwmIsCompositionEnabled);
+ DYNAMIC_API_DECLARE(DwmGetCompositionTimingInfo);
+ DYNAMIC_API_DECLARE(GetDpiForWindow);
+ DYNAMIC_API_DECLARE(GetSystemMetricsForDpi);
+ DYNAMIC_API_DECLARE(GetDpiForMonitor);
+ DYNAMIC_API_DECLARE(timeGetDevCaps);
+ DYNAMIC_API_DECLARE(timeBeginPeriod);
+ DYNAMIC_API_DECLARE(timeEndPeriod);
-#undef DWM_API_DECLARE
+#undef DYNAMIC_API_DECLARE
DynamicApis() {
+#define DYNAMIC_API_RESOLVE(DLL, NAME) p##NAME = reinterpret_cast<decltype(p##NAME)>(DLL.resolve(#NAME))
+
QSystemLibrary user32(QStringLiteral("user32"));
- pGetDpiForWindow =
- reinterpret_cast<decltype(pGetDpiForWindow)>(user32.resolve("GetDpiForWindow"));
- pGetSystemMetricsForDpi = reinterpret_cast<decltype(pGetSystemMetricsForDpi)>(
- user32.resolve("GetSystemMetricsForDpi"));
+ DYNAMIC_API_RESOLVE(user32, GetDpiForWindow);
+ DYNAMIC_API_RESOLVE(user32, GetSystemMetricsForDpi);
QSystemLibrary shcore(QStringLiteral("shcore"));
- pGetDpiForMonitor =
- reinterpret_cast<decltype(pGetDpiForMonitor)>(shcore.resolve("GetDpiForMonitor"));
+ DYNAMIC_API_RESOLVE(shcore, GetDpiForMonitor);
QSystemLibrary dwmapi(QStringLiteral("dwmapi"));
- pDwmFlush = reinterpret_cast<decltype(pDwmFlush)>(dwmapi.resolve("DwmFlush"));
- pDwmIsCompositionEnabled = reinterpret_cast<decltype(pDwmIsCompositionEnabled)>(
- dwmapi.resolve("DwmIsCompositionEnabled"));
- pDwmGetCompositionTimingInfo = reinterpret_cast<decltype(pDwmGetCompositionTimingInfo)>(
- dwmapi.resolve("DwmGetCompositionTimingInfo"));
+ DYNAMIC_API_RESOLVE(dwmapi, DwmFlush);
+ DYNAMIC_API_RESOLVE(dwmapi, DwmIsCompositionEnabled);
+ DYNAMIC_API_RESOLVE(dwmapi, DwmGetCompositionTimingInfo);
QSystemLibrary winmm(QStringLiteral("winmm"));
- ptimeGetDevCaps =
- reinterpret_cast<decltype(ptimeGetDevCaps)>(winmm.resolve("timeGetDevCaps"));
- ptimeBeginPeriod =
- reinterpret_cast<decltype(ptimeBeginPeriod)>(winmm.resolve("timeBeginPeriod"));
- ptimeEndPeriod =
- reinterpret_cast<decltype(ptimeEndPeriod)>(winmm.resolve("timeEndPeriod"));
+ DYNAMIC_API_RESOLVE(winmm, timeGetDevCaps);
+ DYNAMIC_API_RESOLVE(winmm, timeBeginPeriod);
+ DYNAMIC_API_RESOLVE(winmm, timeEndPeriod);
+
+#undef DYNAMIC_API_RESOLVE
}
~DynamicApis() = default;
@@ -194,20 +192,22 @@
}
static inline bool isWin8OrGreater() {
- static const bool result =
- QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows8;
+ static const bool result = ::IsWindows8OrGreater();
return result;
}
static inline bool isWin8Point1OrGreater() {
- static const bool result =
- QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows8_1;
+ static const bool result = ::IsWindows8Point1OrGreater();
return result;
}
static inline bool isWin10OrGreater() {
- static const bool result =
- QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10;
+ static const bool result = ::IsWindows10OrGreater();
+ return result;
+ }
+
+ static inline bool isWin11OrGreater() {
+ static const bool result = ::IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN10), LOBYTE(_WIN32_WINNT_WIN10), 22000);
return result;
}
@@ -235,8 +235,8 @@
return apis.pGetDpiForWindow(hwnd);
} else if (apis.pGetDpiForMonitor) { // Win8.1
HMONITOR monitor = ::MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
- UINT dpiX{USER_DEFAULT_SCREEN_DPI};
- UINT dpiY{USER_DEFAULT_SCREEN_DPI};
+ UINT dpiX{0};
+ UINT dpiY{0};
apis.pGetDpiForMonitor(monitor, MDT_EFFECTIVE_DPI, &dpiX, &dpiY);
return dpiX;
} else { // Win2K
@@ -287,7 +287,7 @@
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (QPlatformWindow *platformWindow = window->handle()) {
if (const auto ni = QGuiApplication::platformNativeInterface()) {
- ni->setWindowProperty(platformWindow, QStringLiteral("_q_windowsCustomMargins"),
+ ni->setWindowProperty(platformWindow, QStringLiteral("WindowsCustomMargins"),
marginsVar);
}
}
@@ -381,6 +381,66 @@
const qreal m_ms = (qreal(1000) * m / qreal(freq.QuadPart));
::Sleep(static_cast<DWORD>(std::round(m_ms)));
apis.ptimeEndPeriod(ms_granularity);
+ }
+
+ static inline void showSystemMenu2(HWND hWnd, const POINT &pos, const bool selectFirstEntry, const bool fixedSize)
+ {
+ const HMENU hMenu = ::GetSystemMenu(hWnd, FALSE);
+ if (!hMenu) {
+ // The corresponding window doesn't have a system menu, most likely due to the
+ // lack of the "WS_SYSMENU" window style. This situation should not be treated
+ // as an error so just ignore it and return early.
+ return;
+ }
+
+ const bool maxOrFull = IsMaximized(hWnd) || isFullScreen(hWnd);
+ ::EnableMenuItem(hMenu, SC_CLOSE, (MF_BYCOMMAND | MFS_ENABLED));
+ ::EnableMenuItem(hMenu, SC_MAXIMIZE, (MF_BYCOMMAND | ((maxOrFull || fixedSize) ? MFS_DISABLED : MFS_ENABLED)));
+ ::EnableMenuItem(hMenu, SC_RESTORE, (MF_BYCOMMAND | ((maxOrFull && !fixedSize) ? MFS_ENABLED : MFS_DISABLED)));
+ // The first menu item should be selected by default if the menu is brought
+ // up by keyboard. I don't know how to pre-select a menu item but it seems
+ // highlight can do the job. However, there's an annoying issue if we do
+ // this manually: the highlighted menu item is really only highlighted,
+ // not selected, so even if the mouse cursor hovers on other menu items
+ // or the user navigates to other menu items through keyboard, the original
+ // highlight bar will not move accordingly, the OS will generate another
+ // highlight bar to indicate the current selected menu item, which will make
+ // the menu look kind of weird. Currently I don't know how to fix this issue.
+ ::HiliteMenuItem(hWnd, hMenu, SC_RESTORE, (MF_BYCOMMAND | (selectFirstEntry ? MFS_HILITE : MFS_UNHILITE)));
+ ::EnableMenuItem(hMenu, SC_MINIMIZE, (MF_BYCOMMAND | MFS_ENABLED));
+ ::EnableMenuItem(hMenu, SC_SIZE, (MF_BYCOMMAND | ((maxOrFull || fixedSize) ? MFS_DISABLED : MFS_ENABLED)));
+ ::EnableMenuItem(hMenu, SC_MOVE, (MF_BYCOMMAND | (maxOrFull ? MFS_DISABLED : MFS_ENABLED)));
+
+ // The default menu item will appear in bold font. There can only be one default
+ // menu item per menu at most. Set the item ID to "UINT_MAX" (or simply "-1")
+ // can clear the default item for the given menu.
+ UINT defaultItemId = UINT_MAX;
+ if (isWin11OrGreater()) {
+ if (maxOrFull) {
+ defaultItemId = SC_RESTORE;
+ } else {
+ defaultItemId = SC_MAXIMIZE;
+ }
+ }
+ if (defaultItemId == UINT_MAX) {
+ defaultItemId = SC_CLOSE;
+ }
+ ::SetMenuDefaultItem(hMenu, defaultItemId, FALSE);
+
+ // Popup the system menu at the required position.
+ const auto result = ::TrackPopupMenu(hMenu, (TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN)), pos.x, pos.y, 0, hWnd, nullptr);
+
+ // Unhighlight the first menu item after the popup menu is closed, otherwise it will keep
+ // highlighting until we unhighlight it manually.
+ ::HiliteMenuItem(hWnd, hMenu, SC_RESTORE, (MF_BYCOMMAND | MFS_UNHILITE));
+
+ if (!result) {
+ // The user canceled the menu, no need to continue.
+ return;
+ }
+
+ // Send the command that the user chooses to the corresponding window.
+ ::PostMessageW(hWnd, WM_SYSCOMMAND, result, 0);
}
static inline Win32WindowContext::WindowPart getHitWindowPart(int hitTestResult) {
@@ -651,10 +711,6 @@
return false;
}
- if (systemMenuHandler(hWnd, message, wParam, lParam, result)) {
- return true;
- }
-
// Test snap layout
if (snapLayoutHandler(hWnd, message, wParam, lParam, result)) {
return true;
@@ -662,6 +718,10 @@
// Main implementation
if (customWindowHandler(hWnd, message, wParam, lParam, result)) {
+ return true;
+ }
+
+ if (systemMenuHandler(hWnd, message, wParam, lParam, result)) {
return true;
}
@@ -824,8 +884,7 @@
DWORD dwScreenPos = ::GetMessagePos();
POINT screenPoint{GET_X_LPARAM(dwScreenPos), GET_Y_LPARAM(dwScreenPos)};
::ScreenToClient(hWnd, &screenPoint);
- QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(
- QPoint{screenPoint.x, screenPoint.y}, m_windowHandle);
+ QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(point2qpoint(screenPoint), m_windowHandle);
auto dummy = CoreWindowAgent::Unknown;
if (isInSystemButtons(qtScenePos, &dummy)) {
// We must record whether the last WM_MOUSELEAVE was filtered, because if
@@ -1057,8 +1116,7 @@
auto clientWidth = RECT_WIDTH(clientRect);
auto clientHeight = RECT_HEIGHT(clientRect);
- QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(
- QPoint(nativeLocalPos.x, nativeLocalPos.y), m_windowHandle);
+ QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(point2qpoint(nativeLocalPos), m_windowHandle);
bool isFixedSize = m_delegate->isHostSizeFixed(m_host);
bool isTitleBar = isInTitleBarDraggableArea(qtScenePos);
@@ -1074,22 +1132,31 @@
// this is also the normal behavior of a native Win32 window (but only when the
// window is not maximized/fullscreen/minimized, of course).
if (isWindowNoState(hWnd)) {
- static constexpr const int kBorderSize = 2;
+ static constexpr const auto kBorderSize = quint8{2};
bool isTop = (nativeLocalPos.y <= kBorderSize);
+ bool isLeft = nativeLocalPos.x <= kBorderSize;
bool isRight = (nativeLocalPos.x >= (clientWidth - kBorderSize));
- if (isTop || isRight) {
+ if (isTop || isLeft || isRight) {
if (dontOverrideCursor) {
// The user doesn't want the window to be resized, so we tell
// Windows we are in the client area so that the controls beneath
// the mouse cursor can still be hovered or clicked.
*result = (isTitleBar ? HTCAPTION : HTCLIENT);
} else {
- if (isTop && isRight) {
- *result = HTTOPRIGHT;
- } else if (isTop) {
- *result = HTTOP;
+ if (isTop) {
+ if (isLeft) {
+ *result = HTTOPLEFT;
+ } else if (isRight) {
+ *result = HTTOPRIGHT;
+ } else {
+ *result = HTTOP;
+ }
} else {
- *result = HTRIGHT;
+ if (isLeft) {
+ *result = HTLEFT;
+ } else {
+ *result = HTRIGHT;
+ }
}
}
}
@@ -1189,9 +1256,9 @@
const bool isBottom = (nativeLocalPos.y >= (clientHeight - frameSize));
// Make the border a little wider to let the user easy to resize on corners.
const auto scaleFactor = ((isTop || isBottom) ? qreal(2) : qreal(1));
- const int scaledFrameSizeX = std::round(qreal(frameSize) * scaleFactor);
- const bool isLeft = (nativeLocalPos.x < scaledFrameSizeX);
- const bool isRight = (nativeLocalPos.x >= (clientWidth - scaledFrameSizeX));
+ const int scaledFrameSize = std::round(qreal(frameSize) * scaleFactor);
+ const bool isLeft = (nativeLocalPos.x < scaledFrameSize);
+ const bool isRight = (nativeLocalPos.x >= (clientWidth - scaledFrameSize));
if (dontOverrideCursor && (isTop || isBottom || isLeft || isRight)) {
// Return HTCLIENT instead of HTBORDER here, because the mouse is
// inside the window now, return HTCLIENT to let the controls
@@ -1536,6 +1603,86 @@
bool Win32WindowContext::systemMenuHandler(HWND hWnd, UINT message, WPARAM wParam,
LPARAM lParam, LRESULT *result) {
+ const auto getNativePosFromMouse = [lParam]() -> POINT {
+ return {GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)};
+ };
+ const auto getNativeGlobalPosFromKeyboard = [hWnd]() -> POINT {
+ const bool maxOrFull = IsMaximized(hWnd) || isFullScreen(hWnd);
+ const quint32 frameSize = getResizeBorderThickness(hWnd);
+ const quint32 horizontalOffset = ((maxOrFull || !isWin10OrGreater()) ? 0 : frameSize);
+ const auto verticalOffset = [hWnd, maxOrFull, frameSize]() -> quint32 {
+ const quint32 titleBarHeight = getTitleBarHeight(hWnd);
+ if (!isWin10OrGreater()) {
+ return titleBarHeight;
+ }
+ if (isWin11OrGreater()) {
+ if (maxOrFull) {
+ return (titleBarHeight + frameSize);
+ }
+ return titleBarHeight;
+ }
+ if (maxOrFull) {
+ return titleBarHeight;
+ }
+ return titleBarHeight - frameSize;
+ }();
+ RECT windowPos{};
+ ::GetWindowRect(hWnd, &windowPos);
+ return {static_cast<LONG>(windowPos.left + horizontalOffset), static_cast<LONG>(windowPos.top + verticalOffset)};
+ };
+ bool shouldShowSystemMenu = false;
+ bool broughtByKeyboard = false;
+ POINT nativeGlobalPos{};
+ switch (message) {
+ case WM_RBUTTONUP: {
+ const POINT nativeLocalPos = getNativePosFromMouse();
+ const QPoint qtScenePos = QHighDpi::fromNativeLocalPosition(point2qpoint(nativeLocalPos), m_windowHandle);
+ if (isInTitleBarDraggableArea(qtScenePos)) {
+ shouldShowSystemMenu = true;
+ nativeGlobalPos = nativeLocalPos;
+ ::ClientToScreen(hWnd, &nativeGlobalPos);
+ }
+ break;
+ }
+ case WM_NCRBUTTONUP: {
+ if (wParam == HTCAPTION) {
+ shouldShowSystemMenu = true;
+ nativeGlobalPos = getNativePosFromMouse();
+ }
+ break;
+ }
+ case WM_SYSCOMMAND: {
+ const WPARAM filteredWParam = (wParam & 0xFFF0);
+ if ((filteredWParam == SC_KEYMENU) && (lParam == VK_SPACE)) {
+ shouldShowSystemMenu = true;
+ broughtByKeyboard = true;
+ nativeGlobalPos = getNativeGlobalPosFromKeyboard();
+ }
+ break;
+ }
+ case WM_KEYDOWN:
+ case WM_SYSKEYDOWN: {
+ const bool altPressed = ((wParam == VK_MENU) || (::GetKeyState(VK_MENU) < 0));
+ const bool spacePressed = ((wParam == VK_SPACE) || (::GetKeyState(VK_SPACE) < 0));
+ if (altPressed && spacePressed) {
+ shouldShowSystemMenu = true;
+ broughtByKeyboard = true;
+ nativeGlobalPos = getNativeGlobalPosFromKeyboard();
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ if (shouldShowSystemMenu) {
+ showSystemMenu2(hWnd, nativeGlobalPos, broughtByKeyboard, m_delegate->isHostSizeFixed(m_host));
+ // QPA's internal code will handle system menu events separately, and its
+ // behavior is not what we would want to see because it doesn't know our
+ // window doesn't have any window frame now, so return early here to avoid
+ // entering Qt's own handling logic.
+ *result = FALSE;
+ return true;
+ }
return false;
}
--
Gitblit v1.9.1