From 88b5b56b6a67d93208eae3980af2f30da09dd8ae Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周三, 27 12月 2023 01:10:59 +0800
Subject: [PATCH] Add notification observer on Mac
---
src/core/contexts/cocoawindowcontext.mm | 360 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 254 insertions(+), 106 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index aec1f20..21616d5 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -3,41 +3,180 @@
#include <objc/runtime.h>
#include <AppKit/AppKit.h>
+#include <Cocoa/Cocoa.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
+ struct NSWindowProxy;
- struct NSWindowProxy {
+ using ProxyList = QHash<WId, NSWindowProxy *>;
+ Q_GLOBAL_STATIC(ProxyList, g_proxyList);
+
+ using ProxyList2 = QHash<NSWindow *, NSWindowProxy *>;
+ Q_GLOBAL_STATIC(ProxyList2, g_proxyIndexes);
+
+}
+
+struct QWK_NSWindowDelegate {
+public:
+ virtual ~QWK_NSWindowDelegate() = default;
+ virtual void windowWillEnterFullScreen(){};
+ virtual void windowDidEnterFullScreen(){};
+ virtual void windowWillExitFullScreen(){};
+ virtual void windowDidExitFullScreen(){};
+ virtual void windowDidResize(){};
+};
+
+//
+// Objective C++ Begin
+//
+
+@interface QWK_NSWindowObserver : NSObject {
+}
+@end
+
+@implementation QWK_NSWindowObserver
+
+- (id)init {
+ self = [super init];
+ if (self) {
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowWillEnterFullScreen:)
+ name:NSWindowWillEnterFullScreenNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowDidEnterFullScreen:)
+ name:NSWindowDidEnterFullScreenNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowWillExitFullScreen:)
+ name:NSWindowWillExitFullScreenNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowDidExitFullScreen:)
+ name:NSWindowDidExitFullScreenNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowDidResize:)
+ name:NSWindowDidResizeNotification
+ object:nil];
+ }
+ return self;
+}
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+ [super dealloc];
+}
+
+- (void)windowWillEnterFullScreen:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowWillEnterFullScreen();
+ }
+}
+
+- (void)windowDidEnterFullScreen:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowDidEnterFullScreen();
+ }
+}
+
+- (void)windowWillExitFullScreen:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowWillExitFullScreen();
+ }
+}
+
+- (void)windowDidExitFullScreen:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowDidExitFullScreen();
+ }
+}
+
+- (void)windowDidResize:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowDidResize();
+ }
+}
+
+@end
+
+//
+// Objective C++ End
+//
+
+namespace QWK {
+
+ struct NSWindowProxy : public QWK_NSWindowDelegate {
NSWindowProxy(NSWindow *macWindow) {
- if (instances.contains(macWindow)) {
+ nswindow = macWindow;
+ g_proxyIndexes->insert(nswindow, this);
+ }
+
+ ~NSWindowProxy() override {
+ g_proxyIndexes->remove(nswindow);
+ }
+
+ void windowWillEnterFullScreen() override {
+ qDebug() << "windowWillEnterFullScreen";
+ }
+
+ void windowDidEnterFullScreen() override {
+ qDebug() << "windowDidEnterFullScreen";
+ }
+
+ void windowWillExitFullScreen() override {
+ qDebug() << "windowWillExitFullScreen";
+ }
+
+ void windowDidExitFullScreen() override {
+ qDebug() << "windowDidExitFullScreen";
+ }
+
+ void windowDidResize() override {
+ qDebug() << "windowDidResize";
+ }
+
+ void setSystemTitleBarVisible(const bool visible) {
+ NSView *nsview = [nswindow contentView];
+ if (!nsview) {
return;
}
- nswindow = macWindow;
- instances.insert(macWindow, this);
- if (!windowClass) {
- windowClass = [nswindow class];
- replaceImplementations();
+
+ 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);
+#endif
}
- ~NSWindowProxy() {
- instances.remove(nswindow);
- if (instances.count() <= 0) {
- restoreImplementations();
- windowClass = nil;
- }
- nswindow = nil;
- }
-
- void replaceImplementations() {
+ static void replaceImplementations() {
Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
oldSetStyleMask = reinterpret_cast<setStyleMaskPtr>(
method_setImplementation(method, reinterpret_cast<IMP>(setStyleMask)));
@@ -59,9 +198,12 @@
method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
oldSendEvent = reinterpret_cast<sendEventPtr>(
method_setImplementation(method, reinterpret_cast<IMP>(sendEvent)));
+
+ // Alloc
+ windowObserver = [[QWK_NSWindowObserver alloc] init];
}
- void restoreImplementations() {
+ static void restoreImplementations() {
Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
method_setImplementation(method, reinterpret_cast<IMP>(oldSetStyleMask));
oldSetStyleMask = nil;
@@ -85,39 +227,15 @@
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; // 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);
-#endif
+ // Delete
+ [windowObserver release];
+ windowObserver = nil;
}
private:
static BOOL canBecomeKeyWindow(id obj, SEL sel) {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
return YES;
}
@@ -129,7 +247,7 @@
}
static BOOL canBecomeMainWindow(id obj, SEL sel) {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
return YES;
}
@@ -141,7 +259,7 @@
}
static void setStyleMask(id obj, SEL sel, NSWindowStyleMask styleMask) {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
styleMask |= NSWindowStyleMaskFullSizeContentView;
}
@@ -151,7 +269,7 @@
}
static void setTitlebarAppearsTransparent(id obj, SEL sel, BOOL transparent) {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
transparent = YES;
}
@@ -181,15 +299,16 @@
#endif
}
+ static inline const Class windowClass = [NSWindow class];
+
private:
Q_DISABLE_COPY(NSWindowProxy)
NSWindow *nswindow = nil;
+
+ static inline QWK_NSWindowObserver *windowObserver = 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;
@@ -207,41 +326,41 @@
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()) {
+ if (g_proxyList->isEmpty()) {
+ NSWindowProxy::replaceImplementations();
+ }
+
+ 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);
- }
- static bool cleanerInstalled = false;
- if (!cleanerInstalled) {
- cleanerInstalled = true;
- qAddPostRoutine(cleanupProxy);
+ it = g_proxyList->insert(windowId, proxy);
}
return it.value();
}
- class CocoaWindowEventFilter : public QObject {
+ static inline void releaseWindowProxy(const WId windowId) {
+ if (auto proxy = g_proxyList->take(windowId)) {
+ proxy->setSystemTitleBarVisible(true);
+ delete proxy;
+ } else {
+ return;
+ }
+
+ if (g_proxyList->isEmpty()) {
+ NSWindowProxy::restoreImplementations();
+ }
+ }
+
+ class CocoaWindowEventFilter : public SharedEventFilter {
public:
- explicit CocoaWindowEventFilter(AbstractWindowContext *context, QObject *parent = nullptr);
+ explicit CocoaWindowEventFilter(AbstractWindowContext *context);
~CocoaWindowEventFilter() override;
enum WindowStatus {
@@ -252,7 +371,7 @@
};
protected:
- bool eventFilter(QObject *object, QEvent *event) override;
+ bool sharedEventFilter(QObject *object, QEvent *event) override;
private:
AbstractWindowContext *m_context;
@@ -260,29 +379,28 @@
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(AbstractWindowContext *context)
+ : m_context(context), m_cursorShapeChanged(false), m_windowStatus(Idle) {
+ m_context->installSharedEventFilter(this);
}
CocoaWindowEventFilter::~CocoaWindowEventFilter() = default;
- bool CocoaWindowEventFilter::eventFilter(QObject *object, QEvent *event) {
+ bool CocoaWindowEventFilter::sharedEventFilter(QObject *obj, QEvent *event) {
+ Q_UNUSED(obj)
+
auto type = event->type();
if (type < QEvent::MouseButtonPress || type > QEvent::MouseMove) {
return false;
}
- QObject *host = m_context->host();
- QWindow *window = m_context->window();
- WindowItemDelegate *delegate = m_context->delegate();
+ auto host = m_context->host();
+ auto window = m_context->window();
+ auto delegate = m_context->delegate();
auto me = static_cast<const QMouseEvent *>(event);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
- QPoint scenePos = mouseEvent->scenePosition().toPoint();
- QPoint globalPos = mouseEvent->globalPosition().toPoint();
-#else
- QPoint scenePos = me->windowPos().toPoint();
- QPoint globalPos = me->screenPos().toPoint();
-#endif
+
+ QPoint scenePos = getMouseEventScenePos(me);
+ QPoint globalPos = getMouseEventGlobalPos(me);
+
bool inTitleBar = m_context->isInTitleBarDraggableArea(scenePos);
switch (type) {
case QEvent::MouseButtonPress: {
@@ -296,7 +414,6 @@
event->accept();
return true;
}
- m_windowStatus = WaitingRelease;
break;
}
case Qt::RightButton: {
@@ -306,6 +423,7 @@
default:
break;
}
+ m_windowStatus = WaitingRelease;
break;
}
@@ -339,7 +457,7 @@
}
case PreparingMove: {
m_windowStatus = Moving;
- window->startSystemMove();
+ startSystemMove(window);
event->accept();
return true;
}
@@ -373,10 +491,11 @@
}
CocoaWindowContext::CocoaWindowContext() : AbstractWindowContext() {
+ cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this);
}
CocoaWindowContext::~CocoaWindowContext() {
- // TODO: deref something?
+ releaseWindowProxy(windowId);
}
QString CocoaWindowContext::key() const {
@@ -384,16 +503,45 @@
}
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() {
+ void CocoaWindowContext::winIdChanged() {
+ // If the original window id is valid, remove all resources related
+ if (windowId) {
+ releaseWindowProxy(windowId);
+ windowId = 0;
+ }
+
+ if (!m_windowHandle) {
+ return;
+ }
+
+ // Allocate new resources
windowId = m_windowHandle->winId();
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- m_windowHandle->setProperty("_q_mac_wantsLayer", 1);
-#endif
ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
- std::ignore = new CocoaWindowEventFilter(this, this);
- return true;
+ }
+
+ 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