aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2017-08-29 22:06:22 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2017-08-29 22:06:22 +0100
commit72488b526b487b09ea474936b1519ac87922d1a9 (patch)
tree65d7ebad182e83dd7597cb8a523da253b6400c43
parent566b9623b3253102360c102c95afb51467b433cd (diff)
parent5fec6c598e6ab0fe8f140383a01dbdbb9e909938 (diff)
downloadrtmux-72488b526b487b09ea474936b1519ac87922d1a9.tar.gz
rtmux-72488b526b487b09ea474936b1519ac87922d1a9.tar.bz2
rtmux-72488b526b487b09ea474936b1519ac87922d1a9.zip
Merge branch 'master' into 2.6-rc
-rw-r--r--window-copy.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/window-copy.c b/window-copy.c
index cd77a89c..4bd9d127 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -1508,10 +1508,17 @@ window_copy_update_selection(struct window_pane *wp, int may_redraw)
* of lines, and redraw just past that in both directions
*/
cy = data->cy;
- if (sy < cy)
- window_copy_redraw_lines(wp, sy, cy - sy + 1);
- else
- window_copy_redraw_lines(wp, cy, sy - cy + 1);
+ if (data->cursordrag == CURSORDRAG_ENDSEL) {
+ if (sy < cy)
+ window_copy_redraw_lines(wp, sy, cy - sy + 1);
+ else
+ window_copy_redraw_lines(wp, cy, sy - cy + 1);
+ } else {
+ if (endsy < cy)
+ window_copy_redraw_lines(wp, endsy, cy - endsy + 1);
+ else
+ window_copy_redraw_lines(wp, cy, endsy - cy + 1);
+ }
}
return (1);