From 5ee113e2c4f916b1078ace782bb130f5edf64bcf Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: ćšć, 14 12æ 2023 20:28:02 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/cocoawindowcontext.mm | 402 +++++++++++++++++++++++++++------------------------------
1 files changed, 189 insertions(+), 213 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 66e57bf..fc91cad 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -1,266 +1,242 @@
#include "cocoawindowcontext_p.h"
+#include <objc/runtime.h>
+#include <AppKit/AppKit.h>
+
+#include <QtGui/QGuiApplication>
+
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{};
+ 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 void cleanupProxy() {
+ if (g_proxyList()->isEmpty()) {
+ return;
}
- const auto proxy = new NSWindowProxy(nswindow);
- it = g_proxyList()->insert(windowId, proxy);
+ const auto &data = *g_proxyList();
+ qDeleteAll(data);
+ g_proxyList()->clear();
}
- static bool cleanerInstalled = false;
- if (!cleanerInstalled) {
- cleanerInstalled = true;
- qAddPostRoutine(cleanupProxy);
+
+ 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);
+ }
+ static bool cleanerInstalled = false;
+ if (!cleanerInstalled) {
+ cleanerInstalled = true;
+ qAddPostRoutine(cleanupProxy);
+ }
+ return it.value();
}
- return it.value();
-}
CocoaWindowContext::CocoaWindowContext() {
}
@@ -277,7 +253,7 @@
bool CocoaWindowContext::setupHost() {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- m_windowHandle->setProperty("_q_mac_wantsLayer", 1);
+ m_windowHandle->setProperty("_q_mac_wantsLayer", 1);
#endif
WId winId = m_windowHandle->winId();
ensureWindowProxy(winId)->setSystemTitleBarVisible(false);
--
Gitblit v1.9.1