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

Revert "selections - live within scrollback bounds per line" 

This reverts commit 5ccf988abf.
This commit is contained in:
Carsten Haitzler 2019-08-26 17:09:08 +01:00
parent fe261d387a
commit 295e72c41f
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/termiointernals.c
View File

@ -21,8 +21,6 @@ termio_selection_get(Termio *sd,
{ {
int x, y; int x, y;
if (c1x < 0) c1x = 0;
if (c2x < 0) c2x = 0;
termpty_backlog_lock(); termpty_backlog_lock();
for (y = c1y; y <= c2y; y++) for (y = c1y; y <= c2y; y++)
{ {
@ -48,8 +46,6 @@ termio_selection_get(Termio *sd,
} }
start_x = c1x; start_x = c1x;
end_x = (c2x >= w) ? w - 1 : c2x; end_x = (c2x >= w) ? w - 1 : c2x;
if (start_x >= w) start_x = w - 1;
if (end_x >= w) end_x = w - 1;
if (c1y != c2y) if (c1y != c2y)
{ {
if (y == c1y) end_x = w - 1; if (y == c1y) end_x = w - 1;
@ -217,8 +213,6 @@ _sel_codepoints_get(const Termio *sd,
} \ } \
} while (0) } while (0)
if (c1x < 0) c1x = 0;
if (c2x < 0) c2x = 0;
termpty_backlog_lock(); termpty_backlog_lock();
for (y = c1y; y <= c2y; y++) for (y = c1y; y <= c2y; y++)
{ {
@ -334,8 +328,6 @@ termio_internal_get_selection(Termio *sd, size_t *lenp)
start_y = sd->pty->selection.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; end_y = sd->pty->selection.end.y;
if (start_x < 0) start_x = 0;
if (end_x < 0) end_x = 0;
if (!sd->pty->selection.is_top_to_bottom) if (!sd->pty->selection.is_top_to_bottom)
{ {
@ -795,7 +787,6 @@ _trim_sel_word(Termio *sd)
if (!cells) if (!cells)
return; return;
if (start >= w) start = w - 1;
while (start < w && _to_trim(cells[start].codepoint, EINA_TRUE)) while (start < w && _to_trim(cells[start].codepoint, EINA_TRUE))
start++; start++;
@ -825,7 +816,6 @@ _trim_sel_word(Termio *sd)
if (!cells) if (!cells)
return; return;
if (end >= w) end = w - 1;
while (end >= 0 && _to_trim(cells[end].codepoint, EINA_FALSE)) while (end >= 0 && _to_trim(cells[end].codepoint, EINA_FALSE))
end--; end--;
@ -884,7 +874,10 @@ _sel_word(Termio *sd, int cx, int cy)
{ {
goto end; goto end;
} }
if (x >= w) x = w - 1; if (x >= w)
{
x = w - 1;
}
/* To the left and up */ /* To the left and up */
do do
@ -937,7 +930,6 @@ _sel_word(Termio *sd, int cx, int cy)
} }
} }
x = cx; x = cx;
if (x >= w) x = w - 1;
/* To the right and down */ /* To the right and down */
do do
@ -1336,8 +1328,6 @@ termio_selection_dbl_fix(Termio *sd)
termpty_backlog_lock(); termpty_backlog_lock();
cells = termpty_cellrow_get(sd->pty, end_y - sd->scroll, &w); cells = termpty_cellrow_get(sd->pty, end_y - sd->scroll, &w);
if (start_x >= w) start_x = w - 1;
if (end_x >= w) end_x = w - 1;
if (cells) if (cells)
{ {
// if sel2 after sel1 // if sel2 after sel1
@ -1364,8 +1354,6 @@ termio_selection_dbl_fix(Termio *sd)
} }
} }
cells = termpty_cellrow_get(sd->pty, start_y - sd->scroll, &w); cells = termpty_cellrow_get(sd->pty, start_y - sd->scroll, &w);
if (start_x >= w) start_x = w - 1;
if (end_x >= w) end_x = w - 1;
if (cells) if (cells)
{ {
// if sel2 after sel1 // if sel2 after sel1