circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-11 04:44:25 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Use correct cursor position for range end, GitHub issue 5414.
  Increase escape-time for tmux's own queries (refresh-client -l and window size) as well, GitHub issue 5388 from Jackson Edmonds.
This commit is contained in:
tmux update bot
2026-07-21 09:17:33 +00:00
parent 8aaae25e56 0e2576a842
commit 4d1cf62fb4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
format-draw.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: format-draw.c,v 1.33 2026/06/29 17:08:52 nicm Exp $ */ /* $OpenBSD: format-draw.c,v 1.34 2026/07/21 07:20:18 nicm Exp $ */
/* /*
* Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -958,7 +958,7 @@ format_draw(struct screen_write_ctx *octx, const struct grid_cell *base,
if (srs != NULL) { if (srs != NULL) {
if (fr != NULL && !format_is_type(fr, &sy)) { if (fr != NULL && !format_is_type(fr, &sy)) {
if (s[current].cx != fr->start) { if (s[current].cx != fr->start) {
fr->end = s[current].cx + 1; fr->end = s[current].cx;
TAILQ_INSERT_TAIL(&frs, fr, entry); TAILQ_INSERT_TAIL(&frs, fr, entry);
} else } else
free(fr); free(fr);

7
tty-keys.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: tty-keys.c,v 1.210 2026/07/10 13:38:45 nicm Exp $ */ /* $OpenBSD: tty-keys.c,v 1.211 2026/07/21 07:12:49 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -977,8 +977,9 @@ partial_key:
if (delay < 500) if (delay < 500)
delay = 500; delay = 500;
} }
if ((tty->flags & (TTY_WAITFG|TTY_WAITBG) || if (tty->flags & (TTY_WAITFG|TTY_WAITBG) ||
(tty->flags & TTY_ALL_REQUEST_FLAGS) != TTY_ALL_REQUEST_FLAGS) || tty->flags & (TTY_OSC52QUERY|TTY_WINSIZEQUERY) ||
(tty->flags & TTY_ALL_REQUEST_FLAGS) != TTY_ALL_REQUEST_FLAGS ||
!TAILQ_EMPTY(&c->input_requests)) { !TAILQ_EMPTY(&c->input_requests)) {
log_debug("%s: increasing delay (active query)", c->name); log_debug("%s: increasing delay (active query)", c->name);
if (delay < 500) if (delay < 500)