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

Tweak previous to check the wrapped flag and stop if not set.

Browse Source
This commit is contained in:
nicm 2019-12-11 18:30:29 +00:00
parent ab630f72ed
commit 64fb7e472a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
window-copy.c
View File

@ -2082,8 +2082,9 @@ static int
window_copy_search_lr(struct grid *gd, window_copy_search_lr(struct grid *gd,
struct grid *sgd, u_int *ppx, u_int py, u_int first, u_int last, int cis) struct grid *sgd, u_int *ppx, u_int py, u_int first, u_int last, int cis)
{ {
u_int ax, bx, px, pywrap, endline; u_int ax, bx, px, pywrap, endline;
int matched; int matched;
struct grid_line *gl;
endline = gd->hsize + gd->sy - 1; endline = gd->hsize + gd->sy - 1;
for (ax = first; ax < last; ax++) { for (ax = first; ax < last; ax++) {
@ -2092,6 +2093,9 @@ window_copy_search_lr(struct grid *gd,
pywrap = py; pywrap = py;
/* Wrap line. */ /* Wrap line. */
while (px >= gd->sx && pywrap < endline) { while (px >= gd->sx && pywrap < endline) {
gl = grid_get_line(gd, pywrap);
if (~gl->flags & GRID_LINE_WRAPPED)
break;
px -= gd->sx; px -= gd->sx;
pywrap++; pywrap++;
} }
@ -2115,8 +2119,9 @@ static int
window_copy_search_rl(struct grid *gd, window_copy_search_rl(struct grid *gd,
struct grid *sgd, u_int *ppx, u_int py, u_int first, u_int last, int cis) struct grid *sgd, u_int *ppx, u_int py, u_int first, u_int last, int cis)
{ {
u_int ax, bx, px, pywrap, endline; u_int ax, bx, px, pywrap, endline;
int matched; int matched;
struct grid_line *gl;
endline = gd->hsize + gd->sy - 1; endline = gd->hsize + gd->sy - 1;
for (ax = last; ax > first; ax--) { for (ax = last; ax > first; ax--) {
@ -2125,6 +2130,9 @@ window_copy_search_rl(struct grid *gd,
pywrap = py; pywrap = py;
/* Wrap line. */ /* Wrap line. */
while (px >= gd->sx && pywrap < endline) { while (px >= gd->sx && pywrap < endline) {
gl = grid_get_line(gd, pywrap);
if (~gl->flags & GRID_LINE_WRAPPED)
break;
px -= gd->sx; px -= gd->sx;
pywrap++; pywrap++;
} }