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

selection: expose find_word_boundary_{left,right}()

Browse source
This commit is contained in:
Daniel Eklöf 2021-03-28 21:03:53 +02:00
parent e415f85829
commit eab874eb06
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
selection.c
View file

@ -227,9 +227,9 @@ selection_to_text(const struct terminal *term)
return extract_finish(ctx, &text, NULL) ? text : NULL; return extract_finish(ctx, &text, NULL) ? text : NULL;
} }
static void void
find_word_boundary_left(struct terminal *term, struct coord *pos, selection_find_word_boundary_left(struct terminal *term, struct coord *pos,
bool spaces_only) bool spaces_only)
{ {
const struct row *r = grid_row_in_view(term->grid, pos->row); const struct row *r = grid_row_in_view(term->grid, pos->row);
wchar_t c = r->cells[pos->col].wc; wchar_t c = r->cells[pos->col].wc;
@ -299,9 +299,9 @@ find_word_boundary_left(struct terminal *term, struct coord *pos,
} }
} }
static void void
find_word_boundary_right(struct terminal *term, struct coord *pos, selection_find_word_boundary_right(struct terminal *term, struct coord *pos,
bool spaces_only) bool spaces_only)
{ {
const struct row *r = grid_row_in_view(term->grid, pos->row); const struct row *r = grid_row_in_view(term->grid, pos->row);
wchar_t c = r->cells[pos->col].wc; wchar_t c = r->cells[pos->col].wc;
@ -403,8 +403,8 @@ selection_start(struct terminal *term, int col, int row,
case SELECTION_WORD_WISE: { case SELECTION_WORD_WISE: {
struct coord start = {col, row}, end = {col, row}; struct coord start = {col, row}, end = {col, row};
find_word_boundary_left(term, &start, spaces_only); selection_find_word_boundary_left(term, &start, spaces_only);
find_word_boundary_right(term, &end, spaces_only); selection_find_word_boundary_right(term, &end, spaces_only);
term->selection.start = (struct coord){ term->selection.start = (struct coord){
start.col, term->grid->view + start.row}; start.col, term->grid->view + start.row};
@ -694,14 +694,16 @@ selection_update(struct terminal *term, int col, int row)
switch (term->selection.direction) { switch (term->selection.direction) {
case SELECTION_LEFT: { case SELECTION_LEFT: {
struct coord end = {col, row}; struct coord end = {col, row};
find_word_boundary_left(term, &end, term->selection.spaces_only); selection_find_word_boundary_left(
term, &end, term->selection.spaces_only);
new_end = (struct coord){end.col, term->grid->view + end.row}; new_end = (struct coord){end.col, term->grid->view + end.row};
break; break;
} }
case SELECTION_RIGHT: { case SELECTION_RIGHT: {
struct coord end = {col, row}; struct coord end = {col, row};
find_word_boundary_right(term, &end, term->selection.spaces_only); selection_find_word_boundary_right(
term, &end, term->selection.spaces_only);
new_end = (struct coord){end.col, term->grid->view + end.row}; new_end = (struct coord){end.col, term->grid->view + end.row};
break; break;
} }
@ -840,8 +842,10 @@ selection_extend_normal(struct terminal *term, int col, int row,
struct coord pivot_start = {new_start.col, new_start.row - term->grid->view}; struct coord pivot_start = {new_start.col, new_start.row - term->grid->view};
struct coord pivot_end = pivot_start; struct coord pivot_end = pivot_start;
find_word_boundary_left(term, &pivot_start, term->selection.spaces_only); selection_find_word_boundary_left(
find_word_boundary_right(term, &pivot_end, term->selection.spaces_only); term, &pivot_start, term->selection.spaces_only);
selection_find_word_boundary_right(
term, &pivot_end, term->selection.spaces_only);
term->selection.pivot.start = term->selection.pivot.start =
(struct coord){pivot_start.col, term->grid->view + pivot_start.row}; (struct coord){pivot_start.col, term->grid->view + pivot_start.row};

5
selection.h
View file

@ -74,3 +74,8 @@ void selection_start_scroll_timer(
struct terminal *term, int interval_ns, struct terminal *term, int interval_ns,
enum selection_scroll_direction direction, int col); enum selection_scroll_direction direction, int col);
void selection_stop_scroll_timer(struct terminal *term); void selection_stop_scroll_timer(struct terminal *term);
void selection_find_word_boundary_left(
struct terminal *term, struct coord *pos, bool spaces_only);
void selection_find_word_boundary_right(
struct terminal *term, struct coord *pos, bool spaces_only);