From 7ed32994a71740efb7f63c723001fe0d25f65fff Mon Sep 17 00:00:00 2001 From: Onne van Dijk Date: Sun, 12 Jul 2020 16:09:41 +0200 Subject: [PATCH] Rough initial 1st Gen + 2nd Gen mixed setup support (5k only) --- Brightness Sync/AppDelegate.swift | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Brightness Sync/AppDelegate.swift b/Brightness Sync/AppDelegate.swift index d2deb4f..da5df06 100644 --- a/Brightness Sync/AppDelegate.swift +++ b/Brightness Sync/AppDelegate.swift @@ -271,11 +271,20 @@ class AppDelegate: NSObject, NSApplicationDelegate { let isOnConsole = (CGSessionCopyCurrentDictionary() as NSDictionary?)?[kCGSessionOnConsoleKey] as? Bool ?? false if isOnConsole { + let lgVendorNumber = 7789 +// let ultraFine5k1stGenModelNumber = 23313 + let ultraFine5k2ndGenModelNumber = 23412 + let builtin = activeDisplays .filter { CGDisplayIsBuiltin($0) == 1 } .compactMap { CGDisplayCreateUUIDFromDisplayID($0)?.takeRetainedValue() } .first + let source = builtin ?? activeDisplays + .filter { CGDisplayVendorNumber($0) == lgVendorNumber && CGDisplayModelNumber($0) == ultraFine5k2ndGenModelNumber } + .compactMap { CGDisplayCreateUUIDFromDisplayID($0)?.takeRetainedValue() } + .first + let targets = activeDisplays .filter { if let displayInfo = CoreDisplay_DisplayCreateInfoDictionary($0)?.takeRetainedValue() as NSDictionary? { @@ -303,9 +312,10 @@ class AppDelegate: NSObject, NSApplicationDelegate { return false } } + .filter { CGDisplayModelNumber($0) != ultraFine5k2ndGenModelNumber } .compactMap { CGDisplayCreateUUIDFromDisplayID($0)?.takeRetainedValue() } - displaysPublisher.send((builtin, targets)) + displaysPublisher.send((source, targets)) } else { displaysPublisher.send((nil, [])) os_log("User not active")