circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-13 14:24:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix OSC 133 output ranges after history loss and trim vi selection endpoints.

Browse Source
This commit is contained in:
Michael Grant
2026-10-06 14:21:59 +02:00
parent a87f75f3fe
commit ae54d9c54a
3 changed files with 103 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
window-copy.c
View File

@@ -1625,7 +1625,7 @@ window_copy_cmd_select_output(struct window_copy_cmd_state *cs)
struct grid_reader gr;
void *buf;
size_t len;
u_int sx, sy, ex, ey, total;
u_int sx, sy, ex, ey, total, last;
int all = args_has(cs->wargs, 'a');
if (all) {
@@ -1648,6 +1648,9 @@ window_copy_cmd_select_output(struct window_copy_cmd_state *cs)
window_copy_start_selection(wme);
if (options_get_number(wme->wp->window->options, "mode-keys") ==
MODEKEY_VI) {
last = window_copy_find_length(wme, ey);
if (ex > last)
ex = last;
grid_reader_start(&gr, data->backing->grid, ex, ey);
grid_reader_cursor_left(&gr, 1);
grid_reader_get_cursor(&gr, &ex, &ey);
@@ -6363,6 +6366,13 @@ window_copy_find_output_range(struct window_mode_entry *wme, u_int *sx,
*sy = y;
found_start = 1;
}
/* Both A and C may have left history while D remains. */
if (!found_start && prompt_y == UINT_MAX &&
gl->flags & GRID_LINE_END_OUTPUT &&
(!next_prompt || od->out_end_col <= od->prompt_col)) {
*sx = *sy = 0;
found_start = 1;
}
/* An output may end on the same line or the next prompt's. */
if (found_start && gl->flags & GRID_LINE_END_OUTPUT &&
(y != prompt_y || od->out_end_col >= prompt_x) &&