diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-06-14 15:51:09 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-06-14 15:51:09 +0100 |
| commit | 5e9757b30b8de13028149caa2683a7d76f231790 (patch) | |
| tree | 5df34efc0213aa839e5ba6ddefa1193309cff383 /window-copy.c | |
| parent | 4bbf941436765201825c8d675f45b0cb70eb19d3 (diff) | |
| parent | d1d3bbb458b50ec455d65774d5c6669546b3b4ca (diff) | |
| download | rtmux-5e9757b30b8de13028149caa2683a7d76f231790.tar.gz rtmux-5e9757b30b8de13028149caa2683a7d76f231790.tar.bz2 rtmux-5e9757b30b8de13028149caa2683a7d76f231790.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/window-copy.c b/window-copy.c index d81073bf..a7cb5dfa 100644 --- a/window-copy.c +++ b/window-copy.c @@ -3027,8 +3027,8 @@ window_copy_cursor_up(struct window_mode_entry *wme, int scroll_only) if (data->lineflag == LINE_SEL_LEFT_RIGHT && oy == data->sely) window_copy_other_end(wme); - data->cx = data->lastcx; if (scroll_only || data->cy == 0) { + data->cx = data->lastcx; window_copy_scroll_down(wme, 1); if (scroll_only) { if (data->cy == screen_size_y(s) - 1) @@ -3037,7 +3037,7 @@ window_copy_cursor_up(struct window_mode_entry *wme, int scroll_only) window_copy_redraw_lines(wme, data->cy, 2); } } else { - window_copy_update_cursor(wme, data->cx, data->cy - 1); + window_copy_update_cursor(wme, data->lastcx, data->cy - 1); if (window_copy_update_selection(wme, 1)) { if (data->cy == screen_size_y(s) - 1) window_copy_redraw_lines(wme, data->cy, 1); @@ -3077,13 +3077,13 @@ window_copy_cursor_down(struct window_mode_entry *wme, int scroll_only) if (data->lineflag == LINE_SEL_RIGHT_LEFT && oy == data->endsely) window_copy_other_end(wme); - data->cx = data->lastcx; if (scroll_only || data->cy == screen_size_y(s) - 1) { + data->cx = data->lastcx; window_copy_scroll_up(wme, 1); if (scroll_only && data->cy > 0) window_copy_redraw_lines(wme, data->cy - 1, 2); } else { - window_copy_update_cursor(wme, data->cx, data->cy + 1); + window_copy_update_cursor(wme, data->lastcx, data->cy + 1); if (window_copy_update_selection(wme, 1)) window_copy_redraw_lines(wme, data->cy - 1, 2); } |