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

Add an option to disable unwrapping lines for searching, from

Browse Source 
meanderingprogrammer at gmail dot com, GitHub issue 3975.
This commit is contained in:
nicm 2024-05-14 07:40:39 +00:00
parent fb37d52dde
commit 4c928dce74
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
options-table.c
View File

@ -384,6 +384,14 @@ const struct options_table_entry options_table[] = {
.text = "Maximum number of commands to keep in history." .text = "Maximum number of commands to keep in history."
}, },
{ .name = "search-wrapped-lines",
.type = OPTIONS_TABLE_FLAG,
.scope = OPTIONS_TABLE_SERVER,
.default_num = 1,
.text = "Whether to include full wrapped lines when searching for "
"text in copy mode."
},
{ .name = "set-clipboard", { .name = "set-clipboard",
.type = OPTIONS_TABLE_CHOICE, .type = OPTIONS_TABLE_CHOICE,
.scope = OPTIONS_TABLE_SERVER, .scope = OPTIONS_TABLE_SERVER,

8
tmux.1
View File

@ -3795,6 +3795,14 @@ each client.
.It Ic prompt-history-limit Ar number .It Ic prompt-history-limit Ar number
Set the number of history items to save in the history file for each type of Set the number of history items to save in the history file for each type of
command prompt. command prompt.
.It Xo Ic search-wrapped-lines
.Op Ic on | off
.Xc
Defines how
.Nm
handles wrapped lines when searching in copy mode.
When disabled, lines are truncated and searching is faster, but matches may be
missed.
.It Xo Ic set-clipboard .It Xo Ic set-clipboard
.Op Ic on | external | off .Op Ic on | external | off
.Xc .Xc

12
window-copy.c
View File

@ -3615,11 +3615,13 @@ window_copy_search_jump(struct window_mode_entry *wme, struct grid *gd,
int direction, int regex) int direction, int regex)
{ {
u_int i, px, sx, ssize = 1; u_int i, px, sx, ssize = 1;
int found = 0, cflags = REG_EXTENDED; int wrapped, found = 0, cflags = REG_EXTENDED;
char *sbuf; char *sbuf;
regex_t reg; regex_t reg;
struct grid_line *gl; struct grid_line *gl;
wrapped = options_get_number(global_options, "search-wrapped-lines");
if (regex) { if (regex) {
sbuf = xmalloc(ssize); sbuf = xmalloc(ssize);
sbuf[0] = '\0'; sbuf[0] = '\0';
@ -3636,7 +3638,9 @@ window_copy_search_jump(struct window_mode_entry *wme, struct grid *gd,
if (direction) { if (direction) {
for (i = fy; i <= endline; i++) { for (i = fy; i <= endline; i++) {
gl = grid_get_line(gd, i); gl = grid_get_line(gd, i);
if (i != endline && gl->flags & GRID_LINE_WRAPPED) if (!wrapped &&
i != endline &&
gl->flags & GRID_LINE_WRAPPED)
continue; continue;
if (regex) { if (regex) {
found = window_copy_search_lr_regex(gd, found = window_copy_search_lr_regex(gd,
@ -3652,7 +3656,9 @@ window_copy_search_jump(struct window_mode_entry *wme, struct grid *gd,
} else { } else {
for (i = fy + 1; endline < i; i--) { for (i = fy + 1; endline < i; i--) {
gl = grid_get_line(gd, i - 1); gl = grid_get_line(gd, i - 1);
if (i != endline && gl->flags & GRID_LINE_WRAPPED) if (!wrapped &&
i != endline &&
gl->flags & GRID_LINE_WRAPPED)
continue; continue;
if (regex) { if (regex) {
found = window_copy_search_rl_regex(gd, found = window_copy_search_rl_regex(gd,