1 files changed, 11 insertions, 4 deletions
diff --git a/src/Terminal.zig b/src/Terminal.zig
index 62a77ca8..91c23305 100644
--- a/src/Terminal.zig
+++ b/src/Terminal.zig
@@ -718,7 +718,7 @@ pub fn feedOutput(p: *Pardes, pane: *Pane, bytes: []const u8) void {
     if (comptime !enabled) return;
     if (pane.terminal == null) return;
     const has_positions = pane.ovl != null or pane.body.cur_pinned or pane.body.vsel.active or
-        pane.body.msel.active or pane.body.nsel > 0 or pane.body.append_at != null or pane.look_at != null or
+        pane.body.msel.active or pane.body.nsel > 0 or pane.body.last_edit != null or pane.look_at != null or
         pane.body.ed_undo_len > 0 or pane.body.ed_redo_len > 0 or pointerRowCount(pane) > 0;
     // Sticky bottom, as every other terminal does it: output drags the
     // viewport down only when the viewport was already on the last row, so
@@ -844,7 +844,7 @@ fn ingestWithPositions(pane: *Pane, bytes: []const u8) void {
         extra[nextra + 1] = &selection.arow;
         nextra += 2;
     }
-    if (pane.body.append_at) |*at| {
+    if (pane.body.last_edit) |*at| {
         extra[nextra] = &at.row;
         nextra += 1;
     }
@@ -933,6 +933,13 @@ test "raw terminal output needs no position tracking allocations" {
     try std.testing.expectEqual(pins, pane.terminal.?.vt.screens.active.pages.countTrackedPins());
 }
 
+/// A full-screen program has the emulator on its alternate screen.
+pub fn onAlternateScreen(pane: *const Pane) bool {
+    if (comptime !enabled) return false;
+    const state = pane.terminal orelse return false;
+    return state.vt.screens.active_key == .alternate;
+}
+
 pub fn promptInputReady(pane: *const Pane) bool {
     if (comptime !enabled) return false;
     const state = pane.terminal orelse return false;
@@ -1118,7 +1125,7 @@ pub fn enterTty(p: *Pardes, id: usize) void {
     // keeps its modal endpoint for the next return to editor mode.
     pane.body.cur_pinned = selected;
     pane.body.select = false;
-    pane.body.append_at = null;
+    pane.body.restore_cursor = false;
     pane.body.sticky_col = -1;
     pane.body.normal.clear();
 }
@@ -1380,7 +1387,7 @@ pub fn editText(p: *Pardes, pane: *Pane, lo: i32, hi: i32, col: i32) ?EditText {
 
 /// Consume a rewritten overlay, freeing the terminal edit text it replaces.
 pub fn setEditText(p: *Pardes, pane: *Pane, new: []u8) void {
-    const overlay = if (pane.ovl) |*value| value else return p.gpa.free(new);
+    const overlay = if (pane.ovl) |*value| value else return pardes.edit.retireEditText(p, new);
     for (0..pane.sel.len) |button| {
         pane.clearPointerSelection(button);
         pane.sel[button].state = .none;