mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-09-14 09:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix copy-output outside copy-mode now properly copies last output.

Browse Source
This commit is contained in:
Michael Grant
2026-09-05 20:47:21 +01:00
parent 081b79fd6e
commit 4cc9fc91fa
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
regress/output-commands.sh
View File

@@ -94,6 +94,11 @@ case "$all" in
esac
$TMUX send-keys -t :plain.0 -X cancel || exit 1
$TMUX new-window -d -n empty "printf '\\033]133;A\\007p\\$ \\033]133;B\\007echo\\033]133;C\\007one\\n\\033]133;D;0\\007\\033]133;A\\007p\\$ \\033]133;B\\007true\\033]133;C\\033]133;D;0\\007'; exec sleep 100" || exit 1
sleep 1
$TMUX copy-output -t :empty || exit 1
[ "$($TMUX show-buffer)" = one ] || exit 1
$TMUX copy-mode -t :plain || exit 1
$TMUX send-keys -t :plain.0 -X copy-output -a || exit 1
all=$($TMUX show-buffer)

39
window-copy.c
View File

@@ -4202,29 +4202,49 @@ window_copy_find_previous_output_range(struct screen *s, u_int *sx, u_int *sy,
{
struct grid *gd = s->grid;
struct grid_line *gl;
u_int y, total;
void *buf;
u_int start_x, start_y, end_x, end_y, y, total;
size_t len;
int found = 0, pending = 0;
total = gd->hsize + gd->sy;
for (y = 0; y < total; y++) {
gl = grid_get_line(gd, y);
if (gl->flags & GRID_LINE_START_OUTPUT) {
*sx = gl->osc133_data.out_start_col;
*sy = y;
start_x = gl->osc133_data.out_start_col;
start_y = y;
pending = 1;
}
if (pending && gl->flags & GRID_LINE_END_OUTPUT) {
*ex = gl->osc133_data.out_end_col;
*ey = y;
found = 1;
end_x = gl->osc133_data.out_end_col;
end_y = y;
buf = window_copy_get_grid_range(gd, start_x, start_y,
end_x, end_y, &len);
if (buf != NULL) {
free(buf);
*sx = start_x;
*sy = start_y;
*ex = end_x;
*ey = end_y;
found = 1;
}
pending = 0;
}
if (gl->flags & GRID_LINE_START_PROMPT)
pending = 0;
}
if (pending) {
window_copy_output_end(s, ex, ey);
return (1);
window_copy_output_end(s, &end_x, &end_y);
buf = window_copy_get_grid_range(gd, start_x, start_y, end_x,
end_y, &len);
if (buf != NULL) {
free(buf);
*sx = start_x;
*sy = start_y;
*ex = end_x;
*ey = end_y;
return (1);
}
}
return (found);
}
@@ -7618,8 +7638,7 @@ window_copy_copy_buffer(struct window_mode_entry *wme, const char *prefix,
if (set_clip &&
options_get_number(global_options, "set-clipboard") != 0) {
if (window_copy_line_numbers_active(wme) &&
(wp->flags & PANE_REDRAW)) {
if (wp->flags & PANE_REDRAW) {
/* Clear PANE_REDRAW so clipboard write not skipped. */
redraw = PANE_REDRAW;
wp->flags &= ~PANE_REDRAW;