summaryrefslogtreecommitdiff
path: root/src/views.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/views.zig')
-rw-r--r--src/views.zig8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/views.zig b/src/views.zig
index 46959783..dcd11b2c 100644
--- a/src/views.zig
+++ b/src/views.zig
@@ -35,7 +35,7 @@ pub const fields = [_][:0]const u8{
"screen_w", "screen_h", "cell_pixels", "row_metrics",
"ncol", "cols", "col_tags", "finder", "rects",
"col_x", "col_w", "active",
- "jumps", "njumps", "jcur", "jump_force",
+ "jumps",
"active_column",
"native_images", "native_image_patches", "windowed",
"drag", "mouse_grab", "window_focused", "focus_told",
@@ -436,6 +436,8 @@ pub fn open(p: *Pardes) ?u8 {
slot.* = .{ .view = .{ .screen_w = p.screen_w, .screen_h = p.screen_h } };
inline for (sized ++ laid_out ++ .{ "windowed", "native_images", "native_image_patches" }) |name|
@field(slot.view, name) = @field(p, name);
+ // A query's mark on the jumps is the view's that asked it.
+ slot.view.jumps.force = false;
slot.view.col_tags = @splat(.{ .what = .column, .gpa = p.gpa });
for (p.panes, 0..) |s, id| {
const pane = s orelse continue;
@@ -449,7 +451,7 @@ pub fn open(p: *Pardes) ?u8 {
/// How a view is laid out and focused: what a new one takes of the live
/// one (`open`), and what one going leaves the view that stays (`closeKeeping`).
-const laid_out = .{ "ncol", "cols", "finder", "active", "active_column", "jumps", "njumps", "jcur" };
+const laid_out = .{ "ncol", "cols", "finder", "active", "active_column", "jumps" };
const sized = .{ "screen_w", "screen_h", "cell_pixels", "row_metrics" };
/// View `k` gone, and the view that stays live laid out as `k` was: its
@@ -465,7 +467,9 @@ pub fn closeKeeping(p: *Pardes, k: u8) void {
const slot = p.parked[other].?;
// Its size too: the terminals it sized keep theirs, no shell redrawn for
// a size it is given back at the rejoin.
+ const force = slot.view.jumps.force;
inline for (sized ++ laid_out) |name| @field(slot.view, name) = @field(p, name);
+ slot.view.jumps.force = force;
for (p.panes, 0..) |s, id| {
const pane = s orelse {
slot.serials[id] = 0;