github/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2026-03-28 05:29:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix macOS clipboard monitoring compilation error using changeCount polling

Browse Source
This commit is contained in:
dijunkun
2025-12-29 01:01:08 +08:00
parent 17b7ba6b72
commit 5f320af6e6
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/tools/clipboard_mac.mm
View File

@@ -70,20 +70,29 @@ void StartMacOSClipboardMonitoring() {
CFRetain(g_monitor_runloop); CFRetain(g_monitor_runloop);
} }
// Register for clipboard change notifications // Track changeCount to detect clipboard changes
id observer = // Use __block to allow modification inside the block
[[NSNotificationCenter defaultCenter] addObserverForName:NSPasteboardDidChangeNotification __block NSInteger lastChangeCount = [pasteboard changeCount];
object:pasteboard
queue:nil
usingBlock:^(NSNotification* notification) {
if (!g_monitoring.load()) {
return;
}
HandleClipboardChange();
}];
LOG_INFO("Clipboard event monitoring started (macOS)"); LOG_INFO("Clipboard event monitoring started (macOS)");
// Use a timer to periodically check changeCount
// This is more reliable than NSPasteboardDidChangeNotification which may not be available
NSTimer* timer =
[NSTimer scheduledTimerWithTimeInterval:0.1
repeats:YES
block:^(NSTimer* timer) {
if (!g_monitoring.load()) {
[timer invalidate];
return;
}
NSInteger currentChangeCount = [pasteboard changeCount];
if (currentChangeCount != lastChangeCount) {
lastChangeCount = currentChangeCount;
HandleClipboardChange();
}
}];
while (g_monitoring.load()) { while (g_monitoring.load()) {
@autoreleasepool { @autoreleasepool {
NSDate* date = [NSDate dateWithTimeIntervalSinceNow:0.1]; NSDate* date = [NSDate dateWithTimeIntervalSinceNow:0.1];
@@ -92,9 +101,7 @@ void StartMacOSClipboardMonitoring() {
} }
// Cleanup // Cleanup
[[NSNotificationCenter defaultCenter] removeObserver:observer [timer invalidate];
name:NSPasteboardDidChangeNotification
object:pasteboard];
if (g_monitor_runloop) { if (g_monitor_runloop) {
CFRelease(g_monitor_runloop); CFRelease(g_monitor_runloop);
g_monitor_runloop = nullptr; g_monitor_runloop = nullptr;