From 44c08f3cc456155b960ca5a115df93109d2202ce Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 13 12月 2023 23:22:25 +0800
Subject: [PATCH] Remove event observer
---
src/core/contexts/win32windowcontext.cpp | 262 +++++++++++++++++++++++++++++++---------------------
1 files changed, 157 insertions(+), 105 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 78a54c5..86ec6bd 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -4,6 +4,7 @@
#include <QtCore/QHash>
#include <QtCore/QScopeGuard>
+#include <QtCore/QTimer>
#include <QtGui/QGuiApplication>
#include <QtGui/QPainter>
#include <QtGui/QPalette>
@@ -26,7 +27,7 @@
#include <dwmapi.h>
#include <timeapi.h>
-#include "nativeeventfilter.h"
+#include "qwkglobal_p.h"
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_DECLARE_METATYPE(QMargins)
@@ -34,27 +35,42 @@
namespace QWK {
- using _DWMWINDOWATTRIBUTE = enum _DWMWINDOWATTRIBUTE
- {
- _DWMWA_USE_HOSTBACKDROPBRUSH = 17, // [set] BOOL, Allows the use of host backdrop brushes for the window.
- _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19, // Undocumented, the same with DWMWA_USE_IMMERSIVE_DARK_MODE, but available on systems before Win10 20H1.
- _DWMWA_USE_IMMERSIVE_DARK_MODE = 20, // [set] BOOL, Allows a window to either use the accent color, or dark, according to the user Color Mode preferences.
- _DWMWA_WINDOW_CORNER_PREFERENCE = 33, // [set] WINDOW_CORNER_PREFERENCE, Controls the policy that rounds top-level window corners
- _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS = 37, // [get] UINT, width of the visible border around a thick frame window
- _DWMWA_SYSTEMBACKDROP_TYPE = 38, // [get, set] SYSTEMBACKDROP_TYPE, Controls the system-drawn backdrop material of a window, including behind the non-client area.
- _DWMWA_MICA_EFFECT = 1029 // Undocumented, use this value to enable Mica material on Win11 21H2. You should use DWMWA_SYSTEMBACKDROP_TYPE instead on Win11 22H2 and newer.
+ enum _DWMWINDOWATTRIBUTE {
+ // [set] BOOL, Allows the use of host backdrop brushes for the window.
+ _DWMWA_USE_HOSTBACKDROPBRUSH = 17,
+
+ // Undocumented, the same with DWMWA_USE_IMMERSIVE_DARK_MODE, but available on systems
+ // before Win10 20H1.
+ _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19,
+
+ // [set] BOOL, Allows a window to either use the accent color, or dark, according to the
+ // user Color Mode preferences.
+ _DWMWA_USE_IMMERSIVE_DARK_MODE = 20,
+
+ // [set] WINDOW_CORNER_PREFERENCE, Controls the policy that rounds top-level window corners
+ _DWMWA_WINDOW_CORNER_PREFERENCE = 33,
+
+ // [get] UINT, width of the visible border around a thick frame window
+ _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS = 37,
+
+ // [get, set] SYSTEMBACKDROP_TYPE, Controls the system-drawn backdrop material of a window,
+ // including behind the non-client area.
+ _DWMWA_SYSTEMBACKDROP_TYPE = 38,
+
+ // Undocumented, use this value to enable Mica material on Win11 21H2. You should use
+ // DWMWA_SYSTEMBACKDROP_TYPE instead on Win11 22H2 and newer.
+ _DWMWA_MICA_EFFECT = 1029
};
// The thickness of an auto-hide taskbar in pixels.
- static constexpr const auto kAutoHideTaskBarThickness = quint8{2};
+ static constexpr const quint8 kAutoHideTaskBarThickness = 2;
- static inline constexpr const auto kFrameBorderActiveColorLight =
- QColor{110, 110, 110}; // #6E6E6E
- static inline constexpr const auto kFrameBorderActiveColorDark = QColor{51, 51, 51}; // #333333
- static inline constexpr const auto kFrameBorderInactiveColorLight =
- QColor{167, 167, 167}; // #A7A7A7
- static inline constexpr const auto kFrameBorderInactiveColorDark =
- QColor{61, 61, 62}; // #3D3D3E
+ QWK_USED static constexpr const struct {
+ const uint32_t activeLight = MAKE_RGBA_COLOR(110, 110, 110, 255); // #6E6E6E
+ const uint32_t activeDark = MAKE_RGBA_COLOR(51, 51, 51, 255); // #333333
+ const uint32_t inactiveLight = MAKE_RGBA_COLOR(167, 167, 167, 255); // #A7A7A7
+ const uint32_t inactiveDark = MAKE_RGBA_COLOR(61, 61, 62, 255); // #3D3D3E
+ } kWindowsColorSet;
// hWnd -> context
using WndProcHash = QHash<HWND, Win32WindowContext *>;
@@ -67,7 +83,7 @@
// ### FIXME: Tell the user to call in the documentation, instead of automatically
// calling it directly.
// ### FIXME FIXME FIXME
- static struct QWK_Hook {
+ static const struct QWK_Hook {
QWK_Hook() {
qApp->setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
}
@@ -79,18 +95,18 @@
return inst;
}
-// template <typename T>
-// struct DefaultFunc;
-//
-// template <typename Return, typename... Args>
-// struct DefaultFunc<Return(QT_WIN_CALLBACK *)(Args...)> {
-// static Return STDAPICALLTYPE func(Args...) {
-// return Return{};
-// }
-// };
-//
-// #define DYNAMIC_API_DECLARE(NAME) decltype(&::NAME) p##NAME =
-// DefaultFunc<decltype(&::NAME)>::func
+ // template <typename T>
+ // struct DefaultFunc;
+ //
+ // template <typename Return, typename... Args>
+ // struct DefaultFunc<Return(QT_WIN_CALLBACK *)(Args...)> {
+ // static Return STDAPICALLTYPE func(Args...) {
+ // return Return{};
+ // }
+ // };
+ //
+ // #define DYNAMIC_API_DECLARE(NAME) decltype(&::NAME) p##NAME =
+ // DefaultFunc<decltype(&::NAME)>::func
#define DYNAMIC_API_DECLARE(NAME) decltype(&::NAME) p##NAME = nullptr
@@ -282,9 +298,12 @@
static inline bool isDarkWindowFrameEnabled(HWND hwnd) {
BOOL enabled = FALSE;
const DynamicApis &apis = DynamicApis::instance();
- if (SUCCEEDED(apis.pDwmGetWindowAttribute(hwnd, _DWMWA_USE_IMMERSIVE_DARK_MODE, &enabled, sizeof(enabled)))) {
+ if (SUCCEEDED(apis.pDwmGetWindowAttribute(hwnd, _DWMWA_USE_IMMERSIVE_DARK_MODE, &enabled,
+ sizeof(enabled)))) {
return enabled;
- } else if (SUCCEEDED(apis.pDwmGetWindowAttribute(hwnd, _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1, &enabled, sizeof(enabled)))) {
+ } else if (SUCCEEDED(apis.pDwmGetWindowAttribute(hwnd,
+ _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1,
+ &enabled, sizeof(enabled)))) {
return enabled;
} else {
return false;
@@ -332,49 +351,43 @@
} else { // Win2K
HDC hdc = ::GetDC(nullptr);
const int dpiX = ::GetDeviceCaps(hdc, LOGPIXELSX);
- //const int dpiY = ::GetDeviceCaps(hdc, LOGPIXELSY);
+ // const int dpiY = ::GetDeviceCaps(hdc, LOGPIXELSY);
::ReleaseDC(nullptr, hdc);
return quint32(dpiX);
}
}
- static inline quint32 getWindowFrameBorderThickness(HWND hwnd) {
- UINT result{ 0 };
+ static inline quint32 getSystemMetricsForDpi(int index, quint32 dpi) {
const DynamicApis &apis = DynamicApis::instance();
- if (SUCCEEDED(apis.pDwmGetWindowAttribute(hwnd, _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS, &result, sizeof(result)))) {
- return result;
- } else {
- const quint32 dpi = getDpiForWindow(hwnd);
- result = quint32(std::round(qreal(1) * qreal(dpi) / qreal(USER_DEFAULT_SCREEN_DPI)));
+ if (apis.pGetSystemMetricsForDpi) {
+ return ::GetSystemMetricsForDpi(index, dpi);
+ }
+ return ::GetSystemMetrics(index);
+ }
+
+ static inline quint32 getWindowFrameBorderThickness(HWND hwnd) {
+ const DynamicApis &apis = DynamicApis::instance();
+ if (UINT result = 0; SUCCEEDED(apis.pDwmGetWindowAttribute(
+ hwnd, _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS, &result, sizeof(result)))) {
return result;
}
+ return getSystemMetricsForDpi(SM_CXBORDER, getDpiForWindow(hwnd));
}
static inline quint32 getResizeBorderThickness(HWND hwnd) {
- const DynamicApis &apis = DynamicApis::instance();
- if (apis.pGetSystemMetricsForDpi) {
- const quint32 dpi = getDpiForWindow(hwnd);
- return apis.pGetSystemMetricsForDpi(SM_CXSIZEFRAME, dpi) +
- apis.pGetSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi);
- } else {
- return ::GetSystemMetrics(SM_CXSIZEFRAME) + ::GetSystemMetrics(SM_CXPADDEDBORDER);
- }
+ const quint32 dpi = getDpiForWindow(hwnd);
+ return getSystemMetricsForDpi(SM_CXSIZEFRAME, dpi) +
+ getSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi);
}
static inline quint32 getTitleBarHeight(HWND hwnd) {
- const auto captionHeight = [hwnd]() -> int {
- const DynamicApis &apis = DynamicApis::instance();
- if (apis.pGetSystemMetricsForDpi) {
- const quint32 dpi = getDpiForWindow(hwnd);
- return apis.pGetSystemMetricsForDpi(SM_CYCAPTION, dpi);
- } else {
- return ::GetSystemMetrics(SM_CYCAPTION);
- }
- }();
- return captionHeight + getResizeBorderThickness(hwnd);
+ const quint32 dpi = getDpiForWindow(hwnd);
+ return getSystemMetricsForDpi(SM_CYCAPTION, dpi) +
+ getSystemMetricsForDpi(SM_CXSIZEFRAME, dpi) +
+ getSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi);
}
- static inline void updateInternalWindowFrameMargins(HWND hwnd, QWindow *window) {
+ static void updateInternalWindowFrameMargins(HWND hwnd, QWindow *window) {
const auto margins = [hwnd]() -> QMargins {
const auto titleBarHeight = int(getTitleBarHeight(hwnd));
if (isWin10OrGreater()) {
@@ -440,7 +453,7 @@
#endif
}
- static inline void syncPaintEventWithDwm() {
+ static void syncPaintEventWithDwm() {
// No need to sync with DWM if DWM composition is disabled.
if (!isDwmCompositionEnabled()) {
return;
@@ -485,9 +498,9 @@
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);
+ static void showSystemMenu2(HWND hWnd, const POINT &pos, const bool selectFirstEntry,
+ const bool fixedSize) {
+ 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
@@ -621,7 +634,7 @@
// DefWindowProc(). Consequently, we have to add a global native filter that forwards the result
// of the hook function, telling Qt whether we have filtered the events before. Since Qt only
// handles Windows window messages in the main thread, it is safe to do so.
- class WindowsNativeEventFilter : public NativeEventFilter {
+ class WindowsNativeEventFilter : public AppNativeEventFilter {
public:
bool nativeEventFilter(const QByteArray &eventType, void *message,
QT_NATIVE_EVENT_RESULT_TYPE *result) override {
@@ -780,6 +793,7 @@
moveToDesktopCenter(hwnd);
return;
}
+
case ShowSystemMenuHook: {
const auto &pos = *static_cast<const QPoint *>(data);
auto hWnd = reinterpret_cast<HWND>(m_windowHandle->winId());
@@ -787,65 +801,70 @@
m_delegate->isHostSizeFixed(m_host));
return;
}
- case NeedsDrawBordersHook: {
- auto &result = *static_cast<bool *>(data);
- result = isWin10OrGreater() && !isWin11OrGreater();
+
+ case DefaultColorsHook: {
+ auto &map = *static_cast<QMap<QString, QColor> *>(data);
+ map.clear();
+ map.insert(QStringLiteral("activeLight"), kWindowsColorSet.activeLight);
+ map.insert(QStringLiteral("activeDark"), kWindowsColorSet.activeDark);
+ map.insert(QStringLiteral("inactiveLight"), kWindowsColorSet.inactiveLight);
+ map.insert(QStringLiteral("inactiveDark"), kWindowsColorSet.inactiveDark);
return;
}
- case DrawBordersHook: {
+
+ case DrawWindows10BorderHook: {
auto args = static_cast<void **>(data);
auto &painter = *static_cast<QPainter *>(args[0]);
const auto &rect = *static_cast<const QRect *>(args[1]);
const auto ®ion = *static_cast<const QRegion *>(args[2]);
const auto hwnd = reinterpret_cast<HWND>(m_windowHandle->winId());
- QPen pen{};
- const auto borderThickness = int(QHighDpi::fromNativePixels(getWindowFrameBorderThickness(hwnd), m_windowHandle));
- pen.setWidth(borderThickness * 2);
- const bool active = m_host->isWidgetType() ? m_host->property("isActiveWindow").toBool() : m_host->property("active").toBool();
+
+ QPen pen;
+ pen.setWidth(getWindowFrameBorderThickness(hwnd) * 2);
+
const bool dark = isDarkThemeActive() && isDarkWindowFrameEnabled(hwnd);
- if (active) {
+ if (m_delegate->isWindowActive(m_host)) {
if (isWindowFrameBorderColorized()) {
pen.setColor(getAccentColor());
} else {
- if (dark) {
- pen.setColor(kFrameBorderActiveColorDark);
- } else {
- pen.setColor(kFrameBorderActiveColorLight);
- }
+ static QColor frameBorderActiveColorLight(kWindowsColorSet.activeLight);
+ static QColor frameBorderActiveColorDark(kWindowsColorSet.activeDark);
+ pen.setColor(dark ? frameBorderActiveColorDark
+ : frameBorderActiveColorLight);
}
} else {
- if (dark) {
- pen.setColor(kFrameBorderInactiveColorDark);
- } else {
- pen.setColor(kFrameBorderInactiveColorLight);
- }
+ static QColor frameBorderInactiveColorLight(kWindowsColorSet.inactiveLight);
+ static QColor frameBorderInactiveColorDark(kWindowsColorSet.inactiveDark);
+ pen.setColor(dark ? frameBorderInactiveColorDark
+ : frameBorderInactiveColorLight);
}
painter.save();
- painter.setRenderHint(QPainter::Antialiasing); // ### TODO: do we need to enable or disable it?
+
+ // ### TODO: do we need to enable or disable it?
+ painter.setRenderHint(QPainter::Antialiasing);
+
painter.setPen(pen);
- painter.drawLine(QLine{ QPoint{ 0, 0 }, QPoint{ rect.width(), 0 } });
+ painter.drawLine(QLine{
+ QPoint{0, 0},
+ QPoint{m_windowHandle->width(), 0}
+ });
painter.restore();
- return;
}
- case QueryBorderThicknessHook: {
- auto args = static_cast<void **>(data);
- const bool requireNative = *static_cast<const bool *>(args[0]);
- quint32 &thickness = *static_cast<quint32 *>(args[1]);
- const auto hwnd = reinterpret_cast<HWND>(m_windowHandle->winId());
- const auto nativeThickness = getWindowFrameBorderThickness(hwnd);
- if (requireNative) {
- thickness = nativeThickness;
- } else {
- thickness = QHighDpi::fromNativePixels(nativeThickness, m_windowHandle);
- }
- return;
- }
+
default: {
// unreachable
break;
}
}
AbstractWindowContext::virtual_hook(id, data);
+ }
+
+ bool Win32WindowContext::needBorderPainter() const {
+ return isWin10OrGreater() && !isWin11OrGreater();
+ }
+
+ int Win32WindowContext::borderThickness() const {
+ return getWindowFrameBorderThickness(reinterpret_cast<HWND>(windowId));
}
bool Win32WindowContext::setupHost() {
@@ -908,16 +927,30 @@
return true;
}
+ // Whether to show system menu
if (systemMenuHandler(hWnd, message, wParam, lParam, result)) {
return true;
}
+ // Forward to native event filter subscribers
+ if (!m_nativeEventFilters.isEmpty()) {
+ MSG msg;
+ msg.hwnd = hWnd;
+ msg.message = message;
+ msg.wParam = wParam;
+ msg.lParam = lParam;
+ QT_NATIVE_EVENT_RESULT_TYPE res = 0;
+ if (dispatch(QByteArrayLiteral("windows_generic_MSG"), &msg, &res)) {
+ *result = LRESULT(res);
+ return true;
+ }
+ }
return false; // Not handled
}
- static constexpr const struct {
- const WPARAM wParam = 0xF1C9ADD4;
- const LPARAM lParam = 0xAFB6F4C6;
+ QWK_USED static constexpr const struct {
+ const WPARAM wParam = MAKEWPARAM(44500, 61897);
+ const LPARAM lParam = MAKELPARAM(62662, 44982); // Not used. Reserve for future use.
} kMessageTag;
static inline quint64 getKeyState() {
@@ -1059,7 +1092,7 @@
LPARAM lParam, LRESULT *result) {
switch (message) {
case WM_MOUSELEAVE: {
- if (wParam == kMessageTag.wParam) {
+ if (wParam != kMessageTag.wParam) {
// Qt will call TrackMouseEvent() to get the WM_MOUSELEAVE message when it
// receives WM_MOUSEMOVE messages, and since we are converting every
// WM_NCMOUSEMOVE message to WM_MOUSEMOVE message and send it back to the window
@@ -1209,6 +1242,7 @@
}
break;
}
+
case WM_NCHITTEST: {
// 鍘熺敓Win32绐楀彛鍙湁椤惰竟鏄湪绐楀彛鍐呴儴resize鐨勶紝鍏朵綑涓夎竟閮芥槸鍦ㄧ獥鍙�
// 澶栭儴杩涜resize鐨勶紝鍏跺師鐞嗘槸锛學S_THICKFRAME杩欎釜绐楀彛鏍峰紡浼氬湪绐�
@@ -1321,7 +1355,7 @@
// 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 auto kBorderSize = quint8{2};
+ static constexpr const quint8 kBorderSize = 2;
bool isTop = (nativeLocalPos.y <= kBorderSize);
bool isLeft = nativeLocalPos.x <= kBorderSize;
bool isRight = (nativeLocalPos.x >= (clientWidth - kBorderSize));
@@ -1497,9 +1531,27 @@
return true;
}
}
+
+ case WM_WINDOWPOSCHANGING: {
+ // ### FIXME: How does this problem happen and why is it solved?
+ // When toggling the "Show theme color in title bar and window border" setting in
+ // Windows Settings, or calling `DrawMenuBar()`, Windows sends a message of
+ // WM_WINDOWPOSCHANGING with flags 0x37. If we do not process this message,
+ // the client area as a whole will shift to the left, which looks very abnormal if
+ // we don't repaint it. This exception disappears if we add SWP_NOCOPYBITS flag.
+ // But I don't know what caused the problem, or why this would solve it.
+ const auto windowPos = reinterpret_cast<LPWINDOWPOS>(lParam);
+ if (windowPos->flags ==
+ (SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED)) {
+ windowPos->flags |= SWP_NOCOPYBITS;
+ }
+ break;
+ }
+
default:
break;
}
+
if (!isWin10OrGreater()) {
switch (message) {
case WM_NCUAHDRAWCAPTION:
--
Gitblit v1.9.1