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

Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Fix redraw and selection position when changing selection mode.
This commit is contained in:
tmux update bot
2026-10-06 11:24:38 +00:00
parent f22e1d95b2 50160131a8
commit 0e59d2c035
1 changed files with 77 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
window-copy.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: window-copy.c,v 1.434 2026/10/06 07:57:41 nicm Exp $ */ /* $OpenBSD: window-copy.c,v 1.435 2026/10/06 08:26:23 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -2217,68 +2217,80 @@ window_copy_cmd_selection_mode(struct window_copy_cmd_state *cs)
else if (strcasecmp(s, "word") == 0 || strcasecmp(s, "w") == 0) { else if (strcasecmp(s, "word") == 0 || strcasecmp(s, "w") == 0) {
data->separators = options_get_string(so, "word-separators"); data->separators = options_get_string(so, "word-separators");
data->selflag = SEL_WORD; data->selflag = SEL_WORD;
} else if (strcasecmp(s, "line") == 0 || strcasecmp(s, "l") == 0) { } else if (strcasecmp(s, "line") == 0 || strcasecmp(s, "l") == 0)
data->selflag = SEL_LINE; data->selflag = SEL_LINE;
if (data->screen.sel == NULL) else
return (WINDOW_COPY_CMD_MOVE); return (WINDOW_COPY_CMD_MOVE);
if (data->selflag == SEL_CHAR || data->screen.sel == NULL)
return (WINDOW_COPY_CMD_MOVE);
/* /*
* Line selection normally starts with select-line, which sets * Set up the reset positions normally initialized by select-word or
* up the reset positions used when the cursor changes * select-line, including when changing the mode of an existing selection.
* direction. Do the same when changing an existing selection */
* to line mode. if (data->cursordrag == CURSORDRAG_SEL) {
*/ fx = data->endselx;
if (data->cursordrag == CURSORDRAG_SEL) { fy = data->endsely;
fx = data->endselx; } else {
fy = data->endsely; fx = data->selx;
} else { fy = data->sely;
fx = data->selx;
fy = data->sely;
}
sx = data->selx;
sy = data->sely;
ex = data->endselx;
ey = data->endsely;
if (ey < sy || (ey == sy && ex < sx)) {
x = sx; sx = ex; ex = x;
y = sy; sy = ey; ey = y;
}
grid_reader_start(&gr, data->backing->grid, sx, sy);
grid_reader_cursor_start_of_line(&gr, 1);
grid_reader_get_cursor(&gr, &sx, &sy);
grid_reader_start(&gr, data->backing->grid, ex, ey);
grid_reader_cursor_end_of_line(&gr, 1, 0);
grid_reader_get_cursor(&gr, &ex, &ey);
data->rectflag = 0;
data->selrx = data->selx = sx;
data->selry = data->sely = sy;
data->endselrx = data->endselx = ex;
data->endselry = data->endsely = ey;
x = data->cx;
y = screen_hsize(data->backing) + data->cy - data->oy;
data->dx = fx;
data->dy = fy;
if (data->cursordrag != CURSORDRAG_NONE &&
(y < fy || (y == fy && x < fx))) {
data->lineflag = LINE_SEL_RIGHT_LEFT;
data->cursordrag = CURSORDRAG_SEL;
window_copy_scroll_to(wme, sx, sy, 1);
} else {
data->lineflag = LINE_SEL_LEFT_RIGHT;
if (data->cursordrag != CURSORDRAG_NONE) {
data->cursordrag = CURSORDRAG_ENDSEL;
x = window_copy_cursor_limit(wme, ey, 0);
window_copy_scroll_to(wme, x, ey, 1);
}
}
if (data->cursordrag == CURSORDRAG_NONE)
window_copy_set_selection(wme, 0, 0);
return (WINDOW_COPY_CMD_REDRAW);
} }
return (WINDOW_COPY_CMD_MOVE);
sx = data->selx;
sy = data->sely;
ex = data->endselx;
ey = data->endsely;
if (ey < sy || (ey == sy && ex < sx)) {
x = sx; sx = ex; ex = x;
y = sy; sy = ey; ey = y;
}
grid_reader_start(&gr, data->backing->grid, sx, sy);
if (data->selflag == SEL_WORD)
grid_reader_cursor_previous_word(&gr, data->separators, 0, 1);
else
grid_reader_cursor_start_of_line(&gr, 1);
grid_reader_get_cursor(&gr, &sx, &sy);
grid_reader_start(&gr, data->backing->grid, ex, ey);
if (data->selflag == SEL_WORD) {
grid_reader_cursor_next_word_end(&gr, data->separators);
if (options_get_number(wme->wp->window->options, "mode-keys") ==
MODEKEY_VI)
grid_reader_cursor_left(&gr, 1);
} else
grid_reader_cursor_end_of_line(&gr, 1, 0);
grid_reader_get_cursor(&gr, &ex, &ey);
data->rectflag = 0;
data->selrx = data->selx = sx;
data->selry = data->sely = sy;
data->endselrx = data->endselx = ex;
data->endselry = data->endsely = ey;
x = data->cx;
y = screen_hsize(data->backing) + data->cy - data->oy;
data->dx = fx;
data->dy = fy;
if (data->cursordrag != CURSORDRAG_NONE &&
(y < fy || (y == fy && x < fx))) {
data->lineflag = LINE_SEL_RIGHT_LEFT;
data->cursordrag = CURSORDRAG_SEL;
window_copy_scroll_to(wme, sx, sy, 1);
} else {
data->lineflag = LINE_SEL_LEFT_RIGHT;
if (data->cursordrag != CURSORDRAG_NONE) {
data->cursordrag = CURSORDRAG_ENDSEL;
if (data->selflag == SEL_LINE)
x = window_copy_cursor_limit(wme, ey, 0);
else
x = ex;
window_copy_scroll_to(wme, x, ey, 1);
}
}
if (data->selflag == SEL_WORD)
window_copy_set_selection(wme, 0, 1);
else if (data->cursordrag == CURSORDRAG_NONE)
window_copy_set_selection(wme, 0, 0);
return (WINDOW_COPY_CMD_REDRAW);
} }
static enum window_copy_cmd_action static enum window_copy_cmd_action
@@ -5508,7 +5520,6 @@ static void
window_copy_redraw_selection(struct window_mode_entry *wme, u_int old_y) window_copy_redraw_selection(struct window_mode_entry *wme, u_int old_y)
{ {
struct window_copy_mode_data *data = wme->data; struct window_copy_mode_data *data = wme->data;
struct grid *gd = data->backing->grid;
u_int new_y, start, end; u_int new_y, start, end;
new_y = data->cy; new_y = data->cy;
@@ -5520,15 +5531,6 @@ window_copy_redraw_selection(struct window_mode_entry *wme, u_int old_y)
end = old_y; end = old_y;
} }
/*
* In word selection mode the first word on the line below the cursor
* might be selected, so add this line to the redraw area.
*/
if (data->selflag == SEL_WORD) {
/* Last grid line in data coordinates. */
if (end < gd->sy + data->oy - 1)
end++;
}
window_copy_redraw_lines(wme, start, end - start + 1); window_copy_redraw_lines(wme, start, end - start + 1);
} }
@@ -5865,10 +5867,14 @@ window_copy_update_selection(struct window_mode_entry *wme, int may_redraw,
{ {
struct window_copy_mode_data *data = wme->data; struct window_copy_mode_data *data = wme->data;
struct screen *s = &data->screen; struct screen *s = &data->screen;
int changed;
if (s->sel == NULL && data->lineflag == LINE_SEL_NONE) if (s->sel == NULL && data->lineflag == LINE_SEL_NONE)
return (0); return (0);
return (window_copy_set_selection(wme, may_redraw, no_reset)); changed = window_copy_set_selection(wme, may_redraw, no_reset);
if (data->selflag == SEL_WORD && may_redraw)
window_copy_redraw_screen(wme);
return (changed);
} }
/* /*