summaryrefslogtreecommitdiff
path: root/src/Core.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/Core.zig')
-rw-r--r--src/Core.zig31
1 files changed, 14 insertions, 17 deletions
diff --git a/src/Core.zig b/src/Core.zig
index 1f3e9283..2bf02c5d 100644
--- a/src/Core.zig
+++ b/src/Core.zig
@@ -1599,7 +1599,7 @@ pub fn update(p: *Pardes, ev: Event) void {
const pane = p.panes[o.pane] orelse return;
pane.shell_spoke = true;
ctlfs.events.notePtyOutput(p, o.pane, o.bytes);
- pardes.panes.terminal.feedOutput(p, pane, o.bytes);
+ pane.feedOutput(p, o.bytes);
ctlfs.pty.noteMarks(p, o.pane, pane);
exec.flushReplEnter(p, o.pane, true);
},
@@ -1796,10 +1796,7 @@ pub fn sync(p: *Pardes) void {
// What the terminal answers its program (a cursor report, its
// attributes) goes as typed bytes go: behind whatever is still
// queued for its pty, never ahead of it nor dropped.
- if (pane.terminal) |state| {
- p.emitWrite(id, state.reply[0..state.reply_len]);
- state.reply_len = 0;
- }
+ if (pane.terminal) |state| p.emitWrite(id, pardes.Term.replies(state));
const r = v.rects[id];
// The session's part of the pane's view geometry (File.geometry),
// and its context declarations.
@@ -1864,7 +1861,7 @@ pub fn sync(p: *Pardes) void {
// doc panes have no pty/emulator grid to reflow; just record
// the size so bodyText renders the right number of rows
if (pane.isTerminal()) {
- pardes.panes.terminal.resizeGrid(pane, cols, rows);
+ pane.resizeGrid(cols, rows);
p.shell_rows.markStale(pane); // reflow moved every row
p.emit(.{ .resize_pty = .{ .pane = @intCast(id), .cols = cols, .rows = rows } });
pane.fs.winsize = null;
@@ -1873,7 +1870,7 @@ pub fn sync(p: *Pardes) void {
pane.rows = rows;
if (pane.file) |*file| file.syntax_dirty = true;
}
- pane.pan = pardes.panes.terminal.panFor(p, pane, r);
+ pane.pan = pane.panFor(p, r);
// A directory pane's entries follow its width, as acme's
// columns do (Dir.fit).
if (pane.file) |file| if (file.listing != null and r.h > pane.tag_rows) pardes.panes.Dir.fit(p, pane, pane.cols);
@@ -1909,7 +1906,7 @@ fn typedInto(p: *Pardes) void {
/// Whether the live view sizes terminal `pane`: a terminal shown at two
/// sizes takes the size of the view that typed into it last, and any
/// view's once that one is gone. The others show it at that size, a
-/// shorter one passed down to its cursor (`Pane.pan`, terminal.panFor).
+/// shorter one passed down to its cursor (`Pane.pan`, Pane.panFor).
// ponytail: a panned view's pointer reports to a terminal's program and
// its kitty images are placed as the unpanned rows are.
fn sizes(p: *Pardes, pane: *Pane) bool {
@@ -3706,13 +3703,13 @@ test "raw terminal cursor follows its active row only while that row is visible"
try std.testing.expectEqual(rect.x + config.GUTTER + 3, live.x);
try std.testing.expectEqual(body_y + 2, live.y);
- pardes.panes.terminal.scrollGrid(pane, -1);
+ pardes.Term.scroll(pane.terminal.?, -1);
const scrolled = (try p.render(frame.allocator())).cursor orelse return error.MissingCursor;
try std.testing.expectEqual(live.x, scrolled.x);
try std.testing.expectEqual(live.y + 1, scrolled.y);
- pardes.panes.terminal.scrollGrid(pane, -@as(i32, pane.rows));
+ pardes.Term.scroll(pane.terminal.?, -@as(i32, pane.rows));
try std.testing.expect((try p.render(frame.allocator())).cursor == null);
- pardes.panes.terminal.followOutput(pane);
+ pane.followOutput();
const returned = (try p.render(frame.allocator())).cursor orelse return error.MissingCursor;
try std.testing.expectEqual(live.x, returned.x);
try std.testing.expectEqual(live.y, returned.y);
@@ -3758,31 +3755,31 @@ test "tty output follows only from the bottom" {
p.update(.{ .output = .{ .pane = @intCast(shell), .bytes = std.fmt.bufPrint(&buf, "line {d}\r\n", .{i}) catch unreachable } });
}
p.sync();
- const bottom = pardes.panes.terminal.scrollbar(sp).offset;
+ const bottom = pardes.Term.grid(sp.terminal).offset;
try std.testing.expect(bottom > 0);
// Scrolled back, the reader stays put however much the shell prints.
sp.scrollBy(-10);
p.sync();
- const parked = pardes.panes.terminal.scrollbar(sp).offset;
+ const parked = pardes.Term.grid(sp.terminal).offset;
try std.testing.expect(parked < bottom);
for (60..70) |i| {
var buf: [32]u8 = undefined;
p.update(.{ .output = .{ .pane = @intCast(shell), .bytes = std.fmt.bufPrint(&buf, "line {d}\r\n", .{i}) catch unreachable } });
}
p.sync();
- try std.testing.expectEqual(parked, pardes.panes.terminal.scrollbar(sp).offset);
+ try std.testing.expectEqual(parked, pardes.Term.grid(sp.terminal).offset);
// Typing snaps back to live output, so nobody types blind.
p.update(.{ .key = .{ .cp = 'x', .text = "x" } });
p.sync();
- try std.testing.expect(pardes.panes.terminal.scrollbar(sp).offset > parked);
+ try std.testing.expect(pardes.Term.grid(sp.terminal).offset > parked);
// ...and from there output follows again.
- const live = pardes.panes.terminal.scrollbar(sp).offset;
+ const live = pardes.Term.grid(sp.terminal).offset;
p.update(.{ .output = .{ .pane = @intCast(shell), .bytes = "tail\r\n" } });
p.sync();
- try std.testing.expect(pardes.panes.terminal.scrollbar(sp).offset > live);
+ try std.testing.expect(pardes.Term.grid(sp.terminal).offset > live);
}
test "an unasked desktop paste reaches a tty pane's program, not its buffer" {