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

search: refactor: find_next(): pass start as a ‘coord’ struct

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

33
search.c
View file

@ -295,15 +295,15 @@ 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,
int start_row_abs, int start_col, int row_count, struct coord abs_start, int row_count, struct range *match)
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))
struct grid *grid = term->grid; struct grid *grid = term->grid;
const bool backward = direction == SEARCH_BACKWARD; const bool backward = direction == SEARCH_BACKWARD;
int start_row = start_row_abs; int start_row = abs_start.row;
int start_col = abs_start.col;
for (size_t r = 0; for (size_t r = 0;
r < row_count; r < row_count;
@ -391,32 +391,30 @@ search_find_next(struct terminal *term)
return; return;
} }
int start_row = term->search.match.row; struct coord start = term->search.match;
int start_col = term->search.match.col;
size_t len = term->search.match_len; size_t len = term->search.match_len;
xassert((len == 0 && start_row == -1 && start_col == -1) || xassert((len == 0 && start.row == -1 && start.col == -1) ||
(len > 0 && start_row >= 0 && start_col >= 0)); (len > 0 && start.row >= 0 && start.col >= 0));
if (len == 0) { if (len == 0) {
if (backward) { if (backward) {
start_row = grid_row_absolute_in_view(grid, term->rows - 1); start.row = grid_row_absolute_in_view(grid, term->rows - 1);
start_col = term->cols - 1; start.col = term->cols - 1;
} else { } else {
start_row = grid_row_absolute_in_view(grid, 0); start.row = grid_row_absolute_in_view(grid, 0);
start_col = 0; start.col = 0;
} }
} }
LOG_DBG( LOG_DBG(
"update: %s: starting at row=%d col=%d " "update: %s: starting at row=%d col=%d "
"(offset = %d, view = %d)", "(offset = %d, view = %d)",
backward ? "backward" : "forward", start_row, start_col, backward ? "backward" : "forward", start.row, start.col,
grid->offset, grid->view); grid->offset, grid->view);
struct range match; struct range match;
bool found = find_next( bool found = find_next(term, direction, start, grid->num_rows, &match);
term, direction, start_row, start_col, grid->num_rows, &match);
if (found) { if (found) {
LOG_DBG("primary match found at %dx%d", LOG_DBG("primary match found at %dx%d",
@ -462,10 +460,11 @@ search_matches_next(struct search_match_iterator *iter)
match = term->selection.coords; match = term->selection.coords;
found = true; found = true;
} else { } else {
struct coord abs_start = iter->start;
abs_start.row = grid_row_absolute_in_view(grid, abs_start.row);
found = find_next( found = find_next(
term, SEARCH_FORWARD, term, SEARCH_FORWARD, abs_start,
grid_row_absolute_in_view(grid, iter->start.row),
iter->start.col,
term->rows - iter->start.row, &match); term->rows - iter->start.row, &match);
} }