circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-07 02:04:22 +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 mouse drag selection on the top and bottom lines in vi mode, GitHub issue 5667 from David Schweikert.
This commit is contained in:
tmux update bot
2026-10-05 22:02:42 +00:00
parent cdb8575630 4d2494dfee
commit d1fedcc9a0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
window-copy.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: window-copy.c,v 1.432 2026/10/02 12:48:52 nicm Exp $ */ /* $OpenBSD: window-copy.c,v 1.433 2026/10/05 15:52:25 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -6506,7 +6506,9 @@ window_copy_cursor_up(struct window_mode_entry *wme, int scroll_only)
if (data->lineflag == LINE_SEL_LEFT_RIGHT && oy == data->sely) if (data->lineflag == LINE_SEL_LEFT_RIGHT && oy == data->sely)
window_copy_other_end(wme); window_copy_other_end(wme);
if (scroll_only && options_get_number(oo, "mode-keys") == MODEKEY_VI) { /* In vi mode, keep cursor on the same line unless dragging. */
if (scroll_only && data->cursordrag == CURSORDRAG_NONE &&
options_get_number(oo, "mode-keys") == MODEKEY_VI) {
if (data->cy < screen_size_y(s) - 1) if (data->cy < screen_size_y(s) - 1)
window_copy_update_cursor(wme, data->cx, data->cy + 1); window_copy_update_cursor(wme, data->cx, data->cy + 1);
} }
@@ -6586,7 +6588,9 @@ window_copy_cursor_down(struct window_mode_entry *wme, int scroll_only)
if (data->lineflag == LINE_SEL_RIGHT_LEFT && oy == data->endsely) if (data->lineflag == LINE_SEL_RIGHT_LEFT && oy == data->endsely)
window_copy_other_end(wme); window_copy_other_end(wme);
if (scroll_only && options_get_number(oo, "mode-keys") == MODEKEY_VI) { /* In vi mode, keep cursor on the same line unless dragging. */
if (scroll_only && data->cursordrag == CURSORDRAG_NONE &&
options_get_number(oo, "mode-keys") == MODEKEY_VI) {
if (data->cy > 0) if (data->cy > 0)
window_copy_update_cursor(wme, data->cx, data->cy - 1); window_copy_update_cursor(wme, data->cx, data->cy - 1);
} }