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
33 changes: 9 additions & 24 deletions Sources/DefiCore/WorkspaceScrolling.swift
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@ public func scrollGestureSnap(
viewport: Rect,
windows: [Window] = [],
settings: LayoutSettings,
excludingWindowIDs: Set<WindowID> = [],
rest: Double,
current: Double,
projected: Double
Expand All @@ -258,22 +257,20 @@ public func scrollGestureSnap(
if direction == 1 {
let target = focusedColumnScrollTarget(
workspace: stepped, viewport: viewport, windows: windows,
settings: settings, excludingWindowIDs: excludingWindowIDs)
settings: settings)
rests.append((column, target.offset, target.focus))
}
while workspace.columns.indices.contains(column + direction) {
column += direction
stepped.focusedColumn = column
let target = focusedColumnScrollTarget(
workspace: stepped, viewport: viewport, windows: windows,
settings: settings, excludingWindowIDs: excludingWindowIDs)
settings: settings)
stepped.scrollOffset = target.offset
stepped.scrollFocus = target.focus
rests.append((column, target.offset, target.focus))
}
}
// A native fullscreen column rests where its neighbour does; it is never the landing.
rests.removeAll { isOutOfLayout(workspace.columns[$0.column], excludingWindowIDs) }
rests.sort { $0.column < $1.column }
let offsets = rests.map(\.offset).sorted()
// A flick carries to the next resting place at most, never several columns at once:
Expand Down Expand Up @@ -303,7 +300,6 @@ public func scrollGestureFreeRest(
viewport: Rect,
windows: [Window] = [],
settings: LayoutSettings,
excludingWindowIDs: Set<WindowID> = [],
current: Double,
projected: Double
) -> (column: Int, offset: Double, focus: ScrollFocus?)? {
Expand All @@ -312,38 +308,27 @@ public func scrollGestureFreeRest(
revealing.centerFocusedColumn = .never
revealing.alwaysCenterSingleColumn = false
let extents = scrollGestureExtents(workspace: workspace, viewport: viewport, windows: windows,
settings: revealing, excludingWindowIDs: excludingWindowIDs)
// Columns in the layout, with their centres in strip widths.
let shown = workspace.columns.indices.filter { !isOutOfLayout(workspace.columns[$0], excludingWindowIDs) }
guard let lowest = shown.map({ extents[$0].lowerBound }).min(),
let highest = shown.map({ extents[$0].upperBound }).max()
settings: revealing)
guard let lowest = extents.map(\.lowerBound).min(), let highest = extents.map(\.upperBound).max()
else { return nil }
let wanted = min(max(projected, lowest), highest)
let forward = projected >= current
let widths = columnWidthsInViewports(
workspaceForLayout(workspace, excludingWindowIDs: excludingWindowIDs).columns, viewport: viewport,
let widths = columnWidthsInViewports(workspace.columns, viewport: viewport,
windowsByID: Dictionary(uniqueKeysWithValues: windows.map { ($0.id, $0) }), settings: settings)
guard shown.count == widths.count else { return nil }
let centers = Dictionary(uniqueKeysWithValues: shown.indices.map {
(shown[$0], widths.prefix($0).reduce(0, +) + widths[$0] / 2)
})
let distance = { (column: Int) in
(max(extents[column].lowerBound - wanted, wanted - extents[column].upperBound, 0),
abs(centers[column]! - (wanted + 0.5)), forward ? -column : column)
abs(widths.prefix(column).reduce(0, +) + widths[column] / 2 - (wanted + 0.5)),
forward ? -column : column)
}
guard let column = shown.min(by: { distance($0) < distance($1) }) else { return nil }
guard let column = workspace.columns.indices.min(by: { distance($0) < distance($1) })
else { return nil }
let extent = extents[column]
let rows = workspace.columns[column]
let windowID = rows.windows.indices.contains(rows.focusedWindow) ? rows.windows[rows.focusedWindow] : nil
return (column, min(max(wanted, extent.lowerBound), extent.upperBound),
windowID.map { ScrollFocus(windowID: $0, centered: false, free: true) })
}

/// Whether layout leaves the column out: every window in it is excluded (native fullscreen).
private func isOutOfLayout(_ column: Column, _ excludingWindowIDs: Set<WindowID>) -> Bool {
column.windows.allSatisfy(excludingWindowIDs.contains)
}

/// Each column's resting offsets: the focus policy pushed from the right, then from the
/// left. The column is fully in view anywhere between them.
public func scrollGestureExtents(
Expand Down
31 changes: 24 additions & 7 deletions Sources/DefiDaemon/DaemonDesktop.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ extension Daemon {
var ribbonFrames: [FrameAssignment] = []
var borderAssignments: [FrameAssignment] = []
var nativeFullscreenPlaceholderAssignments: [FrameAssignment] = []
var nativeFullscreenRibbonFrames: [FrameAssignment] = []
var hiddenWindowIDs = Set<WindowID>()
var outOfScopeWindowIDs = Set<WindowID>()
var cachedMonitorIDs = Set<MonitorID>()
Expand All @@ -71,6 +72,7 @@ extension Daemon {
nativeFullscreenPlaceholderAssignments.append(
contentsOf: cached.nativeFullscreenPlaceholderAssignments
)
nativeFullscreenRibbonFrames.append(contentsOf: cached.nativeFullscreenRibbonFrames)
hiddenWindowIDs.formUnion(cached.hiddenWindowIDs)
outOfScopeWindowIDs.formUnion(cached.assignments.map(\.windowID))
cachedMonitorIDs.insert(monitor.id)
Expand All @@ -97,6 +99,7 @@ extension Daemon {
var monitorAssignments: [FrameAssignment] = []
var monitorBorderAssignments: [FrameAssignment] = []
var monitorNativeFullscreenPlaceholderAssignments: [FrameAssignment] = []
var monitorNativeFullscreenRibbonFrames: [FrameAssignment] = []
var monitorHiddenWindowIDs = Set<WindowID>()
for workspaceIndex in state.monitors[monitorIndex].workspaces.indices {
let workspace = state.monitors[monitorIndex].workspaces[workspaceIndex]
Expand Down Expand Up @@ -124,14 +127,17 @@ extension Daemon {
}

if !state.nativeFullscreenWindowIDs.isEmpty {
let fullscreenLayout = computeLayout(
workspace: workspace,
viewport: viewport,
windows: workspaceWindows,
settings: state.layout
)
monitorNativeFullscreenRibbonFrames.append(contentsOf: fullscreenLayout.filter {
state.nativeFullscreenWindowIDs.contains($0.windowID)
})
let fullscreenStrip = continuousStripFramesForActiveWorkspace(
computeLayout(
workspace: workspace,
viewport: viewport,
windows: workspaceWindows,
settings: state.layout
),
viewport: viewport, park: park
fullscreenLayout, viewport: viewport, park: park
)
monitorNativeFullscreenPlaceholderAssignments.append(
contentsOf: fullscreenStrip.frames.filter {
Expand Down Expand Up @@ -167,6 +173,7 @@ extension Daemon {
borderAssignments: monitorBorderAssignments,
nativeFullscreenPlaceholderAssignments:
monitorNativeFullscreenPlaceholderAssignments,
nativeFullscreenRibbonFrames: monitorNativeFullscreenRibbonFrames,
hiddenWindowIDs: monitorHiddenWindowIDs
)
layoutPlansByMonitor[monitor.id] = plan
Expand All @@ -182,6 +189,7 @@ extension Daemon {
nativeFullscreenPlaceholderAssignments.append(
contentsOf: plan.nativeFullscreenPlaceholderAssignments
)
nativeFullscreenRibbonFrames.append(contentsOf: plan.nativeFullscreenRibbonFrames)
hiddenWindowIDs.formUnion(plan.hiddenWindowIDs)
}
let skipped = additionalSkippedWindowIDs.union(outOfScopeWindowIDs)
Expand Down Expand Up @@ -221,6 +229,15 @@ extension Daemon {
laidOut: !cachedMonitorIDs.contains(monitor.id))
}
}
platform.nativeFullscreenRibbonPlaceholders = Dictionary(
nativeFullscreenRibbonFrames.compactMap { assignment in
guard let window = state.windows[assignment.windowID],
let monitorID = state.monitorID(containing: assignment.windowID)
else { return nil }
return (window.id, NativeFullscreenPlaceholder(windowID: window.id, monitorID: monitorID,
appID: window.appID, title: window.title, frame: assignment.frame))
}
) { first, _ in first }
platform.apply(
platformAssignments,
ribbonFrames: ribbonFrames,
Expand Down
16 changes: 9 additions & 7 deletions Sources/DefiDaemon/DaemonScrollGesture.swift
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ extension Daemon {
moving.formUnion(neighbors.keys)
} else {
guard !workspace.columns.isEmpty else { return }
// The native fullscreen placeholders end the strip, as for key presses.
let extents = scrollGestureExtents(workspace: workspace, viewport: viewport,
windows: tiled.compactMap { state.windows[$0] }, settings: state.layout,
excludingWindowIDs: state.nativeFullscreenWindowIDs)
windows: tiled.compactMap { state.windows[$0] }, settings: state.layout)
guard let lowest = extents.map(\.lowerBound).min(), let highest = extents.map(\.upperBound).max()
else { return }
let rest = workspace.targetScrollOffset
Expand Down Expand Up @@ -180,11 +180,10 @@ extension Daemon {
let windows = workspace.columns.flatMap(\.windows).compactMap { state.windows[$0] }
guard let snap = config.input.scrollGestureSnap
? scrollGestureSnap(workspace: workspace, viewport: pan.viewport, windows: windows,
settings: state.layout, excludingWindowIDs: state.nativeFullscreenWindowIDs,
rest: pan.rest, current: offset, projected: pan.rest - projected / pan.stripWidth)
settings: state.layout, rest: pan.rest, current: offset,
projected: pan.rest - projected / pan.stripWidth)
: scrollGestureFreeRest(workspace: workspace, viewport: pan.viewport, windows: windows,
settings: state.layout, excludingWindowIDs: state.nativeFullscreenWindowIDs,
current: offset, projected: pan.rest - projected / pan.stripWidth),
settings: state.layout, current: offset, projected: pan.rest - projected / pan.stripWidth),
settleScrollGesture(monitorID: pan.monitorID, workspaceID: pan.workspaceID,
column: snap.column, offset: snap.offset, focus: snap.focus, state: &state)
else {
Expand All @@ -198,7 +197,10 @@ extension Daemon {
commandGeneration &+= 1
activeMonitorID = pan.monitorID
settleScrollPan(on: pan.monitorID)
if let selected = state.selectedWindowID(on: pan.monitorID) {
// A swipe only selects a placeholder: focusing its window would switch to its Space.
if let selected = state.selectedWindowID(on: pan.monitorID),
!state.nativeFullscreenWindowIDs.contains(selected)
{
focus.queueCommand(PendingAnimatedFocus(
windowID: selected,
previousSelectedWindowID: previouslySelectedWindowID,
Expand Down
2 changes: 2 additions & 0 deletions Sources/DefiDaemon/DefiDaemon.swift
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ struct MonitorLayoutPlan {
let assignments: [FrameAssignment]
let borderAssignments: [FrameAssignment]
let nativeFullscreenPlaceholderAssignments: [FrameAssignment]
/// Every placeholder of the active workspace at its ribbon place, on screen or not.
let nativeFullscreenRibbonFrames: [FrameAssignment]
let hiddenWindowIDs: Set<WindowID>
}

Expand Down
19 changes: 12 additions & 7 deletions Sources/DefiMacOS/MacOSPlatform+FrameApplication.swift
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ extension MacOSPlatform {
previous: previousRibbonFrames, monitors: windowProxyMonitors)
for id in deferredRibbonMoves.intersection(skippedWindowIDs) { history[id] = previousRibbonFrames[id] }
previousLogicalRibbonFrames = history
let previousPlaceholderFrames = previousNativeFullscreenRibbonFrames
previousNativeFullscreenRibbonFrames = nativeFullscreenRibbonPlaceholders.mapValues(\.frame)
deferredRibbonMoves.subtract(resumed)
frameSubmissionGeneration &+= 1
let submissionGeneration = frameSubmissionGeneration
Expand All @@ -70,7 +72,8 @@ extension MacOSPlatform {
if windowProxiesEnabled {
let resumes = !animates && !resumed.isEmpty
applyWindowProxies(assignments: assignments, ribbonFrames: ribbonFrames,
previousRibbonFrames: previousRibbonFrames, skippedWindowIDs: skippedWindowIDs,
previousRibbonFrames: previousRibbonFrames, previousPlaceholderFrames: previousPlaceholderFrames,
skippedWindowIDs: skippedWindowIDs,
hiddenWindowIDs: hiddenWindowIDs, source: resumes ? "native-focus-animation" : source,
animated: animated || resumes)
}
Expand Down Expand Up @@ -607,7 +610,8 @@ func windowProxyMotion(ribbonTargets: [WindowID: Rect], otherTargets: [WindowID:
extension MacOSPlatform {
// Runs entirely on the navigation actor: command intake never waits for the main thread.
func applyWindowProxies(assignments: [FrameAssignment], ribbonFrames: [FrameAssignment],
previousRibbonFrames: [WindowID: Rect], skippedWindowIDs: Set<WindowID>,
previousRibbonFrames: [WindowID: Rect], previousPlaceholderFrames: [WindowID: Rect],
skippedWindowIDs: Set<WindowID>,
hiddenWindowIDs: Set<WindowID>, source: String, animated: Bool) {
let allWindows = Dictionary(lastSnapshotWindows.map { ($0.id, $0) }) { first, _ in first }
// Each display moves on its own overlay, exactly as a single display does.
Expand All @@ -627,8 +631,8 @@ extension MacOSPlatform {
let ribbon = ribbonFrames.filter { owned.contains($0.windowID) }
let shown = applyWindowProxies(on: monitor, presenter: presenter,
assignments: assignments.filter { owned.contains($0.windowID) }, ribbonFrames: ribbon,
previousRibbonFrames: previousRibbonFrames, skippedWindowIDs: skippedWindowIDs,
hiddenWindowIDs: hiddenWindowIDs, allWindows: allWindows,
previousRibbonFrames: previousRibbonFrames, previousPlaceholderFrames: previousPlaceholderFrames,
skippedWindowIDs: skippedWindowIDs, hiddenWindowIDs: hiddenWindowIDs, allWindows: allWindows,
motion: windowProxyMotionDuration(source: source, animated: animated,
hasRibbon: !ribbon.isEmpty, workspaceShift: monitor.workspaceShift))
if released, !shown { presenter.landDrop() }
Expand All @@ -637,8 +641,8 @@ extension MacOSPlatform {

private func applyWindowProxies(on monitor: WindowProxyMonitor, presenter: RibbonProxyPresenter,
assignments: [FrameAssignment], ribbonFrames: [FrameAssignment],
previousRibbonFrames: [WindowID: Rect], skippedWindowIDs: Set<WindowID>,
hiddenWindowIDs: Set<WindowID>, allWindows: [WindowID: Window],
previousRibbonFrames: [WindowID: Rect], previousPlaceholderFrames: [WindowID: Rect],
skippedWindowIDs: Set<WindowID>, hiddenWindowIDs: Set<WindowID>, allWindows: [WindowID: Window],
motion duration: TimeInterval?) -> Bool {
let viewport = monitor.viewport, workspaceShift = monitor.workspaceShift
let windows = allWindows.filter { monitor.windowIDs.contains($0.key) }
Expand Down Expand Up @@ -709,10 +713,11 @@ extension MacOSPlatform {
return RibbonProxyWindow(id: plan.id, appID: window.appID, processID: processID,
from: from, to: plan.to, appears: appears)
}
proxies += nativeFullscreenProxies(monitor, from: previousPlaceholderFrames)
// Visible managed windows without a planned motion (skipped writes, floating
// windows) are drawn still at their real place instead of blocking the overlay.
let moving = Set(proxies.map(\.id))
for (id, window) in windows where !moving.contains(id) {
for (id, window) in windows where !moving.contains(id) && !nativeFullscreenWindowIDs.contains(id) {
guard let processID = window.processID, let frame = observed[id],
windowProxyVisibleOverlap(frame, viewport) > 1.01 else { continue }
proxies.append(RibbonProxyWindow(id: id, appID: window.appID, processID: processID,
Expand Down
29 changes: 27 additions & 2 deletions Sources/DefiMacOS/MacOSPlatform.swift
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public final class MacOSPlatform {
// Visible windows start exactly where they are (the held one is already under the
// pointer); only windows off screen take their logical place.
return windows.compactMap { id, window -> RibbonProxyWindow? in
guard let processID = window.processID else { return nil }
guard let processID = window.processID, !nativeFullscreenWindowIDs.contains(id) else { return nil }
let logical = previousLogicalRibbonFrames[id]
// A window still on its way to or from its parking corner is not on the ribbon yet.
if let frame = native[id], windowProxyVisibleOverlap(frame, viewport) > 1.01,
Expand All @@ -240,9 +240,34 @@ public final class MacOSPlatform {
// Parked at a corner, its native y is the display's bottom: the ribbon place is logical.
guard let logical else { return nil }
return RibbonProxyWindow(id: id, appID: window.appID, processID: processID, from: logical, to: logical)
}
} + nativeFullscreenProxies(monitor, from: previousNativeFullscreenRibbonFrames)
}
var previousLogicalRibbonFrames: [WindowID: Rect] = [:]
/// Native fullscreen placeholders at their ribbon place, set before each layout.
public var nativeFullscreenRibbonPlaceholders: [WindowID: NativeFullscreenPlaceholder] = [:]
var previousNativeFullscreenRibbonFrames: [WindowID: Rect] = [:]
private var nativeFullscreenPictures: [WindowID: (key: String, image: CGImage)] = [:]

/// The placeholders of `monitor` as overlay windows, so they travel with the ribbon.
func nativeFullscreenProxies(_ monitor: WindowProxyMonitor, from previous: [WindowID: Rect])
-> [RibbonProxyWindow] {
nativeFullscreenPictures = nativeFullscreenPictures.filter { nativeFullscreenRibbonPlaceholders[$0.key] != nil }
return nativeFullscreenRibbonPlaceholders.compactMap { id, window -> RibbonProxyWindow? in
guard monitor.windowIDs.contains(id) else { return nil }
let to = window.frame
let scale = RibbonProxyStore.shared.screen(containing: monitor.viewport)?.scale ?? 2
let selected = id == desiredSelectedWindowID
let accent = RibbonProxyPresenter.borderStyle?.activeColor ?? 0
let key = "\(window.appID)|\(window.title)|\(to.width)x\(to.height)@\(scale)|\(selected)|\(accent)"
let image = nativeFullscreenPictures[id].flatMap { $0.key == key ? $0.image : nil }
?? nativeFullscreenPlaceholderImage(appID: window.appID, title: window.title,
size: CGSize(width: to.width, height: to.height), scale: scale, selected: selected, accentColor: accent)
guard let image else { return nil }
nativeFullscreenPictures[id] = (key, image)
return RibbonProxyWindow(id: id, appID: window.appID, processID: 0,
from: previous[id] ?? to, to: to, picture: image)
}
}
/// Ribbon moves an animated layout could not write yet; the layout that writes them animates.
var deferredRibbonMoves: Set<WindowID> = []
/// When the latest window opening began holding the screen: only its check releases the hold.
Expand Down
Loading
Loading