circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-06 02:48:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2016-02-05 12:01:10 +00:00
commit 7669cfb330
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
window-copy.c
View File

@ -1775,11 +1775,13 @@ void
window_copy_cursor_left(struct window_pane *wp) window_copy_cursor_left(struct window_pane *wp)
{ {
struct window_copy_mode_data *data = wp->modedata; struct window_copy_mode_data *data = wp->modedata;
u_int py;
if (data->cx == 0) { py = screen_hsize(data->backing) + data->cy - data->oy;
if (data->cx == 0 && py > 0) {
window_copy_cursor_up(wp, 0); window_copy_cursor_up(wp, 0);
window_copy_cursor_end_of_line(wp); window_copy_cursor_end_of_line(wp);
} else { } else if (data->cx > 0) {
window_copy_update_cursor(wp, data->cx - 1, data->cy); window_copy_update_cursor(wp, data->cx - 1, data->cy);
if (window_copy_update_selection(wp, 1)) if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1); window_copy_redraw_lines(wp, data->cy, 1);
@ -1790,19 +1792,20 @@ void
window_copy_cursor_right(struct window_pane *wp) window_copy_cursor_right(struct window_pane *wp)
{ {
struct window_copy_mode_data *data = wp->modedata; struct window_copy_mode_data *data = wp->modedata;
u_int px, py; u_int px, py, yy;
py = screen_hsize(data->backing) + data->cy - data->oy;
yy = screen_hsize(data->backing) + screen_size_y(data->backing) - 1;
if (data->screen.sel.flag && data->rectflag) if (data->screen.sel.flag && data->rectflag)
px = screen_size_x(&data->screen); px = screen_size_x(&data->screen);
else { else {
py = screen_hsize(data->backing) + data->cy - data->oy;
px = window_copy_find_length(wp, py); px = window_copy_find_length(wp, py);
} }
if (data->cx >= px) { if (data->cx >= px && py < yy) {
window_copy_cursor_start_of_line(wp); window_copy_cursor_start_of_line(wp);
window_copy_cursor_down(wp, 0); window_copy_cursor_down(wp, 0);
} else { } else if (data->cx < px) {
window_copy_update_cursor(wp, data->cx + 1, data->cy); window_copy_update_cursor(wp, data->cx + 1, data->cy);
if (window_copy_update_selection(wp, 1)) if (window_copy_update_selection(wp, 1))
window_copy_redraw_lines(wp, data->cy, 1); window_copy_redraw_lines(wp, data->cy, 1);