aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-09-24 16:35:40 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-10-11 17:23:09 +0000
commitb12ce3d7d787522a866658d01f606fdea66b0517 (patch)
treeaf1fbe6374f7b64328e6f7eaa44a1e09159ff554
parentchangelog: fixed color flashes with OSC 4,10,11 (diff)
grid: reflow: retain scrollback position
Closes #142
-rw-r--r--CHANGELOG.md2
-rw-r--r--grid.c11
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca17ca4a..a2b30c01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,8 @@
(https://codeberg.org/dnkl/foot/issues/146).
* Color flashes when changing the color palette with OSC 4,10,11
(https://codeberg.org/dnkl/foot/issues/141).
+* Scrollback position is now retained when resizing the window
+ (https://codeberg.org/dnkl/foot/issues/142).
### Security
diff --git a/grid.c b/grid.c
index e4b7c063..5f2b4277 100644
--- a/grid.c
+++ b/grid.c
@@ -65,6 +65,9 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
const int old_rows = grid->num_rows;
const int old_cols = grid->num_cols;
+ /* Is viewpoint tracking current grid offset? */
+ const bool view_follows = grid->view == grid->offset;
+
int new_col_idx = 0;
int new_row_idx = 0;
@@ -97,9 +100,14 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
tll_push_back(tracking_points, &cursor);
tll_push_back(tracking_points, &saved_cursor);
+ struct coord viewport = {0, grid->view};
+ if (!view_follows)
+ tll_push_back(tracking_points, &viewport);
+
for (size_t i = 0; i < tracking_points_count; i++)
tll_push_back(tracking_points, _tracking_points[i]);
+
/*
* Walk the old grid
*/
@@ -308,7 +316,8 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
grid->offset += new_rows;
while (new_grid[grid->offset] == NULL)
grid->offset = (grid->offset + 1) & (new_rows - 1);
- grid->view = grid->offset;
+
+ grid->view = view_follows ? grid->offset : viewport.row;
/* Ensure all visible rows have been allocated */
for (int r = 0; r < new_screen_rows; r++) {