mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-27 01:40:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

search/render: initial support for highlighting all visible matches

Browse source 
Before this patch, only the currently “selected” match was
highlighted (by having the “selected” attribute, and by *not* dimming
it, like the rest of the grid during a scrollback search).

With this patch, we now highlight matches within the viewport. While
searching, only the “primary” match is searched-for, and tracked.

Then, when rendering a frame, we find all “secondary” matches as
well. “holes” are added to the search-mode overlay by the means of an
search-match iterator.

The iterator’s text matching logic is *very* similar to what we do
when the search criteria has been updated, and we re-search the
scrollback. It should be possible to refactor this, and share code.
This commit is contained in:
Daniel Eklöf 2022-04-09 17:57:29 +02:00
parent 78fcdc5787
commit 90c91d6148
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 117 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
render.c
View file

@ -35,6 +35,7 @@
#include "hsl.h"
#include "ime.h"
#include "quirks.h"
#include "search.h"
#include "selection.h"
#include "shm.h"
#include "sixel.h"
@ -1539,17 +1540,30 @@ render_overlay(struct terminal *term)
pixman_region32_clear(see_through);
struct grid *grid = term->grid;
for (int r = 0; r < term->rows; r++) {
struct row *row = grid_row_in_view(grid, r);
int y = term->margins.top + r * term->cell_height;
for (int c = 0; c < term->cols; c++) {
if (row->cells[c].attrs.selected) {
int x = term->margins.left + c * term->cell_width;
pixman_region32_union_rect(
see_through, see_through,
x, y, term->cell_width, term->cell_height);
}
struct search_match_iterator iter = search_matches_new_iter(term);
for (struct range match = search_matches_next(&iter);
match.start.row >= 0;
match = search_matches_next(&iter))
{
int r = match.start.row;
int start_col = match.start.col;
const int end_row = match.end.row;
while (true) {
const int end_col =
r == end_row ? match.end.col : term->cols - 1;
int x = term->margins.left + start_col * term->cell_width;
int y = term->margins.top + r * term->cell_height;
int width = (end_col + 1 - start_col) * term->cell_width;
int height = 1 * term->cell_height;
pixman_region32_union_rect(
see_through, see_through, x, y, width, height);
if (++r > end_row)
break;
}
}