mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-09 10:06:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

add vimode cursor as tracking point to reflow

Browse source
This commit is contained in:
Piotr Kocia 2025-03-31 18:31:14 +02:00
parent a168a78087
commit 2609206c98
2 changed files with 49 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
grid.c
View file

@ -859,7 +859,6 @@ grid_resize_and_reflow(
saved_cursor.row += grid->offset;
saved_cursor.row &= old_rows - 1;
// TODO (kociap): add the vimode cursor and selection start.
size_t tp_count =
tracking_points_count +
1 + /* cursor */

64
render.c
View file

@ -4349,19 +4349,36 @@ delayed_reflow_of_normal_grid(struct terminal *term)
xassert(term->interactive_resizing.new_rows > 0);
struct coord *const tracking_points[] = {
&term->selection.coords.start,
&term->selection.coords.end,
};
int tracking_points_length = 0;
struct coord * tracking_points[3];
if(term->selection.coords.end.row >= 0) {
tracking_points[tracking_points_length] = &term->selection.coords.start;
tracking_points[tracking_points_length + 1] = &term->selection.coords.end;
tracking_points_length += 2;
}
struct coord vimode_cursor = term->vimode.cursor;
vimode_cursor.row = grid_row_absolute(term->grid, term->vimode.cursor.row);
if(term->vimode.active) {
tracking_points[tracking_points_length] = &vimode_cursor;
tracking_points_length += 1;
}
/* Reflow the original (since before the resize was started) grid,
* to the *current* dimensions */
grid_resize_and_reflow(
term->interactive_resizing.grid, term,
term->interactive_resizing.new_rows, term->normal.num_cols,
term->interactive_resizing.old_screen_rows, term->rows,
term->selection.coords.end.row >= 0 ? ALEN(tracking_points) : 0,
tracking_points);
term->interactive_resizing.grid, term,
term->interactive_resizing.new_rows, term->normal.num_cols,
term->interactive_resizing.old_screen_rows, term->rows,
tracking_points_length, tracking_points);
// Change vimode cursor to offset relative coordinates.
vimode_cursor.row -= term->grid->offset;
if(vimode_cursor.row >= term->rows) {
vimode_cursor.row -= term->grid->num_rows;
}
term->vimode.cursor = vimode_cursor;
/* Replace the current, truncated, "normal" grid with the
* correctly reflowed one */
@ -4856,15 +4873,32 @@ render_resize(struct terminal *term, int width, int height, uint8_t opts)
term_ptmx_resume(term);
}
struct coord *const tracking_points[] = {
&term->selection.coords.start,
&term->selection.coords.end,
};
int tracking_points_length = 0;
struct coord * tracking_points[3];
if(term->selection.coords.end.row >= 0) {
tracking_points[tracking_points_length] = &term->selection.coords.start;
tracking_points[tracking_points_length + 1] = &term->selection.coords.end;
tracking_points_length += 2;
}
struct coord vimode_cursor = term->vimode.cursor;
vimode_cursor.row = grid_row_absolute(term->grid, term->vimode.cursor.row);
if(term->vimode.active) {
tracking_points[tracking_points_length] = &vimode_cursor;
tracking_points_length += 1;
}
grid_resize_and_reflow(
&term->normal, term, new_normal_grid_rows, new_cols, old_normal_rows, new_rows,
term->selection.coords.end.row >= 0 ? ALEN(tracking_points) : 0,
tracking_points);
tracking_points_length, tracking_points);
// Change vimode cursor to offset relative coordinates.
vimode_cursor.row -= term->grid->offset;
if(vimode_cursor.row >= new_rows) {
vimode_cursor.row -= term->grid->num_rows;
}
term->vimode.cursor = vimode_cursor;
}
grid_resize_without_reflow(