enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests Projects Releases Wiki Activity

termiointernals: rewrite _sel_word_to() + update tests

This commit is contained in:
Boris Faure 2019-02-25 22:02:11 +01:00
parent 48496b2eb5
commit 1e5825832f
2 changed files with 179 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
src/bin/termiointernals.c
View File

@ -407,8 +407,8 @@ _sel_line(Termio *sd, int cy)
for (;;) for (;;)
{ {
cells = termpty_cellrow_get(sd->pty, y - 1, &w); cells = termpty_cellrow_get(sd->pty, y - 1, &w);
if (!cells || !cells[w-1].att.autowrapped) break; if (!cells || !cells[w-1].att.autowrapped)
break;
y--; y--;
} }
sd->pty->selection.start.y = y; sd->pty->selection.start.y = y;
@ -418,9 +418,11 @@ _sel_line(Termio *sd, int cy)
for (;;) for (;;)
{ {
cells = termpty_cellrow_get(sd->pty, y, &w); cells = termpty_cellrow_get(sd->pty, y, &w);
if (!cells || !cells[w-1].att.autowrapped) break; if (!cells || !cells[w-1].att.autowrapped)
{
sd->pty->selection.end.x = w - 1; sd->pty->selection.end.x = w - 1;
break;
}
y++; y++;
} }
/* Right trim */ /* Right trim */
@ -964,20 +966,20 @@ _sel_word(Termio *sd, int cx, int cy)
} }
static void static void
_sel_word_to(Termio *sd, int cx, int cy, Eina_Bool extend) _sel_word_to(Termio *sd, int cx, int cy)
{ {
int start_x, start_y, end_x, end_y, orig_x, orig_y, int start_x, start_y, end_x, end_y, orig_x, orig_y,
c_start_x, c_start_y, c_end_x, c_end_y, to_start_x, to_start_y, to_end_x, to_end_y,
orig_start_x, orig_start_y, orig_end_x, orig_end_y; orig_start_x, orig_start_y, orig_end_y;
EINA_SAFETY_ON_NULL_RETURN(sd); EINA_SAFETY_ON_NULL_RETURN(sd);
orig_x = sd->pty->selection.orig.x; orig_x = sd->pty->selection.orig.x;
orig_y = sd->pty->selection.orig.y; orig_y = sd->pty->selection.orig.y;
start_x = sd->pty->selection.start.x; orig_start_x = start_x = sd->pty->selection.start.x;
start_y = sd->pty->selection.start.y; orig_start_y = start_y = sd->pty->selection.start.y;
end_x = sd->pty->selection.end.x; end_x = sd->pty->selection.end.x;
end_y = sd->pty->selection.end.y; orig_end_y = end_y = sd->pty->selection.end.y;
if (!sd->pty->selection.is_top_to_bottom) if (!sd->pty->selection.is_top_to_bottom)
{ {
@ -986,149 +988,132 @@ _sel_word_to(Termio *sd, int cx, int cy, Eina_Bool extend)
} }
_sel_word(sd, cx, cy); _sel_word(sd, cx, cy);
c_start_x = sd->pty->selection.start.x; to_start_x = sd->pty->selection.start.x;
c_start_y = sd->pty->selection.start.y; to_start_y = sd->pty->selection.start.y;
c_end_x = sd->pty->selection.end.x; to_end_x = sd->pty->selection.end.x;
c_end_y = sd->pty->selection.end.y; to_end_y = sd->pty->selection.end.y;
_sel_word(sd, orig_x, orig_y);
orig_start_x = sd->pty->selection.start.x;
orig_start_y = sd->pty->selection.start.y;
orig_end_x = sd->pty->selection.end.x;
orig_end_y = sd->pty->selection.end.y;
if (sd->pty->selection.is_box) if (sd->pty->selection.is_box)
{ {
if (extend) /* special case: kind of line selection */
if (to_start_y != to_end_y)
{ {
/* special case: kind of line selection */ start_x = 0;
if (c_start_y != c_end_y) end_x = sd->grid.w - 1;
if (start_y <= cy && cy <= end_y )
{ {
start_x = 0; start_y = MIN(to_start_y, orig_start_y);
end_x = sd->grid.w - 1; end_y = MAX(to_end_y, orig_end_y);
if (start_y <= cy && cy <= end_y )
{
start_y = MIN(c_start_y, orig_start_y);
end_y = MAX(c_end_y, orig_end_y);
}
else
{
if (c_end_y > end_y)
{
orig_y = start_y;
end_y = c_end_y;
}
if (c_start_y < start_y)
{
orig_y = end_y;
start_y = c_start_y;
}
}
goto end;
}
if ((start_y <= cy && cy <= end_y ) &&
(start_x <= cx && cx <= end_x ))
{
start_x = MIN(c_start_x, orig_start_x);
end_x = MAX(c_end_x, orig_end_x);
start_y = MIN(c_start_y, orig_start_y);
end_y = MAX(c_end_y, orig_end_y);
} }
else else
{ {
if (c_end_x > end_x) if (to_end_y > end_y)
{
orig_x = start_x;
end_x = c_end_x;
}
if (c_start_x < start_x)
{
orig_x = end_x;
start_x = c_start_x;
}
if (c_end_y > end_y)
{ {
orig_y = start_y; orig_y = start_y;
end_y = c_end_y; end_y = to_end_y;
} }
if (c_start_y < start_y) if (to_start_y < start_y)
{ {
orig_y = end_y; orig_y = end_y;
start_y = c_start_y; start_y = to_start_y;
} }
end_x = MAX(c_end_x, end_x); }
start_y = MIN(c_start_y, start_y); goto end;
end_y = MAX(c_end_y, end_y); }
if ((start_y <= cy && cy <= end_y ) &&
(start_x <= cx && cx <= end_x ))
{
sd->pty->selection.is_top_to_bottom = EINA_TRUE;
if (to_start_y < orig_y)
{
start_y = to_start_y;
end_y = orig_y;
}
if (to_start_y >= orig_y)
{
start_y = orig_y;
end_y = to_end_y;
}
if (to_start_x < orig_x)
{
start_x = to_start_x;
end_x = orig_x;
}
if (to_start_x >= orig_x)
{
start_x = orig_x;
end_x = to_end_x;
} }
} }
else else
{ {
/* special case: kind of line selection */ if (to_end_x > end_x)
if (c_start_y != c_end_y || orig_start_y != orig_end_y)
{ {
start_x = 0; orig_x = start_x;
end_x = sd->grid.w - 1; end_x = to_end_x;
start_y = MIN(c_start_y, orig_start_y);
end_y = MAX(c_end_y, orig_end_y);
goto end;
} }
if (to_start_x < start_x)
start_x = MIN(c_start_x, orig_start_x); {
end_x = MAX(c_end_x, orig_end_x); orig_x = end_x;
start_y = MIN(c_start_y, orig_start_y); start_x = to_start_x;
end_y = MAX(c_end_y, orig_end_y); }
if (to_end_y > end_y)
{
orig_y = start_y;
end_y = to_end_y;
}
if (to_start_y < start_y)
{
orig_y = end_y;
start_y = to_start_y;
}
end_x = MAX(to_end_x, end_x);
start_y = MIN(to_start_y, start_y);
end_y = MAX(to_end_y, end_y);
sd->pty->selection.is_top_to_bottom = EINA_TRUE;
} }
} }
else else
{ {
if (c_start_y < start_y || sd->pty->selection.is_top_to_bottom = EINA_TRUE;
(c_start_y == start_y && /* Change start */
c_start_x < start_x)) if (to_start_y < start_y ||
(to_start_y == start_y &&
to_start_x <= start_x))
{ {
/* orig is at bottom */ /* orig is at bottom */
if (extend) orig_x = end_x;
{ orig_y = end_y;
orig_x = end_x; start_x = to_start_x;
orig_y = end_y; start_y = to_start_y;
}
sd->pty->selection.is_top_to_bottom = EINA_FALSE;
end_x = c_start_x;
end_y = c_start_y;
start_x = orig_end_x;
start_y = orig_end_y;
} }
else if (c_end_y > end_y || /* change end */
(c_end_y == end_y && c_end_x >= end_x)) else if (to_end_y > end_y ||
(to_end_y == end_y && to_end_x >= end_x))
{ {
if (extend) orig_x = start_x;
{ orig_y = start_y;
orig_x = start_x; end_x = to_end_x;
orig_y = start_y; end_y = to_end_y;
}
sd->pty->selection.is_top_to_bottom = EINA_TRUE;
start_x = orig_start_x;
start_y = orig_start_y;
end_x = c_end_x;
end_y = c_end_y;
} }
else else
{ {
if (c_start_y < orig_start_y || /* within */
(c_start_y == orig_start_y && c_start_x <= orig_start_x)) if (to_start_y < orig_start_y ||
(to_start_y == orig_start_y && to_start_x <= orig_start_x))
{ {
sd->pty->selection.is_top_to_bottom = EINA_FALSE; orig_x = start_x;
start_x = orig_end_x; orig_y = start_y;
start_y = orig_end_y; end_x = to_end_x;
end_x = c_start_x; end_y = to_end_y;
end_y = c_start_y;
} }
else else
{ {
sd->pty->selection.is_top_to_bottom = EINA_TRUE; sd->pty->selection.is_top_to_bottom = EINA_TRUE;
start_x = orig_start_x; orig_x = end_x;
start_y = orig_start_y; orig_y = end_y;
end_x = c_end_x; start_x = to_start_x;
end_y = c_end_y; start_y = to_start_y;
} }
} }
} }
@ -1664,7 +1649,7 @@ termio_internal_mouse_down(Termio *sd,
} }
if (modifiers.shift && sd->pty->selection.is_active) if (modifiers.shift && sd->pty->selection.is_active)
{ {
_sel_word_to(sd, cx, cy - sd->scroll, EINA_TRUE); _sel_word_to(sd, cx, cy - sd->scroll);
} }
else else
{ {
@ -1923,7 +1908,14 @@ termio_internal_mouse_up(Termio *sd,
} }
else if (sd->pty->selection.by_word) else if (sd->pty->selection.by_word)
{ {
_sel_word_to(sd, cx, cy - sd->scroll, modifiers.shift); if (modifiers.shift)
{
_sel_word_to(sd, cx, cy - sd->scroll);
}
else
{
_sel_word(sd, cx, cy - sd->scroll);
}
} }
else else
{ {
@ -2090,7 +2082,7 @@ termio_internal_mouse_move(Termio *sd,
} }
else if (sd->pty->selection.by_word) else if (sd->pty->selection.by_word)
{ {
_sel_word_to(sd, cx, cy - sd->scroll, EINA_FALSE); _sel_word_to(sd, cx, cy - sd->scroll);
} }
else else
{ {

166
tests/selection_to_word.sh
View File

@ -20,8 +20,11 @@ printf "%s\r\n%s\r\n%s" "$TEXT" "$TEXT" "$TEXT"
# force render # force render
printf '\033}tr\0' printf '\033}tr\0'
setup_top_down()
## sel "top-down" to down {
# remove selection
printf '\033}td;0;0;1;0;0\0\033}tu;0;0;1;0;0\0'
printf '\033}tr\0\033}tn\0'
# mouse down to start selection # mouse down to start selection
printf '\033}td;395;148;1;0;0\0' printf '\033}td;395;148;1;0;0\0'
# mouse move # mouse move
@ -32,6 +35,10 @@ printf '\033}tu;25;160;1;0;0\0'
printf '\033}tr\0' printf '\033}tr\0'
# selection is # selection is
printf '\033}tsthe name of charity and good\0' printf '\033}tsthe name of charity and good\0'
}
## sel "top-down" to down
setup_top_down
# To # To
# mouse move # mouse move
printf '\033}tm;210;178;0\0' printf '\033}tm;210;178;0\0'
@ -40,22 +47,10 @@ printf '\033}td;210;178;1;2;1\0'
printf '\033}tu;210;178;1;2;1\0' printf '\033}tu;210;178;1;2;1\0'
# selection is # selection is
printf '\033}tsthe name of charity and good will, shepherds the weak through the valley of darkness, for he is truly his brother\047s keeper and the finder\0' printf '\033}tsthe name of charity and good will, shepherds the weak through the valley of darkness, for he is truly his brother\047s keeper and the finder\0'
# remove selection
printf '\033}td;0;0;1;0;0\0\033}tu;0;0;1;0;0\0'
printf '\033}tr\0\033}tn\0'
## sel "top-down" to up ## sel "top-down" to up
# mouse down to start selection setup_top_down
printf '\033}td;395;148;1;0;0\0'
# mouse move
printf '\033}tm;25;160;0\0'
# mouse up
printf '\033}tu;25;160;1;0;0\0'
# force render
printf '\033}tr\0'
# selection is
printf '\033}tsthe name of charity and good\0'
# To # To
# mouse move # mouse move
printf '\033}tm;500;128;0\0' printf '\033}tm;500;128;0\0'
@ -64,93 +59,9 @@ printf '\033}td;500;128;1;2;1\0'
printf '\033}tu;500;128;1;2;1\0' printf '\033}tu;500;128;1;2;1\0'
# selection is # selection is
printf '\033}tsof the selfish and the tyranny of evil men. Blessed is he who, in the name of charity and good\0' printf '\033}tsof the selfish and the tyranny of evil men. Blessed is he who, in the name of charity and good\0'
# remove selection
printf '\033}td;0;0;1;0;0\0\033}tu;0;0;1;0;0\0'
printf '\033}tr\0\033}tn\0'
## sel "top_down" to within selection ## sel "top_down" to within selection
# mouse down to start selection setup_top_down
printf '\033}td;395;148;1;0;0\0'
# mouse move
printf '\033}tm;25;160;0\0'
# mouse up
printf '\033}tu;25;160;1;0;0\0'
# force render
printf '\033}tr\0'
# selection is
printf '\033}tsthe name of charity and good\0'
# To
# mouse move
printf '\033}tm;500;150;0\0'
# mouse double-click with shift
printf '\033}td;500;150;1;2;1\0'
printf '\033}tu;500;150;1;2;1\0'
# selection is
printf '\033}tsthe name of charity\0'
# remove selection
printf '\033}td;0;0;1;0;0\0\033}tu;0;0;1;0;0\0'
printf '\033}tr\0\033}tn\0'
## sel "down-top" to down
# mouse down to start selection
printf '\033}td;25;160;1;0;0\0'
# mouse move
printf '\033}tm;395;148;0\0'
# mouse up
printf '\033}tu;395;148;1;0;0\0'
# force render
printf '\033}tr\0'
# selection is
printf '\033}tsthe name of charity and good\0'
# To
# mouse move
printf '\033}tm;210;178;0\0'
# mouse double-click with shift
printf '\033}td;210;178;1;2;1\0'
printf '\033}tu;210;178;1;2;1\0'
# selection is
printf '\033}tsthe name of charity and good will, shepherds the weak through the valley of darkness, for he is truly his brother\047s keeper and the finder\0'
# remove selection
printf '\033}td;0;0;1;0;0\0\033}tu;0;0;1;0;0\0'
printf '\033}tr\0\033}tn\0'
## sel "down-top" to up
# mouse down to start selection
printf '\033}td;25;160;1;0;0\0'
# mouse move
printf '\033}tm;395;148;0\0'
# mouse up
printf '\033}tu;395;148;1;0;0\0'
# force render
printf '\033}tr\0'
# selection is
printf '\033}tsthe name of charity and good\0'
# To
# mouse move
printf '\033}tm;500;128;0\0'
# mouse double-click with shift
printf '\033}td;500;128;1;2;1\0'
printf '\033}tu;500;128;1;2;1\0'
# selection is
printf '\033}tsof the selfish and the tyranny of evil men. Blessed is he who, in the name of charity and good\0'
# remove selection
printf '\033}td;0;0;1;0;0\0\033}tu;0;0;1;0;0\0'
printf '\033}tr\0\033}tn\0'
## sel "down-top" to within
# mouse down to start selection
printf '\033}td;25;160;1;0;0\0'
# mouse move
printf '\033}tm;395;148;0\0'
# mouse up
printf '\033}tu;395;148;1;0;0\0'
# force render
printf '\033}tr\0'
# selection is
printf '\033}tsthe name of charity and good\0'
# To # To
# mouse move # mouse move
printf '\033}tm;500;150;0\0' printf '\033}tm;500;150;0\0'
@ -159,6 +70,61 @@ printf '\033}td;500;150;1;2;1\0'
printf '\033}tu;500;150;1;2;1\0' printf '\033}tu;500;150;1;2;1\0'
# selection is # selection is
printf '\033}tscharity and good\0' printf '\033}tscharity and good\0'
setup_down_top()
{
# remove selection
printf '\033}td;0;0;1;0;0\0\033}tu;0;0;1;0;0\0'
printf '\033}tr\0\033}tn\0'
# mouse down to start selection
printf '\033}td;25;160;1;0;0\0'
# mouse move
printf '\033}tm;395;148;0\0'
# mouse up
printf '\033}tu;395;148;1;0;0\0'
# force render
printf '\033}tr\0'
# selection is
printf '\033}tsthe name of charity and good\0'
}
## sel "down-top" to down
setup_down_top
# To
# mouse move
printf '\033}tm;210;178;0\0'
# mouse double-click with shift
printf '\033}td;210;178;1;2;1\0'
printf '\033}tu;210;178;1;2;1\0'
# selection is
printf '\033}tsthe name of charity and good will, shepherds the weak through the valley of darkness, for he is truly his brother\047s keeper and the finder\0'
## sel "down-top" to up
setup_down_top
# To
# mouse move
printf '\033}tm;500;128;0\0'
# mouse double-click with shift
printf '\033}td;500;128;1;2;1\0'
printf '\033}tu;500;128;1;2;1\0'
# selection is
printf '\033}tsof the selfish and the tyranny of evil men. Blessed is he who, in the name of charity and good\0'
## sel "down-top" to within
setup_down_top
# To
# mouse move
printf '\033}tm;500;150;0\0'
# mouse double-click with shift
printf '\033}td;500;150;1;2;1\0'
printf '\033}tu;500;150;1;2;1\0'
# selection is
printf '\033}tsthe name of charity\0'
# remove selection # remove selection
printf '\033}td;0;0;1;0;0\0\033}tu;0;0;1;0;0\0' printf '\033}td;0;0;1;0;0\0\033}tu;0;0;1;0;0\0'
printf '\033}tr\0\033}tn\0' printf '\033}tr\0\033}tn\0'