From 2a1e707b1cf530b00a5c0f3766466f10bd617619 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周三, 13 12月 2023 20:37:56 +0800
Subject: [PATCH] add WIP mac imp
---
src/core/contexts/cocoawindowcontext.mm | 269 +++++++++++++++++++++++++++++++++++++++++++++++++++++
src/core/kernel/nativeeventfilter.cpp | 2
src/core/contexts/win32windowcontext.cpp | 2
src/core/kernel/eventobserver.cpp | 4
4 files changed, 272 insertions(+), 5 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index a676756..66e57bf 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -2,6 +2,266 @@
namespace QWK {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+static const struct QWK_Hook {
+ QWK_Hook() {
+ qputenv("QT_MAC_WANTS_LAYER", "1");
+ }
+} g_hook{};
+#endif
+
+class NSWindowProxy
+{
+ Q_DISABLE_COPY_MOVE(NSWindowProxy)
+
+public:
+ NSWindowProxy(NSWindow *macWindow)
+ {
+ if (instances.contains(macWindow)) {
+ return;
+ }
+ nswindow = macWindow;
+ instances.insert(macWindow, this);
+ if (!windowClass) {
+ windowClass = [nswindow class];
+ replaceImplementations();
+ }
+ }
+
+ ~NSWindowProxy() override
+ {
+ instances.remove(nswindow);
+ if (instances.count() <= 0) {
+ restoreImplementations();
+ windowClass = nil;
+ }
+ nswindow = nil;
+ }
+
+public Q_SLOTS:
+ void replaceImplementations()
+ {
+ Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
+ Q_ASSERT(method);
+ oldSetStyleMask = reinterpret_cast<setStyleMaskPtr>(method_setImplementation(method, reinterpret_cast<IMP>(setStyleMask)));
+ Q_ASSERT(oldSetStyleMask);
+
+ method = class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
+ Q_ASSERT(method);
+ oldSetTitlebarAppearsTransparent = reinterpret_cast<setTitlebarAppearsTransparentPtr>(method_setImplementation(method, reinterpret_cast<IMP>(setTitlebarAppearsTransparent)));
+ Q_ASSERT(oldSetTitlebarAppearsTransparent);
+
+#if 0
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
+ Q_ASSERT(method);
+ oldCanBecomeKeyWindow = reinterpret_cast<canBecomeKeyWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeKeyWindow)));
+ Q_ASSERT(oldCanBecomeKeyWindow);
+
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
+ Q_ASSERT(method);
+ oldCanBecomeMainWindow = reinterpret_cast<canBecomeMainWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeMainWindow)));
+ Q_ASSERT(oldCanBecomeMainWindow);
+#endif
+
+ method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
+ Q_ASSERT(method);
+ oldSendEvent = reinterpret_cast<sendEventPtr>(method_setImplementation(method, reinterpret_cast<IMP>(sendEvent)));
+ Q_ASSERT(oldSendEvent);
+ }
+
+ void restoreImplementations()
+ {
+ Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
+ Q_ASSERT(method);
+ method_setImplementation(method, reinterpret_cast<IMP>(oldSetStyleMask));
+ oldSetStyleMask = nil;
+
+ method = class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
+ Q_ASSERT(method);
+ method_setImplementation(method, reinterpret_cast<IMP>(oldSetTitlebarAppearsTransparent));
+ oldSetTitlebarAppearsTransparent = nil;
+
+#if 0
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
+ Q_ASSERT(method);
+ method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeKeyWindow));
+ oldCanBecomeKeyWindow = nil;
+
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
+ Q_ASSERT(method);
+ method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeMainWindow));
+ oldCanBecomeMainWindow = nil;
+#endif
+
+ method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
+ Q_ASSERT(method);
+ method_setImplementation(method, reinterpret_cast<IMP>(oldSendEvent));
+ oldSendEvent = nil;
+ }
+
+ void setSystemTitleBarVisible(const bool visible)
+ {
+ NSView *nsview = [nswindow contentView];
+ if (!nsview) {
+ return;
+ }
+ nsview.wantsLayer = YES;
+ nswindow.styleMask |= NSWindowStyleMaskResizable;
+ if (visible) {
+ nswindow.styleMask &= ~NSWindowStyleMaskFullSizeContentView;
+ } else {
+ nswindow.styleMask |= NSWindowStyleMaskFullSizeContentView;
+ }
+ nswindow.titlebarAppearsTransparent = (visible ? NO : YES);
+ nswindow.titleVisibility = (visible ? NSWindowTitleVisible : NSWindowTitleHidden);
+ nswindow.hasShadow = YES;
+ nswindow.showsToolbarButton = NO;
+ nswindow.movableByWindowBackground = NO;
+ nswindow.movable = NO;
+ // For some unknown reason, we don't need the following hack in Qt versions below or equal to 6.2.4.
+#if (QT_VERSION > QT_VERSION_CHECK(6, 2, 4))
+ [nswindow standardWindowButton:NSWindowCloseButton].hidden = (visible ? NO : YES);
+ [nswindow standardWindowButton:NSWindowMiniaturizeButton].hidden = (visible ? NO : YES);
+ [nswindow standardWindowButton:NSWindowZoomButton].hidden = (visible ? NO : YES);
+#endif
+ }
+
+private:
+ static BOOL canBecomeKeyWindow(id obj, SEL sel)
+ {
+ if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ return YES;
+ }
+
+ if (oldCanBecomeKeyWindow) {
+ return oldCanBecomeKeyWindow(obj, sel);
+ }
+
+ return YES;
+ }
+
+ static BOOL canBecomeMainWindow(id obj, SEL sel)
+ {
+ if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ return YES;
+ }
+
+ if (oldCanBecomeMainWindow) {
+ return oldCanBecomeMainWindow(obj, sel);
+ }
+
+ return YES;
+ }
+
+ static void setStyleMask(id obj, SEL sel, NSWindowStyleMask styleMask)
+ {
+ if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ styleMask |= NSWindowStyleMaskFullSizeContentView;
+ }
+
+ if (oldSetStyleMask) {
+ oldSetStyleMask(obj, sel, styleMask);
+ }
+ }
+
+ static void setTitlebarAppearsTransparent(id obj, SEL sel, BOOL transparent)
+ {
+ if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ transparent = YES;
+ }
+
+ if (oldSetTitlebarAppearsTransparent) {
+ oldSetTitlebarAppearsTransparent(obj, sel, transparent);
+ }
+ }
+
+ static void sendEvent(id obj, SEL sel, NSEvent *event)
+ {
+ if (oldSendEvent) {
+ oldSendEvent(obj, sel, event);
+ }
+
+#if 0
+ const auto nswindow = reinterpret_cast<NSWindow *>(obj);
+ const auto it = instances.find(nswindow);
+ if (it == instances.end()) {
+ return;
+ }
+
+ NSWindowProxy * const proxy = it.value();
+ if (event.type == NSEventTypeLeftMouseDown) {
+ proxy->lastMouseDownEvent = event;
+ QCoreApplication::processEvents();
+ proxy->lastMouseDownEvent = nil;
+ }
+#endif
+ }
+
+private:
+ NSWindow *nswindow = nil;
+ //NSEvent *lastMouseDownEvent = nil;
+
+ static inline QHash<NSWindow *, NSWindowProxy *> instances = {};
+
+ static inline Class windowClass = nil;
+
+ using setStyleMaskPtr = void(*)(id, SEL, NSWindowStyleMask);
+ static inline setStyleMaskPtr oldSetStyleMask = nil;
+
+ using setTitlebarAppearsTransparentPtr = void(*)(id, SEL, BOOL);
+ static inline setTitlebarAppearsTransparentPtr oldSetTitlebarAppearsTransparent = nil;
+
+ using canBecomeKeyWindowPtr = BOOL(*)(id, SEL);
+ static inline canBecomeKeyWindowPtr oldCanBecomeKeyWindow = nil;
+
+ using canBecomeMainWindowPtr = BOOL(*)(id, SEL);
+ static inline canBecomeMainWindowPtr oldCanBecomeMainWindow = nil;
+
+ using sendEventPtr = void(*)(id, SEL, NSEvent *);
+ static inline sendEventPtr oldSendEvent = nil;
+};
+
+using ProxyList = QHash<WId, NSWindowProxy *>;
+Q_GLOBAL_STATIC(ProxyList, g_proxyList);
+
+ static inline NSWindow *mac_getNSWindow(const WId windowId)
+ {
+ const auto nsview = reinterpret_cast<NSView *>(windowId);
+ if (!nsview) {
+ return nil;
+ }
+ return [nsview window];
+ }
+
+static inline void cleanupProxy()
+{
+ if (g_proxyList()->isEmpty()) {
+ return;
+ }
+ const auto &data = *g_proxyList();
+ qDeleteAll(data);
+ g_proxyList()->clear();
+}
+
+static inline NSWindowProxy *ensureWindowProxy(const WId windowId)
+{
+ auto it = g_proxyList()->find(windowId);
+ if (it == g_proxyList()->end()) {
+ NSWindow *nswindow = mac_getNSWindow(windowId);
+ if (!nswindow) {
+ return nil;
+ }
+ const auto proxy = new NSWindowProxy(nswindow);
+ it = g_proxyList()->insert(windowId, proxy);
+ }
+ static bool cleanerInstalled = false;
+ if (!cleanerInstalled) {
+ cleanerInstalled = true;
+ qAddPostRoutine(cleanupProxy);
+ }
+ return it.value();
+}
+
CocoaWindowContext::CocoaWindowContext() {
}
@@ -16,7 +276,14 @@
}
bool CocoaWindowContext::setupHost() {
- return false;
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+ m_windowHandle->setProperty("_q_mac_wantsLayer", 1);
+#endif
+ WId winId = m_windowHandle->winId();
+ ensureWindowProxy(winId)->setSystemTitleBarVisible(false);
+ // Cache window ID
+ windowId = winId;
+ return true;
}
}
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 2fc72b0..3f0ac32 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -84,7 +84,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);
}
diff --git a/src/core/kernel/eventobserver.cpp b/src/core/kernel/eventobserver.cpp
index b55686f..98b8fcc 100644
--- a/src/core/kernel/eventobserver.cpp
+++ b/src/core/kernel/eventobserver.cpp
@@ -13,13 +13,13 @@
EventDispatcher::EventDispatcher() = default;
EventDispatcher::~EventDispatcher() {
- for (const auto &observer : qAsConst(m_observers)) {
+ for (const auto &observer : std::as_const(m_observers)) {
observer->m_dispatcher = nullptr;
}
}
bool EventDispatcher::dispatch(QEvent *event) {
- for (const auto &observer : qAsConst(m_observers)) {
+ for (const auto &observer : std::as_const(m_observers)) {
if (observer->observe(event))
return true;
}
diff --git a/src/core/kernel/nativeeventfilter.cpp b/src/core/kernel/nativeeventfilter.cpp
index 5aee4ef..58650db 100644
--- a/src/core/kernel/nativeeventfilter.cpp
+++ b/src/core/kernel/nativeeventfilter.cpp
@@ -19,7 +19,7 @@
bool nativeEventFilter(const QByteArray &eventType, void *message,
QT_NATIVE_EVENT_RESULT_TYPE *result) override {
- for (const auto &child : qAsConst(children)) {
+ for (const auto &child : std::as_const(children)) {
if (child->nativeEventFilter(eventType, message, result)) {
return true;
}
--
Gitblit v1.9.1