Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Sources/DefiDaemon/DaemonOverview.swift
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,9 @@ extension Daemon {
}
}

private func makeOverviewSnapshot() -> OverviewSnapshot {
func makeOverviewSnapshot() -> OverviewSnapshot {
OverviewSnapshot(
monitors: logicalOverviewMonitors(state: state),
monitors: state.monitors,
monitorFrames: Dictionary(
uniqueKeysWithValues: latestMonitors.map { ($0.id, $0.frame) }
),
Expand Down
110 changes: 0 additions & 110 deletions Sources/DefiRuntime/OverviewRuntime.swift
Original file line number Diff line number Diff line change
Expand Up @@ -393,113 +393,3 @@ private func validatedDestination(
else { throw OverviewRuntimeError.unknownWorkspace(workspaceID) }
return (monitorID, workspaceID)
}

public func logicalOverviewMonitors(state: RuntimeState) -> [Monitor] {
var monitors = state.monitors
for monitorIndex in monitors.indices {
for workspaceIndex in monitors[monitorIndex].workspaces.indices {
for windowID in state.nativeFullscreenWindowIDs {
removeWindow(
windowID,
from: &monitors[monitorIndex].workspaces[workspaceIndex],
settings: state.layout
)
}
}
}

for windowID in state.nativeFullscreenFloatingWindowIDs {
guard let location = state.location(containing: windowID),
let monitorIndex = monitors.firstIndex(where: { $0.id == location.monitorID }),
let workspaceIndex = monitors[monitorIndex].workspaces.firstIndex(where: {
$0.id == location.workspaceID
})
else { continue }
monitors[monitorIndex].workspaces[workspaceIndex].floatingWindows.append(windowID)
}

let groupedPlacements = Dictionary(grouping: state.nativeFullscreenTiledPlacements) {
_, placement in
OverviewPlacementGroup(
monitorID: placement.monitorID,
workspaceID: placement.workspaceID,
columnIndex: placement.columnIndex
)
}
for (group, placements) in groupedPlacements.sorted(by: {
$0.key.columnIndex < $1.key.columnIndex
}) {
guard let placement = placements.first?.value,
let monitorIndex = monitors.firstIndex(where: { $0.id == group.monitorID }),
let workspaceIndex = monitors[monitorIndex].workspaces.firstIndex(where: {
$0.id == group.workspaceID
})
else { continue }
let desiredWindowIDs = placement.column.windows.filter {
state.windows[$0] != nil
}
guard !desiredWindowIDs.isEmpty else { continue }
if let existingColumnIndex = monitors[monitorIndex].workspaces[workspaceIndex]
.columns.firstIndex(where: { column in
column.windows.contains(where: desiredWindowIDs.contains)
})
{
monitors[monitorIndex].workspaces[workspaceIndex]
.columns[existingColumnIndex].windows = desiredWindowIDs
monitors[monitorIndex].workspaces[workspaceIndex]
.columns[existingColumnIndex].width = placement.column.width
monitors[monitorIndex].workspaces[workspaceIndex]
.columns[existingColumnIndex].preMaximizedWidth =
placement.column.preMaximizedWidth
} else {
let insertionIndex = min(
max(group.columnIndex, 0),
monitors[monitorIndex].workspaces[workspaceIndex].columns.count
)
monitors[monitorIndex].workspaces[workspaceIndex].columns.insert(
Column(
windows: desiredWindowIDs,
focusedWindow: min(
placement.windowIndex,
desiredWindowIDs.count - 1
),
width: placement.column.width,
preMaximizedWidth: placement.column.preMaximizedWidth
),
at: insertionIndex
)
}
}
for originalMonitor in state.monitors {
guard
let monitorIndex = monitors.firstIndex(where: {
$0.id == originalMonitor.id
})
else { continue }
for originalWorkspace in originalMonitor.workspaces {
guard
let workspaceIndex = monitors[monitorIndex].workspaces.firstIndex(where: {
$0.id == originalWorkspace.id
})
else { continue }
let selectedWindowID = selectedWindowID(in: originalWorkspace)
monitors[monitorIndex].workspaces[workspaceIndex].scrollOffset =
originalWorkspace.scrollOffset
monitors[monitorIndex].workspaces[workspaceIndex].targetScrollOffset =
originalWorkspace.targetScrollOffset
if let selectedWindowID {
restoreSelection(
selectedWindowID,
in: &monitors[monitorIndex].workspaces[workspaceIndex]
)
}
}
}
return monitors
}

private struct OverviewPlacementGroup: Hashable {
let monitorID: MonitorID
let workspaceID: WorkspaceID
let columnIndex: Int
}
47 changes: 47 additions & 0 deletions Tests/DefiDaemonTests/DaemonOverviewSnapshotTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import DefiConfig
import DefiCore
import DefiMacOS
import DefiModel
import DefiRuntime
import Foundation
import Testing

@testable import DefiDaemon

struct DaemonOverviewSnapshotTests {
@Test @NavigationActor
func overviewShowsFullscreenPlaceholderWhereTheStripDoes() async throws {
let directory = URL(filePath: "/tmp/defi-overview-\(UUID().uuidString)")
try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
defer { try? FileManager.default.removeItem(at: directory) }
let configURL = directory.appending(path: "config.toml")
try "".write(to: configURL, atomically: true, encoding: .utf8)
let menuBar = await MainActor.run { MenuBarState(accessibilityTrusted: { false }) }
let daemon = try Daemon(
options: DaemonOptions(arguments: [
"--config", configURL.path, "--socket", directory.appending(path: "daemon.sock").path,
]),
menuBar: menuBar,
instanceLockURL: directory.appending(path: "daemon.lock"),
topologyStore: WorkspaceTopologyStore(url: directory.appending(path: "topology.json")),
workspaceStatePublisher: { _ in },
desktopSnapshotOverviewUpdater: { _ in }
)
let monitorID = MonitorID(rawValue: 1)
daemon.state.attachMonitor(monitorID)
let windows = (1...3).map {
Window(
id: WindowID(rawValue: $0), appID: "app", title: "Window",
frame: Rect(x: 0, y: 0, width: 500, height: 700), monitorID: monitorID)
}
reconcileWindows(windows, config: Config(), state: &daemon.state)
reconcileWindows(
windows, config: Config(), nativeFullscreenWindowIDs: [WindowID(rawValue: 1)],
state: &daemon.state)

let strip = daemon.state.monitors[0].workspaces[0].columns.map(\.windows)
#expect(strip.last == [WindowID(rawValue: 1)])
let overview = daemon.makeOverviewSnapshot().monitors[0].workspaces[0].columns.map(\.windows)
#expect(overview == strip)
}
}
43 changes: 0 additions & 43 deletions Tests/DefiRuntimeTests/OverviewRuntimeTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -354,49 +354,6 @@ struct OverviewRuntimeTests {
)
}

@Test
func `Logical overview restores fullscreen stacks without changing runtime state`() {
var state = makeState()
let first = WindowID(rawValue: 1)
let fullscreen = WindowID(rawValue: 2)
let removed = WindowID(rawValue: 3)
let floating = WindowID(rawValue: 4)
let column = Column(
windows: [first, fullscreen, removed], focusedWindow: 1,
width: .pixels(420), preMaximizedWidth: .fraction(0.5)
)
for id in [first, fullscreen, removed, floating] {
state.windows[id] = window(id, monitorID: firstMonitor)
}
state.windows[floating]?.floating = true
state.monitors[0].workspaces[0].columns = [column]
state.monitors[0].workspaces[0].floatingWindows = [floating]
let config = Config(workspaces: WorkspacesConfig(names: ["1", "2", "remote"]))
reconcileWindows(
[first, fullscreen, removed, floating].compactMap { state.windows[$0] },
config: config,
nativeFullscreenWindowIDs: [fullscreen, floating],
state: &state
)
state.windows[removed] = nil
state.monitors[0].workspaces[0].scrollOffset = 45
state.monitors[0].workspaces[0].targetScrollOffset = 80
let original = state
let projected = logicalOverviewMonitors(state: state)
let workspace = projected[0].workspaces[0]

#expect(workspace.columns.count == 1)
#expect(workspace.columns[0].windows == [first, fullscreen])
#expect(workspace.columns[0].width == .pixels(420))
#expect(workspace.columns[0].preMaximizedWidth == .fraction(0.5))
#expect(workspace.columns[0].focusedWindow == 1)
#expect(workspace.floatingWindows == [floating])
#expect(workspace.scrollOffset == 45)
#expect(workspace.targetScrollOffset == 80)
#expect(projected[1] == original.monitors[1])
#expect(state == original)
}

private func makeState() -> RuntimeState {
var state = RuntimeState(
config: Config(
Expand Down
2 changes: 1 addition & 1 deletion docs/internals/overview-capture.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Overview capture

Defi builds each monitor's Overview from logical runtime state. Window previews
Defi builds each monitor's Overview from the same runtime state as the strip. Window previews
are on by default, refreshed once per Overview session, and never required for
navigation, focus, or window movement. All committed focus and topology changes
still pass through `DefiRuntime` (see [macOS authority](./macos-authority.md)).
Expand Down
Loading