From a5d13e19dd7f6037e10b649c49805922ae5e0fa6 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周五, 22 12月 2023 17:04:29 +0800
Subject: [PATCH] Prepare to remove style support again
---
src/core/contexts/cocoawindowcontext.mm | 579 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 353 insertions(+), 226 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 66e57bf..949681d 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -1,271 +1,368 @@
#include "cocoawindowcontext_p.h"
+#include <objc/runtime.h>
+#include <AppKit/AppKit.h>
+
+#include <QtGui/QGuiApplication>
+
+#include "qwkglobal_p.h"
+#include "systemwindow_p.h"
+
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;
+ struct NSWindowProxy {
+ NSWindowProxy(NSWindow *macWindow) {
+ if (instances.contains(macWindow)) {
+ return;
+ }
+ nswindow = macWindow;
+ instances.insert(macWindow, this);
+ if (!windowClass) {
+ windowClass = [nswindow class];
+ replaceImplementations();
+ }
}
- nswindow = macWindow;
- instances.insert(macWindow, this);
- if (!windowClass) {
- windowClass = [nswindow class];
- replaceImplementations();
+
+ ~NSWindowProxy() {
+ instances.remove(nswindow);
+ if (instances.count() <= 0) {
+ restoreImplementations();
+ windowClass = nil;
+ }
+ nswindow = nil;
}
- }
- ~NSWindowProxy() override
- {
- instances.remove(nswindow);
- if (instances.count() <= 0) {
- restoreImplementations();
- windowClass = nil;
- }
- nswindow = nil;
- }
+ void replaceImplementations() {
+ Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
+ oldSetStyleMask = reinterpret_cast<setStyleMaskPtr>(
+ method_setImplementation(method, reinterpret_cast<IMP>(setStyleMask)));
-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);
+ method =
+ class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
+ oldSetTitlebarAppearsTransparent =
+ reinterpret_cast<setTitlebarAppearsTransparentPtr>(method_setImplementation(
+ method, reinterpret_cast<IMP>(setTitlebarAppearsTransparent)));
#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(canBecomeKeyWindow));
+ oldCanBecomeKeyWindow = reinterpret_cast<canBecomeKeyWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeKeyWindow)));
- method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
- Q_ASSERT(method);
- oldCanBecomeMainWindow = reinterpret_cast<canBecomeMainWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeMainWindow)));
- Q_ASSERT(oldCanBecomeMainWindow);
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
+ oldCanBecomeMainWindow = reinterpret_cast<canBecomeMainWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeMainWindow)));
#endif
- method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
- Q_ASSERT(method);
- oldSendEvent = reinterpret_cast<sendEventPtr>(method_setImplementation(method, reinterpret_cast<IMP>(sendEvent)));
- Q_ASSERT(oldSendEvent);
- }
+ method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
+ oldSendEvent = reinterpret_cast<sendEventPtr>(
+ method_setImplementation(method, reinterpret_cast<IMP>(sendEvent)));
+ }
- void restoreImplementations()
- {
- Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
- Q_ASSERT(method);
- method_setImplementation(method, reinterpret_cast<IMP>(oldSetStyleMask));
- oldSetStyleMask = nil;
+ void restoreImplementations() {
+ Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
+ 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;
+ method =
+ class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
+ 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(canBecomeKeyWindow));
+ 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;
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
+ 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;
- }
+ method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
+ 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.
+ 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; // This line causes the window in the wrong position when
+ // become fullscreen.
+ // 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);
+ [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))) {
+ 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;
}
- if (oldCanBecomeKeyWindow) {
- return oldCanBecomeKeyWindow(obj, sel);
- }
+ static BOOL canBecomeMainWindow(id obj, SEL sel) {
+ if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ return YES;
+ }
- return YES;
- }
+ if (oldCanBecomeMainWindow) {
+ return oldCanBecomeMainWindow(obj, sel);
+ }
- static BOOL canBecomeMainWindow(id obj, SEL sel)
- {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
return YES;
}
- if (oldCanBecomeMainWindow) {
- return oldCanBecomeMainWindow(obj, sel);
+ static void setStyleMask(id obj, SEL sel, NSWindowStyleMask styleMask) {
+ if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ styleMask |= NSWindowStyleMaskFullSizeContentView;
+ }
+
+ if (oldSetStyleMask) {
+ oldSetStyleMask(obj, sel, styleMask);
+ }
}
- return YES;
- }
+ static void setTitlebarAppearsTransparent(id obj, SEL sel, BOOL transparent) {
+ if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ transparent = YES;
+ }
- static void setStyleMask(id obj, SEL sel, NSWindowStyleMask styleMask)
- {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
- styleMask |= NSWindowStyleMaskFullSizeContentView;
+ if (oldSetTitlebarAppearsTransparent) {
+ oldSetTitlebarAppearsTransparent(obj, sel, transparent);
+ }
}
- 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);
- }
+ 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;
- }
+ 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;
- }
+ NSWindowProxy *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;
}
+
+ private:
+ Q_DISABLE_COPY(NSWindowProxy)
+
+ 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);
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;
+ static inline NSWindowProxy *ensureWindowProxy(const WId windowId) {
+ auto it = g_proxyList()->find(windowId);
+ if (it == g_proxyList()->end()) {
+ NSWindow *nswindow = mac_getNSWindow(windowId);
+ const auto proxy = new NSWindowProxy(nswindow);
+ it = g_proxyList()->insert(windowId, proxy);
}
- const auto proxy = new NSWindowProxy(nswindow);
- it = g_proxyList()->insert(windowId, proxy);
+ return it.value();
}
- static bool cleanerInstalled = false;
- if (!cleanerInstalled) {
- cleanerInstalled = true;
- qAddPostRoutine(cleanupProxy);
- }
- return it.value();
-}
- CocoaWindowContext::CocoaWindowContext() {
+ static inline void releaseWindowProxy(const WId windowId) {
+ if (const auto proxy = g_proxyList()->take(windowId)) {
+ proxy->setSystemTitleBarVisible(true);
+ delete proxy;
+ }
+ }
+
+ class CocoaWindowEventFilter : public QObject {
+ public:
+ explicit CocoaWindowEventFilter(AbstractWindowContext *context, QObject *parent = nullptr);
+ ~CocoaWindowEventFilter() override;
+
+ enum WindowStatus {
+ Idle,
+ WaitingRelease,
+ PreparingMove,
+ Moving,
+ };
+
+ protected:
+ bool eventFilter(QObject *object, QEvent *event) override;
+
+ private:
+ AbstractWindowContext *m_context;
+ bool m_cursorShapeChanged;
+ WindowStatus m_windowStatus;
+ };
+
+ CocoaWindowEventFilter::CocoaWindowEventFilter(AbstractWindowContext *context, QObject *parent)
+ : QObject(parent), m_context(context), m_cursorShapeChanged(false), m_windowStatus(Idle) {
+ m_context->window()->installEventFilter(this);
+ }
+
+ CocoaWindowEventFilter::~CocoaWindowEventFilter() = default;
+
+ bool CocoaWindowEventFilter::eventFilter(QObject *obj, QEvent *event) {
+ Q_UNUSED(obj)
+ auto type = event->type();
+ if (type < QEvent::MouseButtonPress || type > QEvent::MouseMove) {
+ return false;
+ }
+ auto host = m_context->host();
+ auto window = m_context->window();
+ auto delegate = m_context->delegate();
+ auto me = static_cast<const QMouseEvent *>(event);
+
+ QPoint scenePos = getMouseEventScenePos(me);
+ QPoint globalPos = getMouseEventGlobalPos(me);
+
+ bool inTitleBar = m_context->isInTitleBarDraggableArea(scenePos);
+ switch (type) {
+ case QEvent::MouseButtonPress: {
+ switch (me->button()) {
+ case Qt::LeftButton: {
+ if (inTitleBar) {
+ // If we call startSystemMove() now but release the mouse without actual
+ // movement, there will be no MouseReleaseEvent, so we defer it when the
+ // mouse is actually moving for the first time
+ m_windowStatus = PreparingMove;
+ event->accept();
+ return true;
+ }
+ break;
+ }
+ case Qt::RightButton: {
+ m_context->showSystemMenu(globalPos);
+ break;
+ }
+ default:
+ break;
+ }
+ m_windowStatus = WaitingRelease;
+ break;
+ }
+
+ case QEvent::MouseButtonRelease: {
+ switch (m_windowStatus) {
+ case PreparingMove:
+ case Moving: {
+ m_windowStatus = Idle;
+ event->accept();
+ return true;
+ }
+ case WaitingRelease: {
+ m_windowStatus = Idle;
+ break;
+ }
+ default: {
+ if (inTitleBar) {
+ event->accept();
+ return true;
+ }
+ break;
+ }
+ }
+ break;
+ }
+
+ case QEvent::MouseMove: {
+ switch (m_windowStatus) {
+ case Moving: {
+ return true;
+ }
+ case PreparingMove: {
+ m_windowStatus = Moving;
+ startSystemMove(window);
+ event->accept();
+ return true;
+ }
+ default:
+ break;
+ }
+ break;
+ }
+
+ case QEvent::MouseButtonDblClick: {
+ if (me->button() == Qt::LeftButton && inTitleBar &&
+ !delegate->isHostSizeFixed(host)) {
+ Qt::WindowStates windowState = delegate->getWindowState(host);
+ if (!(windowState & Qt::WindowFullScreen)) {
+ if (windowState & Qt::WindowMaximized) {
+ delegate->setWindowState(host, windowState & ~Qt::WindowMaximized);
+ } else {
+ delegate->setWindowState(host, windowState | Qt::WindowMaximized);
+ }
+ event->accept();
+ return true;
+ }
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+ return false;
+ }
+
+ CocoaWindowContext::CocoaWindowContext() : AbstractWindowContext() {
}
CocoaWindowContext::~CocoaWindowContext() {
+ releaseWindowProxy(windowId);
}
QString CocoaWindowContext::key() const {
@@ -273,17 +370,47 @@
}
void CocoaWindowContext::virtual_hook(int id, void *data) {
+ switch (id) {
+ case SystemButtonAreaChangedHook: {
+ // TODO: mac system button rect updated
+ return;
+ }
+
+ default:
+ break;
+ }
+ AbstractWindowContext::virtual_hook(id, data);
}
- bool CocoaWindowContext::setupHost() {
-#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;
+ void CocoaWindowContext::winIdChanged() {
+ // If the original window id is valid, remove all resources related
+ if (windowId) {
+ releaseWindowProxy(windowId);
+ windowId = 0;
+ cocoaWindowEventFilter.reset();
+ }
+
+ if (!m_windowHandle) {
+ return;
+ }
+
+ // Allocate new resources
+ windowId = m_windowHandle->winId();
+ ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
+ cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);
+ }
+
+ bool CocoaWindowContext::windowAttributeChanged(const QString &key, const QVariant &attribute,
+ const QVariant &oldAttribute) {
+ if (key == QStringLiteral("no-system-buttons")) {
+ if (attribute.toBool()) {
+ // TODO: set off
+ } else {
+ // TODO: set on
+ }
+ return true;
+ }
+ return false;
}
}
--
Gitblit v1.9.1