mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-26 07:57:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

grid: reflow: generalize cursor coordinate translation

Browse source 
Define a list of "tracking points" - coordinates that should be
translated while reflowing.

Add the cursor coordinates to this list.

When a coordinate have been translated, it is removed from the
list. This means we don't have to create a copy of the 'cursor'
coordinate struct.
This commit is contained in:
Daniel Eklöf 2020-04-17 21:00:37 +02:00
parent 87fc0cfb85
commit e5521ff79a
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 41 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

67
grid.c
View file

@ -79,15 +79,17 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
/* Turn cursor coordinates into grid absolute coordinates */ /* Turn cursor coordinates into grid absolute coordinates */
struct coord cursor = grid->cursor.point; struct coord cursor = grid->cursor.point;
struct coord new_cursor = {};
cursor.row += grid->offset; cursor.row += grid->offset;
cursor.row &= old_rows - 1; cursor.row &= old_rows - 1;
struct coord saved_cursor = grid->saved_cursor.point; struct coord saved_cursor = grid->saved_cursor.point;
struct coord new_saved_cursor = {};
saved_cursor.row += grid->offset; saved_cursor.row += grid->offset;
saved_cursor.row &= old_rows - 1; saved_cursor.row &= old_rows - 1;
tll(struct coord *) tracking_points = tll_init();
tll_push_back(tracking_points, &cursor);
tll_push_back(tracking_points, &saved_cursor);
/* /*
* Walk the old grid * Walk the old grid
*/ */
@ -148,17 +150,23 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
/* Walk current line of the old grid */ /* Walk current line of the old grid */
for (int c = 0; c < old_cols; c++) { for (int c = 0; c < old_cols; c++) {
bool has_cursor = cursor.row == old_row_idx && cursor.col == c;
bool has_saved_cursor
= saved_cursor.row == old_row_idx && saved_cursor.col == c;
if (old_row->cells[c].wc == 0 && !has_cursor && !has_saved_cursor) { /* Check if this cell is one of the tracked cells */
assert(!has_cursor); bool is_tracking_point = false;
assert(!has_saved_cursor); tll_foreach(tracking_points, it) {
if (it->item->row == old_row_idx && it->item->col == c) {
is_tracking_point = true;
break;
}
}
if (old_row->cells[c].wc == 0 && !is_tracking_point) {
empty_count++; empty_count++;
continue; continue;
} }
/* Allow left-adjusted and right-adjusted text, with empty
* cells in between, to be "pushed together" */
int old_cols_left = old_cols - c; int old_cols_left = old_cols - c;
int cols_needed = empty_count + old_cols_left; int cols_needed = empty_count + old_cols_left;
int new_cols_left = new_cols - new_col_idx; int new_cols_left = new_cols - new_col_idx;
@ -192,11 +200,16 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
new_row->cells[new_col_idx] = *old_cell; new_row->cells[new_col_idx] = *old_cell;
new_row->cells[new_col_idx].attrs.clean = 1; new_row->cells[new_col_idx].attrs.clean = 1;
if (has_cursor) /* Translate tracking point(s) */
new_cursor = (struct coord){new_col_idx, new_row_idx}; if (is_tracking_point && i >= empty_count) {
if (has_saved_cursor) tll_foreach(tracking_points, it) {
new_saved_cursor = (struct coord){new_col_idx, new_row_idx}; if (it->item->row == old_row_idx && it->item->col == c) {
it->item->row = new_row_idx;
it->item->col = new_col_idx;
tll_remove(tracking_points, it);
}
}
}
new_col_idx++; new_col_idx++;
} }
@ -231,28 +244,28 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
grid_row_free(old_grid[r]); grid_row_free(old_grid[r]);
free(grid->rows); free(grid->rows);
grid->cur_row = new_grid[new_cursor.row]; grid->cur_row = new_grid[cursor.row];
grid->rows = new_grid; grid->rows = new_grid;
grid->num_rows = new_rows; grid->num_rows = new_rows;
grid->num_cols = new_cols; grid->num_cols = new_cols;
/* Convert absolute coordinates to screen relative */ /* Convert absolute coordinates to screen relative */
new_cursor.row -= grid->offset; cursor.row -= grid->offset;
while (new_cursor.row < 0) while (cursor.row < 0)
new_cursor.row += grid->num_rows; cursor.row += grid->num_rows;
assert(new_cursor.row >= 0); assert(cursor.row >= 0);
assert(new_cursor.row < grid->num_rows); assert(cursor.row < grid->num_rows);
new_saved_cursor.row -= grid->offset; saved_cursor.row -= grid->offset;
while (new_saved_cursor.row < 0) while (saved_cursor.row < 0)
new_saved_cursor.row += grid->num_rows; saved_cursor.row += grid->num_rows;
assert(new_saved_cursor.row >= 0); assert(saved_cursor.row >= 0);
assert(new_saved_cursor.row < grid->num_rows); assert(saved_cursor.row < grid->num_rows);
grid->cursor.point = new_cursor; grid->cursor.point = cursor;
grid->saved_cursor.point = new_saved_cursor; grid->saved_cursor.point = saved_cursor;
grid->cursor.lcf = false; grid->cursor.lcf = false;
grid->saved_cursor.lcf = false; grid->saved_cursor.lcf = false;
@ -266,4 +279,6 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
tll_foreach(new_sixels, it) tll_foreach(new_sixels, it)
tll_push_back(grid->sixel_images, it->item); tll_push_back(grid->sixel_images, it->item);
tll_free(new_sixels); tll_free(new_sixels);
tll_free(tracking_points);
} }