From 4c928dce746d64456bd7bedb8b909279a1bef3ec Mon Sep 17 00:00:00 2001 From: nicm Date: Tue, 14 May 2024 07:40:39 +0000 Subject: [PATCH] Add an option to disable unwrapping lines for searching, from meanderingprogrammer at gmail dot com, GitHub issue 3975. --- options-table.c | 8 ++++++++ tmux.1 | 8 ++++++++ window-copy.c | 12 +++++++++--- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/options-table.c b/options-table.c index fe460473..939bcb69 100644 --- a/options-table.c +++ b/options-table.c @@ -384,6 +384,14 @@ const struct options_table_entry options_table[] = { .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", .type = OPTIONS_TABLE_CHOICE, .scope = OPTIONS_TABLE_SERVER, diff --git a/tmux.1 b/tmux.1 index a5102216..08aa26c7 100644 --- a/tmux.1 +++ b/tmux.1 @@ -3795,6 +3795,14 @@ each client. .It Ic prompt-history-limit Ar number Set the number of history items to save in the history file for each type of 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 .Op Ic on | external | off .Xc diff --git a/window-copy.c b/window-copy.c index a1f18476..9db17c3d 100644 --- a/window-copy.c +++ b/window-copy.c @@ -3615,11 +3615,13 @@ window_copy_search_jump(struct window_mode_entry *wme, struct grid *gd, int direction, int regex) { u_int i, px, sx, ssize = 1; - int found = 0, cflags = REG_EXTENDED; + int wrapped, found = 0, cflags = REG_EXTENDED; char *sbuf; regex_t reg; struct grid_line *gl; + wrapped = options_get_number(global_options, "search-wrapped-lines"); + if (regex) { sbuf = xmalloc(ssize); sbuf[0] = '\0'; @@ -3636,7 +3638,9 @@ window_copy_search_jump(struct window_mode_entry *wme, struct grid *gd, if (direction) { for (i = fy; i <= endline; 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; if (regex) { found = window_copy_search_lr_regex(gd, @@ -3652,7 +3656,9 @@ window_copy_search_jump(struct window_mode_entry *wme, struct grid *gd, } else { for (i = fy + 1; endline < i; i--) { 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; if (regex) { found = window_copy_search_rl_regex(gd,