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

* refs/remotes/tmux-openbsd/master:
  Do not allow cursor on/off to escape synchronized updates.
This commit is contained in:
tmux update bot
2026-09-01 23:20:22 +00:00
2 changed files with 9 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
/* $OpenBSD: server-client.c,v 1.509 2026/08/28 07:36:01 nicm Exp $ */
/* $OpenBSD: server-client.c,v 1.510 2026/09/01 19:50:58 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -2244,7 +2244,7 @@ server_client_reset_state(struct client *c)
cy += status_line_size(c);
}
if ((pane_mode & MODE_SYNC) || !cursor)
if (!cursor)
mode &= ~MODE_CURSOR;
}
} else if (c->overlay_mode == NULL || s == NULL)
@@ -2252,6 +2252,10 @@ server_client_reset_state(struct client *c)
if (~pane_mode & MODE_SYNC) {
log_debug("%s: cursor to %u,%u", __func__, cx, cy);
tty_cursor(tty, cx, cy);
} else {
mode &= ~CURSOR_MODES;
mode |= tty->mode & CURSOR_MODES;
s = NULL;
}
/*