Rough initial 1st Gen + 2nd Gen mixed setup support (5k only)

OCJvanDijk · Jul 12, 2020 · 7ed3299 · 7ed3299
1 parent 123b344
commit 7ed3299
Showing 1 changed file with 11 additions and 1 deletion.
diff --git 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")