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

search: find_next(): pass an ‘end’ coord, instead of a row count

Browse source
This commit is contained in:
Daniel Eklöf 2022-04-18 12:31:07 +02:00
parent 4cdae0c05b
commit 9117ebebef
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

36
search.c
View file

@ -295,7 +295,7 @@ matches_cell(const struct terminal *term, const struct cell *cell, size_t search
static bool static bool
find_next(struct terminal *term, enum search_direction direction, find_next(struct terminal *term, enum search_direction direction,
struct coord abs_start, int row_count, struct range *match) struct coord abs_start, struct coord abs_end, struct range *match)
{ {
#define ROW_DEC(_r) ((_r) = ((_r) - 1 + grid->num_rows) & (grid->num_rows - 1)) #define ROW_DEC(_r) ((_r) = ((_r) - 1 + grid->num_rows) & (grid->num_rows - 1))
#define ROW_INC(_r) ((_r) = ((_r) + 1) & (grid->num_rows - 1)) #define ROW_INC(_r) ((_r) = ((_r) + 1) & (grid->num_rows - 1))
@ -305,6 +305,14 @@ find_next(struct terminal *term, enum search_direction direction,
int start_row = abs_start.row; int start_row = abs_start.row;
int start_col = abs_start.col; int start_col = abs_start.col;
/* TODO: fixme */
int row_count = backward
? abs_start.row - abs_end.row
: abs_end.row - abs_start.row;
if (row_count <= 0)
row_count += grid->num_rows;
for (size_t r = 0; for (size_t r = 0;
r < row_count; r < row_count;
backward ? ROW_DEC(start_row) : ROW_INC(start_row), r++) backward ? ROW_DEC(start_row) : ROW_INC(start_row), r++)
@ -413,8 +421,24 @@ search_find_next(struct terminal *term)
backward ? "backward" : "forward", start.row, start.col, backward ? "backward" : "forward", start.row, start.col,
grid->offset, grid->view); grid->offset, grid->view);
struct coord end = start;
if (backward) {
/* Search backards, until we reach the cell *after* current start */
if (++end.col >= term->cols) {
end.col = 0;
end.row++;
}
} else {
/* Search forward, until we reach the cell *before* current start */
if (--end.col < 0) {
end.col = term->cols - 1;
end.row += grid->num_rows - 1;
}
}
end.row &= grid->num_rows - 1;
struct range match; struct range match;
bool found = find_next(term, direction, start, grid->num_rows, &match); bool found = find_next(term, direction, start, end, &match);
if (found) { if (found) {
LOG_DBG("primary match found at %dx%d", LOG_DBG("primary match found at %dx%d",
@ -463,9 +487,11 @@ search_matches_next(struct search_match_iterator *iter)
struct coord abs_start = iter->start; struct coord abs_start = iter->start;
abs_start.row = grid_row_absolute_in_view(grid, abs_start.row); abs_start.row = grid_row_absolute_in_view(grid, abs_start.row);
found = find_next( struct coord abs_end = {
term, SEARCH_FORWARD, abs_start, term->cols - 1,
term->rows - iter->start.row, &match); grid_row_absolute_in_view(grid, term->rows - 1)};
found = find_next(term, SEARCH_FORWARD, abs_start, abs_end, &match);
} }
if (found) { if (found) {