Skip to content

Commit 79ba120

Browse files
alin23alin23
committed
6.9.4
1 parent e70b381 commit 79ba120

File tree

13 files changed

+70
-66
lines changed

13 files changed

+70
-66
lines changed

‎.gitsecret/paths/mapping.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Lunar/Resources/eddsa_priv:d079018c2b1c003c9e239ea8f8cc999b7d98adfd0616911ba0263
33
Lunar/Modes/SensorMode.swift:dad132128e91631cacf5b7b90f70acf3ff64ed9c9ca304355ef73995672fafb1
44
Lunar/Modes/SyncMode.swift:99587e6a44dfd3620f154a34ac83e0a9c0fedc82b778c6cad71bbeacb437864e
55
Lunar/Modes/LocationMode.swift:bef485a1eb39359f19a37599c2fa55fc3a2f448295570f20c7b4e65984a63ec1
6-
Lunar/Data/Pro.swift:269dd396b1cb9bacb6404c0de7d0dd3d85d9f81db041a993582ea531e6705fb5
6+
Lunar/Data/Pro.swift:9e84393e9c32dd1baef6911d6440cabe45d066583c4b4d48780fe699fa440a40
77
Lunar/Modes/ClockMode.swift:d012d1b6cd91d0527ca6d6d00fd5b7742c3671855fba5d43ab31b6413d8afc84
88
Lunar/DDC/DDC2.h:2413c548ce3cc1681316b52486b66769529ae244ec5c76a160cdc190e7236f61
99
Lunar/DDC/DDC2.c:8488fdfb13ca9525e44db616c773eb67f1f1d52dcf83115d7666b0d79bbeef5a

‎Lunar.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@
13391339
CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
13401340
CODE_SIGN_STYLE = Manual;
13411341
COMBINE_HIDPI_IMAGES = YES;
1342-
CURRENT_PROJECT_VERSION = 6.9.3;
1342+
CURRENT_PROJECT_VERSION = 6.9.4;
13431343
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
13441344
DEVELOPMENT_ASSET_PATHS = "";
13451345
DEVELOPMENT_TEAM = "";
@@ -1371,7 +1371,7 @@
13711371
);
13721372
LLVM_LTO = NO;
13731373
MACOSX_DEPLOYMENT_TARGET = 11.0;
1374-
MARKETING_VERSION = 6.9.3;
1374+
MARKETING_VERSION = 6.9.4;
13751375
MTL_ENABLE_DEBUG_INFO = NO;
13761376
OTHER_CODE_SIGN_FLAGS = "";
13771377
PRODUCT_BUNDLE_IDENTIFIER = fyi.lunar.Lunar;
@@ -1405,7 +1405,7 @@
14051405
CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
14061406
CODE_SIGN_STYLE = Manual;
14071407
COMBINE_HIDPI_IMAGES = YES;
1408-
CURRENT_PROJECT_VERSION = 6.9.3;
1408+
CURRENT_PROJECT_VERSION = 6.9.4;
14091409
DEVELOPMENT_ASSET_PATHS = "";
14101410
DEVELOPMENT_TEAM = "";
14111411
"DEVELOPMENT_TEAM[sdk=macosx*]" = RDDXV84A73;
@@ -1436,7 +1436,7 @@
14361436
);
14371437
LLVM_LTO = YES;
14381438
MACOSX_DEPLOYMENT_TARGET = 11.0;
1439-
MARKETING_VERSION = 6.9.3;
1439+
MARKETING_VERSION = 6.9.4;
14401440
MTL_ENABLE_DEBUG_INFO = NO;
14411441
OTHER_CODE_SIGN_FLAGS = "--timestamp";
14421442
PRODUCT_BUNDLE_IDENTIFIER = fyi.lunar.Lunar;

‎Lunar/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2379,7 +2379,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, CLLocationManagerDeleg
23792379
#if arch(arm64)
23802380
if #available(macOS 13, *) {
23812381
if restarted {
2382-
DC.possiblyDisconnectedDisplays = Defaults[.possiblyDisconnectedDisplays].dict { ($0.id, $0) }
2382+
DisplayController.possiblyDisconnectedDisplays = Defaults[.possiblyDisconnectedDisplays].dict { ($0.id, $0) }
23832383
} else {
23842384
log.info("Reconnecting all displays")
23852385
DC.en()

‎Lunar/DDC/DDC.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ enum DDC {
927927
guard !DC.screensSleeping else { return }
928928
mainAsync {
929929
log.debug("checkDisconnectedDisplays")
930-
DC.possiblyDisconnectedDisplays = DC.possiblyDisconnectedDisplayList.dict { d in
930+
DisplayController.possiblyDisconnectedDisplays = DC.possiblyDisconnectedDisplayList.dict { d in
931931
if d.isBuiltin, !DCPAVServiceExists(location: .embedded) || !NSScreen.onlineDisplayIDs.contains(1) { return (d.id, d) }
932932

933933
guard DDC.dcpList.contains(where: { $0.dcpName == d.dcpName }) else { return nil }

‎Lunar/Data/CLI.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1911,7 +1911,7 @@ struct Lunar: ParsableCommand {
19111911
includeDummy: CachedDefaults[.showDummyDisplays]
19121912
)
19131913

1914-
let displays = getFilteredDisplays(displays: Array(DC.possiblyDisconnectedDisplays.values), filter: display)
1914+
let displays = getFilteredDisplays(displays: Array(DisplayController.possiblyDisconnectedDisplays.values), filter: display)
19151915
guard !displays.isEmpty else {
19161916
if case let .id(id) = display {
19171917
cliPrint("CLI: Reconnecting \(display)")
@@ -2001,7 +2001,7 @@ struct Lunar: ParsableCommand {
20012001
return
20022002
}
20032003

2004-
let displays = getFilteredDisplays(displays: Array(DC.possiblyDisconnectedDisplays.values), filter: display)
2004+
let displays = getFilteredDisplays(displays: Array(DisplayController.possiblyDisconnectedDisplays.values), filter: display)
20052005
if displays.isEmpty {
20062006
DC.en()
20072007
} else {

‎Lunar/Data/Display.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3527,7 +3527,7 @@ let AUDIO_IDENTIFIER_UUID_PATTERN = "([0-9a-f]{2})([0-9a-f]{2})-([0-9a-f]{4})-[0
35273527
// }
35283528

35293529
var isInMirrorSet: Bool {
3530-
CGDisplayIsInMirrorSet(id) != 0 && DC.cachedOnlineDisplayIDs.count > 1
3530+
CGDisplayIsInMirrorSet(id) != 0 && (DisplayController.initialized ? DC.cachedOnlineDisplayIDs : Set(NSScreen.onlineDisplayIDs)).count > 1
35313531
}
35323532

35333533
lazy var panel: MPDisplay? = DisplayController.panel(with: id) {
@@ -3906,7 +3906,7 @@ let AUDIO_IDENTIFIER_UUID_PATTERN = "([0-9a-f]{2})([0-9a-f]{2})-([0-9a-f]{4})-[0
39063906
@objc dynamic lazy var isFakeDummy: Bool = (Self.notDummyNamePattern.matches(name) && vendor.isDummy)
39073907
#endif
39083908
#if arch(arm64)
3909-
var disconnected: Bool { DC.possiblyDisconnectedDisplays[id]?.serial == serial }
3909+
var disconnected: Bool { DisplayController.possiblyDisconnectedDisplays[id]?.serial == serial }
39103910
#else
39113911
var disconnected = false
39123912
#endif

‎Lunar/Data/Pro.swift.secret‎

14 Bytes
Binary file not shown.

‎Lunar/Data/Sysctl.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ enum Sysctl {
6161

6262
static var modelLowercased: String = model.lowercased()
6363

64-
static let MACBOOK_MODELS = [2, 5, 6, 7, 9, 10, 15].map { "Mac14,\($0)" } + [2, 3, 6, 7, 8, 9, 10, 11, 12, 13].map { "Mac15,\($0)" } + [1, 5, 6, 7, 8, 12, 13].map { "Mac16,\($0)" }
64+
static let MACBOOK_MODELS = [2, 5, 6, 7, 9, 10, 15].map { "Mac14,\($0)" } + [2, 3, 6, 7, 8, 9, 10, 11, 12, 13].map { "Mac15,\($0)" } + [1, 5, 6, 7, 8, 12, 13].map { "Mac16,\($0)" } + [2].map { "Mac17,\($0)" }
6565
static let MACMINI_MODELS = [3, 12].map { "Mac14,\($0)" }
6666
static let IMAC_MODELS = [4, 5].map { "Mac15,\($0)" }
6767

‎Lunar/Utils/DisplayController.swift‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,13 @@ final class DisplayController: ObservableObject {
503503
return Defaults[.disableCliffDetection]
504504
}()
505505

506+
static var possiblyDisconnectedDisplays: [CGDirectDisplayID: Display] = [:] {
507+
didSet {
508+
debug("possiblyDisconnectedDisplays: \(DisplayController.possiblyDisconnectedDisplays.keys.sorted())")
509+
DC.possiblyDisconnectedDisplayList = DisplayController.possiblyDisconnectedDisplays.values.sorted(by: \.id)
510+
}
511+
}
512+
506513
var doublePressedBrightnessUpKey: ExpiringBool = false
507514
var doublePressedBrightnessDownKey: ExpiringBool = false
508515
var pressedBrightnessKey: ExpiringBool = false
@@ -711,12 +718,12 @@ final class DisplayController: ObservableObject {
711718
#if arch(arm64)
712719
mainAsync { [self] in
713720
let serials = newValue.values.map(\.serial)
714-
for (id, display) in possiblyDisconnectedDisplays {
721+
for (id, display) in DisplayController.possiblyDisconnectedDisplays {
715722
if serials.contains(display.serial) {
716-
possiblyDisconnectedDisplays.removeValue(forKey: id)
723+
DisplayController.possiblyDisconnectedDisplays.removeValue(forKey: id)
717724
}
718725
}
719-
possiblyDisconnectedDisplayList = possiblyDisconnectedDisplays.values.sorted(by: \.id)
726+
possiblyDisconnectedDisplayList = DisplayController.possiblyDisconnectedDisplays.values.sorted(by: \.id)
720727
}
721728
#endif
722729

@@ -1101,13 +1108,6 @@ final class DisplayController: ObservableObject {
11011108
)
11021109
}
11031110

1104-
var possiblyDisconnectedDisplays: [CGDirectDisplayID: Display] = [:] {
1105-
didSet {
1106-
debug("possiblyDisconnectedDisplays: \(self.possiblyDisconnectedDisplays.keys.sorted())")
1107-
possiblyDisconnectedDisplayList = possiblyDisconnectedDisplays.values.sorted(by: \.id)
1108-
}
1109-
}
1110-
11111111
@Atomic var autoBlackoutPending = false {
11121112
didSet {
11131113
log.info("autoBlackoutPending=\(autoBlackoutPending)")
@@ -2035,7 +2035,7 @@ final class DisplayController: ObservableObject {
20352035
}
20362036

20372037
func retryAutoBlackoutLater() {
2038-
if autoBlackoutPending, let d = builtinDisplay, !d.blackOutEnabled, possiblyDisconnectedDisplays[d.id] == nil, !calibrating {
2038+
if autoBlackoutPending, let d = builtinDisplay, !d.blackOutEnabled, DisplayController.possiblyDisconnectedDisplays[d.id] == nil, !calibrating {
20392039
log.info("Retrying Auto Blackout later")
20402040
d.showAutoBlackOutOSD()
20412041
autoBlackoutPublisher.send(true)

‎LunarShortcuts/LunarShortcuts.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ struct ScreenQuery: EntityPropertyQuery {
498498
?? (additionalScreens ?? []).first(where: { $0.id == id })
499499

500500
#if arch(arm64)
501-
return screen ?? DC.possiblyDisconnectedDisplays[id.u32]?.screen
501+
return screen ?? DisplayController.possiblyDisconnectedDisplays[id.u32]?.screen
502502
#else
503503
return screen
504504
#endif
@@ -1516,7 +1516,7 @@ If the reconnect action fails, try any one of the following to bring back the sc
15161516
Summary("Toggle connected state for \(\.$screen)")
15171517
}
15181518

1519-
@Parameter(title: "Screen", optionsProvider: ScreenQuery(single: true, additionalScreens: DC.possiblyDisconnectedDisplays.values.map(\.screen), sidecar: true))
1519+
@Parameter(title: "Screen", optionsProvider: ScreenQuery(single: true, additionalScreens: DisplayController.possiblyDisconnectedDisplays.values.map(\.screen), sidecar: true))
15201520
var screen: Screen
15211521

15221522
@MainActor
@@ -1542,7 +1542,7 @@ If the reconnect action fails, try any one of the following to bring back the sc
15421542
DC.dis(display.id)
15431543
return ""
15441544
}
1545-
if let display = DC.possiblyDisconnectedDisplays.values.first(where: { $0.serial == screen.serial }) {
1545+
if let display = DisplayController.possiblyDisconnectedDisplays.values.first(where: { $0.serial == screen.serial }) {
15461546
DC.en(display.id)
15471547
return display.serial
15481548
}

0 commit comments

Comments
 (0)