summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-09-01 13:46:44 -0300
committerGabriel Schneider <[email protected]>2026-09-01 13:57:41 -0300
commitcce6b18a49870086982f9a0e1fda90ed170b9fba (patch)
treee5ce990d0a1d43503375d891bc51f283e0a1c215 /src/gui
parentae9325a5cb128d0d952afb8f9feaaca68e5e37a2 (diff)
downloadpardes-cce6b18a49870086982f9a0e1fda90ed170b9fba.tar.gz
pardes-cce6b18a49870086982f9a0e1fda90ed170b9fba.zip
macos: one tagline rule for both hosts, a kqueue beside the inotify, and effects that compile
Three things this shell had its own copy of, and in each case the fix is that it stops having one. **The tagline band.** A pane tag draws at `gui_tagline_font_percent` of the body face and the band it sits on shrinks with it, while the grid row stays body-sized — so something has to decide where the shorter band sits in the taller row. This shell decided by centring, always, which is precisely the case `config.gui_topbar_pane_border_px` exists to prevent: the topbar's unused half-band meets the first pane tag's unused half-band and the window background shows through the seam. The strip is as wide as the bands are short — on a 20-pixel cell, 4 physical pixels at the default 82%, 10 at 50%, 14 at 30% — so it grew as the tagline face shrank and read as "the tagline is wrong on the mac" rather than as one missing rule. The rule is `pardes.taglineBandOffset` in the core now and both pixel hosts call it: row zero bottom-aligned, the first pane-tag row top-aligned, the two joined by `gui_topbar_pane_border_px` in the theme's scrollbar-track colour, every row between centred, and a `Tagbottom` band on the final row flush with the window edge — with the sub-cell strip beneath it painted in that band's own colour, because the core grid holds only whole cells and a window is any height it likes. `pardes_tagline_band_offset`, `pardes_topbar_pane_border_px` and `pardes_topbar_pane_border_rgb` carry it over the C ABI as PHYSICAL pixels: the host multiplies its points by the backing scale going in and divides coming out, which is the snapping `Metrics` already does for the cell, and is what keeps a one-pixel rule one pixel instead of a two-pixel smear. **The watch.** `file_watch.zig` was one mark/reconcile transaction over `inotify`, so the tty shell, the SDL window and the detached daemon all watched nothing off Linux: an edit made outside pardes never reached the pane, and a PDF replaced on disk kept rendering the old inode. It is the same transaction over two kernels now — `init`, `wait`, `stop`, `drain`, `markDir` and `unmarkDir` are still the whole of it, and the hosts wait on a kqueue and poll it exactly as they did the old descriptor. A macOS mark is TWO filters, because a kqueue directory filter reports its entries changing and never a write to a file already inside it: the parent mark follows rename-over saves, `markFile` catches in-place writes, and `remarkFile` re-arms the file filter once a rename has moved the inode. That is the same pair the AppKit host's DispatchSources already used for the same reason. Directory marks are deduplicated here by device and inode, because each `EVFILT_VNODE` filter needs a descriptor of its own and inotify did that deduplication itself; `stop` and `drain` wake through the one `EVFILT_USER` filter, since a kqueue cannot simply be read the way an inotify descriptor can. **The effects.** The three `crt.ci.metal` entry points are `extern "C" [[stitchable]]`. `CIKernel.kernels(withMetalString:)` compiles that source at runtime, looks for stitchable functions, and rejects the WHOLE source with "cannot find a valid stitchable Metal function in the source" when it finds none — so `ScenePostprocessor.init?` returned nil and every scene effect and panel transition silently degraded to the plain CoreText draw. The `effect_sources.zig` test pins the exact spelling of all three, and `draw-effect` in the e2e suite catches the degradation rather than the spelling. Beside them, the offscreen harness owes the core a PRESENTATION. Its window is borderless and never ordered front, so AppKit runs no display cycle and `pardes_frame_presented` — whose only caller is `draw(_:)` — never fired. The core holds pointer gestures inert while a layout mutation has not reached a backend, which for an unpresenting harness is the rest of the script: the first pane a script opened silently killed every later click, drag and Look. So `readFrame` presents what it just rendered, into a bitmap nobody reads. `PARDES_CHROME` also looks under `/Applications`, where a browser's executable lives inside an application bundle and never on `PATH`. The macOS goldens are regenerated; docs/macos.md, config.md, detached.md, web.md and the design PDF follow.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/gui.zig45
1 files changed, 20 insertions, 25 deletions
diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index 11e9f53b..8442c197 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -29,7 +29,6 @@ const std = @import("std");
const builtin = @import("builtin");
const posix = std.posix;
const libc = std.c;
-const linux = std.os.linux; // inotify constants; referenced only on linux
const vaxis = @import("vaxis"); // test modes only: the stdin escape-seq parser
const ghostty_vt = @import("ghostty-vt"); // 256-color palette for .index cells
const pardes = @import("../pardes.zig");
@@ -1160,6 +1159,12 @@ fn spawnReader(gpa: std.mem.Allocator, pt: Pty, pane: u8, gen: u32, q: *Queue) v
/// the pty readers, and ended the same way — teardown closes the fd, the read
/// fails, the thread returns.
fn watchThread(fd: c_int, q: *Queue) void {
+ // A kqueue cannot be read, so the macos arm parks in kevent(2) instead and
+ // is released by the teardown's `file_watch.stop`. See file_watch.wait.
+ if (comptime builtin.os.tag != .linux) {
+ while (file_watch.wait(fd)) q.push(.files_changed);
+ return;
+ }
var buf: [4096]u8 = undefined;
while (true) {
const n = libc.read(fd, &buf, buf.len);
@@ -2100,13 +2105,17 @@ fn localSession(
}
var pipe_tasks: PipeTasks = .{};
defer pipe_tasks.cancelAll(io);
- // One inotify instance for every watched pane, opened here — before any
- // thread exists — so the pre-loop drain below can already mark the file a
- // positional path argument opened. -1 off linux: watchPane goes quiet and
- // the core simply never gets a file_changed event.
- var inotify_fd: c_int = if (builtin.os.tag == .linux) libc.inotify_init1(linux.IN.CLOEXEC) else -1;
+ // One watcher for every watched pane, opened here — before any thread
+ // exists — so the pre-loop drain below can already mark the file a
+ // positional path argument opened. `false`: this host parks a thread in it
+ // rather than polling it. -1 where there is no watcher to make: watchPane
+ // goes quiet and the core simply never gets a file_changed event.
+ var inotify_fd: c_int = file_watch.init(false);
defer if (inotify_fd >= 0) {
- _ = libc.close(inotify_fd); // ends the detached watcher's read
+ // `stop` releases a kqueue wait (macos); the close ends the blocking
+ // read (linux). Both leave watchThread on its way out.
+ file_watch.stop(inotify_fd);
+ _ = libc.close(inotify_fd);
inotify_fd = -1;
};
var watches: file_watch.Table = @splat(null);
@@ -5345,24 +5354,10 @@ const ResolvedCell = struct {
clear_bg: bool = false,
};
-fn topbarPaneBorderPixels(cell_h: u32, tagline_h: u32) u32 {
- const spare = cell_h -| tagline_h;
- return @min(@as(u32, config.gui_topbar_pane_border_px), spare * 2);
-}
-
-/// Vertical offset of a tagline band inside its body-sized logical row. Row
-/// zero and the first pane-tag row face a shared rule instead of centering two
-/// independent bands. A Tagbottom band on the final grid row faces the window
-/// edge, eliminating the matching unused half-band at the bottom.
-fn taglineBandOffset(row: u16, canvas_h: f32, cell_h: u32, tagline_h: u32) u32 {
- const spare = cell_h -| tagline_h;
- const border = topbarPaneBorderPixels(cell_h, tagline_h);
- if (row == 0) return spare - border / 2;
- if (row == pardes.TOPBAR_H) return border - border / 2;
- const rows: u32 = @max(1, @as(u32, @intFromFloat(@floor(canvas_h / @as(f32, @floatFromInt(cell_h))))));
- if (@as(u32, row) + 1 >= rows) return spare;
- return spare / 2;
-}
+// Both moved to the core so the AppKit shell can call the SAME rule over the C
+// ABI instead of keeping a second copy of it — see pardes.taglineBandOffset.
+const topbarPaneBorderPixels = pardes.topbarPaneBorderPixels;
+const taglineBandOffset = pardes.taglineBandOffset;
fn topbarPaneBorderHeight(surface: *const pardes.Surface, cell_h: u32, tagline_h: u32) ?u32 {
if (surface.rows <= pardes.TOPBAR_H) return null;