summaryrefslogtreecommitdiff
path: root/src/macos/Sources/PardesView.swift
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-30 17:35:06 -0300
committerGabriel Schneider <[email protected]>2026-10-30 17:35:06 -0300
commit6d8da8721141284cf33bb901168b26135893eb86 (patch)
tree791d63401d4e85fbca1d597a8ce0326e70efd545 /src/macos/Sources/PardesView.swift
parentefd43a3a2cf03bb741366331158b368abf9ac583 (diff)
parentbf6810a8f9d6cc82050e7d9c0cfb06358301b574 (diff)
downloadpardes-6d8da8721141284cf33bb901168b26135893eb86.tar.gz
pardes-6d8da8721141284cf33bb901168b26135893eb86.zip
Merge latest upstream into the macOS branch for Zig 0.17
Retain the macOS branch history and local Acme selection color while adopting upstream's current core and platform changes. Pin Zig and ZLS to 0.17.0, and fetch the existing zstbi compatibility commit through upstream after its original fork was removed.
Diffstat (limited to 'src/macos/Sources/PardesView.swift')
-rw-r--r--src/macos/Sources/PardesView.swift8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/macos/Sources/PardesView.swift b/src/macos/Sources/PardesView.swift
index 5ad09c38..4ea4475a 100644
--- a/src/macos/Sources/PardesView.swift
+++ b/src/macos/Sources/PardesView.swift
@@ -523,9 +523,8 @@ private struct TaglineMetrics {
/// Where this band sits inside row `row`, measured down from the row's top.
/// The rule belongs to the core (`pardes_tagline_band_offset`) so that this
- /// shell and the SDL one cannot disagree about it: row zero and the first
- /// pane-tag row meet at a shared rule, a Tagbottom band on the last row
- /// faces the window edge, and everything between is centred.
+ /// shell and the SDL one cannot disagree about it: every band is centred,
+ /// except a Tagbottom band on the last row, which faces the window edge.
func top(row: Int, canvasHeight: CGFloat) -> CGFloat {
CGFloat(pardes_tagline_band_offset(
UInt16(clamping: row), Float(canvasHeight * scale), cellPixels, bandPixels)) / scale
@@ -563,6 +562,7 @@ private func modifiers(_ flags: NSEvent.ModifierFlags) -> UInt32 {
if flags.contains(.control) { mods |= UInt32(PARDES_MOD_CTRL) }
if flags.contains(.option) { mods |= UInt32(PARDES_MOD_ALT) }
if flags.contains(.shift) { mods |= UInt32(PARDES_MOD_SHIFT) }
+ if flags.contains(.command) { mods |= UInt32(PARDES_MOD_SUPER) }
return mods
}
@@ -685,7 +685,7 @@ final class PardesView: NSView {
private var latchedButton: pardes_mouse_button_e?
private var latchedCell: GridPoint?
/// Last physical point delivered by AppKit and its mapping through the
- /// accepted scene. Ripple/glitch can move a source cell under a stationary
+ /// accepted scene. The CRT's barrel moves a source cell under a stationary
/// hand, so successful scene presentations reconcile this point again.
private var pointerPoint: CGPoint?
private var pointerCell: GridPoint?