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

* refs/remotes/tmux-openbsd/master:
  Update sizes when we get a WINSZ response.
This commit is contained in:
tmux update bot
2026-10-14 14:36:23 +00:00
2 changed files with 4 additions and 3 deletions

View File

@@ -1,4 +1,4 @@
/* $OpenBSD: screen-redraw.c,v 1.167 2026/10/14 12:51:00 nicm Exp $ */ /* $OpenBSD: screen-redraw.c,v 1.168 2026/10/14 13:03:47 nicm Exp $ */
/* /*
* Copyright (c) 2026 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2026 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -2213,7 +2213,7 @@ redraw_client_damage(struct client *c)
} }
tty_sync_start(tty); tty_sync_start(tty);
tty_update_mode(tty, c->tty.mode & ~CURSOR_MODES, NULL); tty_update_mode(tty, tty->mode & ~CURSOR_MODES, NULL);
TAILQ_FOREACH(rd, &w->damage, entry) { TAILQ_FOREACH(rd, &w->damage, entry) {
x0 = (rd->x > ox) ? rd->x : ox; x0 = (rd->x > ox) ? rd->x : ox;

View File

@@ -1,4 +1,4 @@
/* $OpenBSD: tty-keys.c,v 1.218 2026/10/14 08:33:19 nicm Exp $ */ /* $OpenBSD: tty-keys.c,v 1.219 2026/10/14 13:03:47 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1928,6 +1928,7 @@ tty_keys_winsz(struct tty *tty, const char *buf, size_t len, size_t *size,
if (tty_set_size(tty, tty->sx, tty->sy, char_x, char_y)) if (tty_set_size(tty, tty->sx, tty->sy, char_x, char_y))
server_redraw_client(c); server_redraw_client(c);
tty_invalidate(tty); tty_invalidate(tty);
recalculate_sizes();
tty->flags &= ~TTY_WINSIZEQUERY; tty->flags &= ~TTY_WINSIZEQUERY;
return (0); return (0);