Improved dummy detection for newer versions of BetterDummy (MonitorControl#975)

waydabber · web-flow · commit e2009a62ac59 · 2022-03-15T11:53:28.000+01:00
diff --git a/MonitorControl/Info.plist b/MonitorControl/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>7029</string>
+	<string>7030</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/MonitorControl/Support/DisplayManager.swift b/MonitorControl/Support/DisplayManager.swift
@@ -399,13 +399,13 @@ class DisplayManager {
   }
 
   static func isDummy(displayID: CGDirectDisplayID) -> Bool {
+    let vendorNumber = CGDisplayVendorNumber(displayID)
     let rawName = DisplayManager.getDisplayRawNameByID(displayID: displayID)
-    var isDummy: Bool = false
-    if rawName.lowercased().contains("dummy") {
+    if rawName.lowercased().contains("dummy") || (self.isVirtual(displayID: displayID) && vendorNumber == UInt32(0xF0F0)) {
       os_log("NOTE: Display is a dummy!", type: .info)
-      isDummy = true
+      return true
     }
-    return isDummy
+    return false
   }
 
   static func isVirtual(displayID: CGDirectDisplayID) -> Bool {
diff --git a/MonitorControlHelper/Info.plist b/MonitorControlHelper/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>7029</string>
+	<string>7030</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSBackgroundOnly</key>

Original file line number	Diff line number	Diff line change
`@@ -399,13 +399,13 @@ class DisplayManager {`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`static func isDummy(displayID: CGDirectDisplayID) -> Bool {`
	`402`	`+ let vendorNumber = CGDisplayVendorNumber(displayID)`
`402`	`403`	`let rawName = DisplayManager.getDisplayRawNameByID(displayID: displayID)`
`403`		`- var isDummy: Bool = false`
`404`		`- if rawName.lowercased().contains("dummy") {`
	`404`	`+ if rawName.lowercased().contains("dummy") \|\| (self.isVirtual(displayID: displayID) && vendorNumber == UInt32(0xF0F0)) {`
`405`	`405`	`os_log("NOTE: Display is a dummy!", type: .info)`
`406`		`- isDummy = true`
	`406`	`+ return true`
`407`	`407`	`}`
`408`		`- return isDummy`
	`408`	`+ return false`
`409`	`409`	`}`
`410`	`410`
`411`	`411`	`static func isVirtual(displayID: CGDirectDisplayID) -> Bool {`