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

search: refactor: search_update_selection() takes a ‘struct range’

Browse source
This commit is contained in:
Daniel Eklöf 2022-04-16 20:23:15 +02:00
parent bd089c845f
commit 074bbf767e
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

37
search.c
View file

@ -173,11 +173,14 @@ search_selection_cancelled(struct terminal *term)
} }
static void static void
search_update_selection(struct terminal *term, search_update_selection(struct terminal *term, const struct range *match)
int start_row, int start_col,
int end_row, int end_col)
{ {
struct grid *grid = term->grid; struct grid *grid = term->grid;
int start_row = match->start.row;
int start_col = match->start.col;
int end_row = match->end.row;
int end_col = match->end.col;
bool move_viewport = true; bool move_viewport = true;
int view_end = (grid->view + term->rows - 1) & (grid->num_rows - 1); int view_end = (grid->view + term->rows - 1) & (grid->num_rows - 1);
@ -223,34 +226,29 @@ search_update_selection(struct terminal *term,
term_damage_view(term); term_damage_view(term);
} }
#if 0
/* Selection endpoint is inclusive */ /* Selection endpoint is inclusive */
if (--end_col < 0) { if (--end_col < 0) {
end_col = term->cols - 1; end_col = term->cols - 1;
end_row--; end_row--;
} }
#endif
/* Begin a new selection if the start coords changed */ /* Begin a new selection if the start coords changed */
if (start_row != term->search.match.row || if (start_row != term->search.match.row ||
start_col != term->search.match.col) start_col != term->search.match.col)
{ {
int selection_row = start_row - grid->view; int selection_row = start_row - grid->view + grid->num_rows;
while (selection_row < 0) selection_row &= grid->num_rows - 1;
selection_row += grid->num_rows;
xassert(selection_row >= 0 &&
selection_row < grid->num_rows);
selection_start( selection_start(
term, start_col, selection_row, SELECTION_CHAR_WISE, false); term, start_col, selection_row, SELECTION_CHAR_WISE, false);
} }
/* Update selection endpoint */ /* Update selection endpoint */
{ {
int selection_row = end_row - grid->view; int selection_row = end_row - grid->view + grid->num_rows;
while (selection_row < 0) selection_row &= grid->num_rows - 1;
selection_row += grid->num_rows;
xassert(selection_row >= 0 &&
selection_row < grid->num_rows);
selection_update(term, end_col, selection_row); selection_update(term, end_col, selection_row);
} }
} }
@ -414,10 +412,11 @@ search_find_next(struct terminal *term)
term, direction, start_row, start_col, grid->num_rows, &match); term, direction, start_row, start_col, grid->num_rows, &match);
if (found) { if (found) {
search_update_selection( search_update_selection(term, &match);
term, #if 0
match.start.row, match.start.col, match.start.row, match.start.col,
match.end.row, match.end.col + 1); match.end.row, match.end.col + 1);
#endif
term->search.match = match.start; term->search.match = match.start;
term->search.match_len = term->search.len; term->search.match_len = term->search.len;
} else { } else {
@ -600,9 +599,9 @@ search_match_to_end_of_word(struct terminal *term, bool spaces_only)
/* search_update_selection() expected end coordinate to be *exclusive* */ /* search_update_selection() expected end coordinate to be *exclusive* */
newline(new_end); newline(new_end);
search_update_selection(
term, term->search.match.row, term->search.match.col, struct range match = {.start = term->search.match, .end = new_end};
new_end.row, new_end.col); search_update_selection(term, &match);
term->search.match_len = term->search.len; term->search.match_len = term->search.len;