aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-08-29 18:46:19 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-08-31 17:16:02 +0000
commit649d56a4e5142c9ab8ea24f4d1acbd4a49d534f9 (patch)
tree7f04ea118dd55334624f962e069f74572ef104cb
parentselection: mark_selected_region(): use an enum to encode how the cells are to be updated (diff)
grid: when setting the new viewport, ensure it’s correctly bounded
Do this by using scrollback relative coordinates, and ensure the new viewport is not larger than (grid_rows - screen_rows), as that would mean the viewport crosses the scrollback wrap-around.
-rw-r--r--grid.c28
1 files changed, 11 insertions, 17 deletions
diff --git a/grid.c b/grid.c
index f40803e1..f229effa 100644
--- a/grid.c
+++ b/grid.c
@@ -1016,23 +1016,6 @@ grid_resize_and_reflow(
new_grid[idx] = grid_row_alloc(new_cols, true);
}
- grid->view = view_follows ? grid->offset : viewport.row;
-
- /* If enlarging the window, the old viewport may be too far down,
- * with unallocated rows. Make sure this cannot happen */
- while (true) {
- int idx = (grid->view + new_screen_rows - 1) & (new_rows - 1);
- if (new_grid[idx] != NULL)
- break;
- grid->view--;
- if (grid->view < 0)
- grid->view += new_rows;
- }
- for (size_t r = 0; r < new_screen_rows; r++) {
- int UNUSED idx = (grid->view + r) & (new_rows - 1);
- xassert(new_grid[idx] != NULL);
- }
-
/* Free old grid (rows already free:d) */
free(grid->rows);
@@ -1040,6 +1023,17 @@ grid_resize_and_reflow(
grid->num_rows = new_rows;
grid->num_cols = new_cols;
+ /*
+ * Set new viewport, making sure it’s not too far down.
+ *
+ * This is done by using scrollback-start relative cooardinates,
+ * and bounding the new viewport to (grid_rows - screen_rows).
+ */
+ int sb_view = grid_row_abs_to_sb(
+ grid, new_screen_rows, view_follows ? grid->offset : viewport.row);
+ grid->view = grid_row_sb_to_abs(
+ grid, new_screen_rows, min(sb_view, new_rows - new_screen_rows));
+
/* Convert absolute coordinates to screen relative */
cursor.row -= grid->offset;
while (cursor.row < 0)