mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly wrap search in copy mode even if at the very top left, GitHub

Browse Source 
issue 1845.
This commit is contained in:
nicm
2019-08-01 14:31:39 +00:00
parent 3d660b0023
commit c4744620af
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
window-copy.c
View File

@@ -60,8 +60,8 @@ static int window_copy_search_rl(struct grid *, struct grid *, u_int *,
static int window_copy_search_marks(struct window_mode_entry *, static int window_copy_search_marks(struct window_mode_entry *,
struct screen *); struct screen *);
static void window_copy_clear_marks(struct window_mode_entry *); static void window_copy_clear_marks(struct window_mode_entry *);
static void window_copy_move_left(struct screen *, u_int *, u_int *); static void window_copy_move_left(struct screen *, u_int *, u_int *, int);
static void window_copy_move_right(struct screen *, u_int *, u_int *); static void window_copy_move_right(struct screen *, u_int *, u_int *, int);
static int window_copy_is_lowercase(const char *); static int window_copy_is_lowercase(const char *);
static int window_copy_search_jump(struct window_mode_entry *, static int window_copy_search_jump(struct window_mode_entry *,
struct grid *, struct grid *, u_int, u_int, u_int, int, int, struct grid *, struct grid *, u_int, u_int, u_int, int, int,
@@ -2047,11 +2047,16 @@ window_copy_search_rl(struct grid *gd,
} }
static void static void
window_copy_move_left(struct screen *s, u_int *fx, u_int *fy) window_copy_move_left(struct screen *s, u_int *fx, u_int *fy, int wrapflag)
{ {
if (*fx == 0) { /* left */ if (*fx == 0) { /* left */
if (*fy == 0) /* top */ if (*fy == 0) { /* top */
if (wrapflag) {
*fx = screen_size_x(s) - 1;
*fy = screen_hsize(s) + screen_size_y(s);
}
return; return;
}
*fx = screen_size_x(s) - 1; *fx = screen_size_x(s) - 1;
*fy = *fy - 1; *fy = *fy - 1;
} else } else
@@ -2059,11 +2064,16 @@ window_copy_move_left(struct screen *s, u_int *fx, u_int *fy)
} }
static void static void
window_copy_move_right(struct screen *s, u_int *fx, u_int *fy) window_copy_move_right(struct screen *s, u_int *fx, u_int *fy, int wrapflag)
{ {
if (*fx == screen_size_x(s) - 1) { /* right */ if (*fx == screen_size_x(s) - 1) { /* right */
if (*fy == screen_hsize(s) + screen_size_y(s)) /* bottom */ if (*fy == screen_hsize(s) + screen_size_y(s)) { /* bottom */
if (wrapflag) {
*fx = 0;
*fy = 0;
}
return; return;
}
*fx = 0; *fx = 0;
*fy = *fy + 1; *fy = *fy + 1;
} else } else
@@ -2155,18 +2165,16 @@ window_copy_search(struct window_mode_entry *wme, int direction)
screen_write_nputs(&ctx, -1, &grid_default_cell, "%s", data->searchstr); screen_write_nputs(&ctx, -1, &grid_default_cell, "%s", data->searchstr);
screen_write_stop(&ctx); screen_write_stop(&ctx);
if (direction)
window_copy_move_right(s, &fx, &fy);
else
window_copy_move_left(s, &fx, &fy);
wrapflag = options_get_number(wp->window->options, "wrap-search"); wrapflag = options_get_number(wp->window->options, "wrap-search");
cis = window_copy_is_lowercase(data->searchstr); cis = window_copy_is_lowercase(data->searchstr);
if (direction) if (direction) {
window_copy_move_right(s, &fx, &fy, wrapflag);
endline = gd->hsize + gd->sy - 1; endline = gd->hsize + gd->sy - 1;
else } else {
window_copy_move_left(s, &fx, &fy, wrapflag);
endline = 0; endline = 0;
}
found = window_copy_search_jump(wme, gd, ss.grid, fx, fy, endline, cis, found = window_copy_search_jump(wme, gd, ss.grid, fx, fy, endline, cis,
wrapflag, direction); wrapflag, direction);