circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-12 19:39:04 +00:00
Code Issues Projects Releases Wiki Activity

Check whether cursor is at start or end when copying rectangular

Browse Source 
selections, from tb@.
This commit is contained in:
nicm 2018-04-23 13:46:34 +00:00
parent 9f39652d87
commit 4bf6f2706e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
window-copy.c
View File

@ -1548,7 +1548,7 @@ window_copy_get_selection(struct window_pane *wp, size_t *len)
char *buf; char *buf;
size_t off; size_t off;
u_int i, xx, yy, sx, sy, ex, ey, ey_last; u_int i, xx, yy, sx, sy, ex, ey, ey_last;
u_int firstsx, lastex, restex, restsx; u_int firstsx, lastex, restex, restsx, selx;
int keys; int keys;
if (!s->sel.flag && s->sel.lineflag == LINE_SEL_NONE) if (!s->sel.flag && s->sel.lineflag == LINE_SEL_NONE)
@ -1599,7 +1599,11 @@ window_copy_get_selection(struct window_pane *wp, size_t *len)
* Need to ignore the column with the cursor in it, which for * Need to ignore the column with the cursor in it, which for
* rectangular copy means knowing which side the cursor is on. * rectangular copy means knowing which side the cursor is on.
*/ */
if (data->selx < data->cx) { if (data->cursordrag == CURSORDRAG_ENDSEL)
selx = data->selx;
else
selx = data->endselx;
if (selx < data->cx) {
/* Selection start is on the left. */ /* Selection start is on the left. */
if (keys == MODEKEY_EMACS) { if (keys == MODEKEY_EMACS) {
lastex = data->cx; lastex = data->cx;
@ -1609,12 +1613,12 @@ window_copy_get_selection(struct window_pane *wp, size_t *len)
lastex = data->cx + 1; lastex = data->cx + 1;
restex = data->cx + 1; restex = data->cx + 1;
} }
firstsx = data->selx; firstsx = selx;
restsx = data->selx; restsx = selx;
} else { } else {
/* Cursor is on the left. */ /* Cursor is on the left. */
lastex = data->selx + 1; lastex = selx + 1;
restex = data->selx + 1; restex = selx + 1;
firstsx = data->cx; firstsx = data->cx;
restsx = data->cx; restsx = data->cx;
} }