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

grid: reflow: comments

Browse source
This commit is contained in:
Daniel Eklöf 2021-05-25 19:40:10 +02:00
parent 5325ea042d
commit ac97f20f99
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
grid.c
View file

@ -549,6 +549,13 @@ grid_resize_and_reflow(
bool tp_break = false; bool tp_break = false;
bool uri_break = false; bool uri_break = false;
/*
* Set end-coordinate for this chunk, by finding the next
* point-of-interrest on this row.
*
* If there are no more tracking points, or URI ranges,
* the end-coordinate will be at the end of the row,
*/
if (range != NULL) { if (range != NULL) {
int uri_col = (range->start >= start ? range->start : range->end) + 1; int uri_col = (range->start >= start ? range->start : range->end) + 1;
@ -572,22 +579,36 @@ grid_resize_and_reflow(
xassert(cols > 0); xassert(cols > 0);
xassert(start + cols <= old_cols); xassert(start + cols <= old_cols);
/*
* Copy the row chunk to the new grid. Note that there may
* be fewer cells left on the new row than what we have in
* the chunk. I.e. the chunk may have to be split up into
* multiple memcpy:ies.
*/
for (int count = cols, from = start; count > 0;) { for (int count = cols, from = start; count > 0;) {
xassert(new_col_idx <= new_cols); xassert(new_col_idx <= new_cols);
int new_row_cells_left = new_cols - new_col_idx; int new_row_cells_left = new_cols - new_col_idx;
/* Row full, emit newline and get a new, fresh, row */
if (new_row_cells_left <= 0) { if (new_row_cells_left <= 0) {
line_wrap(); line_wrap();
new_row_cells_left = new_cols; new_row_cells_left = new_cols;
} }
/* Number of cells we can copy */
int amount = min(count, new_row_cells_left); int amount = min(count, new_row_cells_left);
xassert(amount > 0); xassert(amount > 0);
/*
* If we’re going to reach the end of the new row, we
* need to make sure we don’t end in the middle of a
* multi-column character.
*/
int spacers = 0; int spacers = 0;
if (new_col_idx + amount >= new_cols) { if (new_col_idx + amount >= new_cols) {
/* /*
* The cell *after* the last cell is a CELL_SPACER * While the cell *after* the last cell is a CELL_SPACER
* *
* This means we have a multi-column character * This means we have a multi-column character
* that doesn’t fit on the current row. We need to * that doesn’t fit on the current row. We need to