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

selection: find_word_boundary_{left,right}: try to make the code more readable

Browse source
This commit is contained in:
Daniel Eklöf 2021-01-03 14:33:35 +01:00
parent 3863a61ba6
commit c851aae9d6
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
selection.c
View file

@ -259,7 +259,9 @@ find_word_boundary_left(struct terminal *term, struct coord *pos,
bool initial_is_space = c == 0 || iswspace(c);
bool initial_is_delim =
c != 0 && !isword(c, spaces_only, term->conf->word_delimiters);
!initial_is_space && !isword(c, spaces_only, term->conf->word_delimiters);
bool initial_is_word =
c != 0 && isword(c, spaces_only, term->conf->word_delimiters);
while (true) {
int next_col = pos->col - 1;
@ -289,19 +291,17 @@ find_word_boundary_left(struct terminal *term, struct coord *pos,
}
bool is_space = c == 0 || iswspace(c);
bool is_delim =
!is_space && !isword(c, spaces_only, term->conf->word_delimiters);
bool is_word =
c != 0 && isword(c, spaces_only, term->conf->word_delimiters);
if (initial_is_space && !is_space)
break;
if (!initial_is_space) {
bool is_word =
c != 0 && isword(c, spaces_only, term->conf->word_delimiters);
if ((initial_is_delim && (is_word || is_space)) ||
(!initial_is_delim && !is_word))
{
break;
}
}
if (initial_is_delim && !is_delim)
break;
if (initial_is_word && !is_word)
break;
pos->col = next_col;
pos->row = next_row;
@ -331,7 +331,9 @@ find_word_boundary_right(struct terminal *term, struct coord *pos,
bool initial_is_space = c == 0 || iswspace(c);
bool initial_is_delim =
c != 0 && !isword(c, spaces_only, term->conf->word_delimiters);
!initial_is_space && !isword(c, spaces_only, term->conf->word_delimiters);
bool initial_is_word =
c != 0 && isword(c, spaces_only, term->conf->word_delimiters);
while (true) {
int next_col = pos->col + 1;
@ -363,19 +365,17 @@ find_word_boundary_right(struct terminal *term, struct coord *pos,
}
bool is_space = c == 0 || iswspace(c);
bool is_delim =
!is_space && !isword(c, spaces_only, term->conf->word_delimiters);
bool is_word =
c != 0 && isword(c, spaces_only, term->conf->word_delimiters);
if (initial_is_space && !is_space)
break;
if (!initial_is_space) {
bool is_word =
c != 0 && isword(c, spaces_only, term->conf->word_delimiters);
if ((initial_is_delim && (is_word || is_space)) ||
(!initial_is_delim && !is_word))
{
break;
}
}
if (initial_is_delim && !is_delim)
break;
if (initial_is_word && !is_word)
break;
pos->col = next_col;
pos->row = next_row;