circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/2463/head
Thomas Adam 2020-11-10 10:01:22 +00:00
parent 3eb1519bd7 bbab5b7a30
commit e94bd5ccff
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
window-copy.c
View File

@ -4526,10 +4526,11 @@ window_copy_cursor_previous_word_pos(struct window_mode_entry *wme,
const char *separators, int already, u_int *ppx, u_int *ppy) const char *separators, int already, u_int *ppx, u_int *ppy)
{ {
struct window_copy_mode_data *data = wme->data; struct window_copy_mode_data *data = wme->data;
u_int px, py; u_int px, py, hsize;
hsize = screen_hsize(data->backing);
px = data->cx; px = data->cx;
py = screen_hsize(data->backing) + data->cy - data->oy; py = hsize + data->cy - data->oy;
/* Move back to the previous word character. */ /* Move back to the previous word character. */
if (already || window_copy_in_set(wme, px, py, separators)) { if (already || window_copy_in_set(wme, px, py, separators)) {
@ -4542,9 +4543,7 @@ window_copy_cursor_previous_word_pos(struct window_mode_entry *wme,
} else { } else {
if (py == 0 || if (py == 0 ||
(data->cy == 0 && (data->cy == 0 &&
(screen_hsize(data->backing) == 0 || (hsize == 0 || data->oy > hsize - 1)))
data->oy >=
screen_hsize(data->backing) - 1)))
goto out; goto out;
py--; py--;
@ -4573,10 +4572,11 @@ window_copy_cursor_previous_word(struct window_mode_entry *wme,
const char *separators, int already) const char *separators, int already)
{ {
struct window_copy_mode_data *data = wme->data; struct window_copy_mode_data *data = wme->data;
u_int px, py; u_int px, py, hsize;
hsize = screen_hsize(data->backing);
px = data->cx; px = data->cx;
py = screen_hsize(data->backing) + data->cy - data->oy; py = hsize + data->cy - data->oy;
/* Move back to the previous word character. */ /* Move back to the previous word character. */
if (already || window_copy_in_set(wme, px, py, separators)) { if (already || window_copy_in_set(wme, px, py, separators)) {
@ -4588,14 +4588,11 @@ window_copy_cursor_previous_word(struct window_mode_entry *wme,
break; break;
} else { } else {
if (data->cy == 0 && if (data->cy == 0 &&
(screen_hsize(data->backing) == 0 || (hsize == 0 || data->oy > hsize - 1))
data->oy >=
screen_hsize(data->backing) - 1))
goto out; goto out;
window_copy_cursor_up(wme, 0); window_copy_cursor_up(wme, 0);
py = screen_hsize(data->backing) + data->cy - py = hsize + data->cy - data->oy;
data->oy;
px = window_copy_find_length(wme, py); px = window_copy_find_length(wme, py);
/* Stop if separator at EOL. */ /* Stop if separator at EOL. */