circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-06 17:49:52 +00:00
Code Issues Projects Releases Wiki Activity

Wrap long lines and limit empty-line reflow consumption to OSC 133 lines.

Browse Source 
Only consume an empty, unwrapped continuation line in grid_reflow_join
when it carries OSC 133 markers, so reflow of lines without markers is
unchanged. Also wrap lines over 80 columns and restore the original
PANE_REDRAW condition in window_copy_copy_buffer.
This commit is contained in:
Michael Grant
2026-10-06 17:57:30 +02:00
parent 11ccb77472
commit 2e8928dad6
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
grid.c
View File

@@ -1361,10 +1361,18 @@ grid_reflow_move_osc133(struct grid_line *to, struct grid_line *from,
{ {
struct osc133_data *src = &from->osc133_data; struct osc133_data *src = &from->osc133_data;
struct osc133_data *dst = &to->osc133_data; struct osc133_data *dst = &to->osc133_data;
u_short *src_col[] = { &src->prompt_col, &src->cmd_col, u_short *src_col[] = {
&src->out_start_col, &src->out_end_col }; &src->prompt_col,
u_short *dst_col[] = { &dst->prompt_col, &dst->cmd_col, &src->cmd_col,
&dst->out_start_col, &dst->out_end_col }; &src->out_start_col,
&src->out_end_col
};
u_short *dst_col[] = {
&dst->prompt_col,
&dst->cmd_col,
&dst->out_start_col,
&dst->out_end_col
};
u_int flags[] = { u_int flags[] = {
GRID_LINE_START_PROMPT|GRID_LINE_SECOND_PROMPT, GRID_LINE_START_PROMPT|GRID_LINE_SECOND_PROMPT,
GRID_LINE_START_COMMAND, GRID_LINE_START_COMMAND,
@@ -1435,6 +1443,9 @@ grid_reflow_join(struct grid *target, struct grid *gd, u_int sx, u_int yy,
if (~gd->linedata[line].flags & GRID_LINE_WRAPPED) if (~gd->linedata[line].flags & GRID_LINE_WRAPPED)
wrapped = 0; wrapped = 0;
if (gd->linedata[line].cellused == 0) { if (gd->linedata[line].cellused == 0) {
if (!wrapped && (gd->linedata[line].flags &
GRID_LINE_OSC133_FLAGS) == 0)
break;
from = &gd->linedata[line]; from = &gd->linedata[line];
want = 0; want = 0;
range.offset = at; range.offset = at;

17
window-copy.c
View File

@@ -130,8 +130,8 @@ static void *window_copy_get_grid_range(struct window_mode_entry *, u_int,
u_int, u_int, u_int, size_t *); u_int, u_int, u_int, size_t *);
static void window_copy_copy_buffer(struct window_mode_entry *, static void window_copy_copy_buffer(struct window_mode_entry *,
const char *, void *, size_t, int, int); const char *, void *, size_t, int, int);
static void window_copy_pipe_buffer(struct session *, const char *, void *, static void window_copy_pipe_buffer(struct session *, const char *,
size_t); void *, size_t);
static void window_copy_pipe(struct window_mode_entry *, static void window_copy_pipe(struct window_mode_entry *,
struct session *, const char *); struct session *, const char *);
static void window_copy_copy_pipe(struct window_mode_entry *, static void window_copy_copy_pipe(struct window_mode_entry *,
@@ -141,8 +141,8 @@ static void window_copy_copy_selection(struct window_mode_entry *,
const char *, int, int); const char *, int, int);
static void window_copy_append_selection(struct window_mode_entry *); static void window_copy_append_selection(struct window_mode_entry *);
static void window_copy_clear_selection(struct window_mode_entry *); static void window_copy_clear_selection(struct window_mode_entry *);
static u_int window_copy_copy_line_length(struct window_mode_entry *, u_int, static u_int window_copy_copy_line_length(struct window_mode_entry *,
int *); u_int, int *);
static void window_copy_copy_line(struct window_mode_entry *, char **, static void window_copy_copy_line(struct window_mode_entry *, char **,
size_t *, u_int, u_int, u_int); size_t *, u_int, u_int, u_int);
static int window_copy_in_set(struct window_mode_entry *, u_int, u_int, static int window_copy_in_set(struct window_mode_entry *, u_int, u_int,
@@ -1159,7 +1159,8 @@ window_copy_formats(struct window_mode_entry *wme, struct format_tree *ft)
format_add(ft, "selection_active", "1"); format_add(ft, "selection_active", "1");
else else
format_add(ft, "selection_active", "0"); format_add(ft, "selection_active", "0");
keys = options_get_number(wme->wp->window->options, "mode-keys"); keys = options_get_number(wme->wp->window->options,
"mode-keys");
if (keys == MODEKEY_VI || data->endselx != data->selx || if (keys == MODEKEY_VI || data->endselx != data->selx ||
data->endsely != data->sely) data->endsely != data->sely)
format_add(ft, "selection_present", "1"); format_add(ft, "selection_present", "1");
@@ -6601,7 +6602,8 @@ window_copy_copy_buffer(struct window_mode_entry *wme, const char *prefix,
if (set_clip && if (set_clip &&
options_get_number(global_options, "set-clipboard") != 0) { options_get_number(global_options, "set-clipboard") != 0) {
if (wp->flags & PANE_REDRAW) { if (window_copy_line_numbers_active(wme) &&
(wp->flags & PANE_REDRAW)) {
/* Clear PANE_REDRAW so clipboard write not skipped. */ /* Clear PANE_REDRAW so clipboard write not skipped. */
redraw = PANE_REDRAW; redraw = PANE_REDRAW;
wp->flags &= ~PANE_REDRAW; wp->flags &= ~PANE_REDRAW;
@@ -6732,7 +6734,8 @@ window_copy_copy_line_length(struct window_mode_entry *wme, u_int sy,
u_int length; u_int length;
int line_wrapped; int line_wrapped;
line_wrapped = (gl->flags & GRID_LINE_WRAPPED && gl->cellsize <= gd->sx); line_wrapped = (gl->flags & GRID_LINE_WRAPPED &&
gl->cellsize <= gd->sx);
if (wrapped != NULL) if (wrapped != NULL)
*wrapped = line_wrapped; *wrapped = line_wrapped;
if (line_wrapped) if (line_wrapped)