summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/resize.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2017-05-10 16:48:36 +0000
committernicm <nicm@openbsd.org>2017-05-10 16:48:36 +0000
commitd55f3e48dfdc86046947331464533372fd36e9e4 (patch)
tree2fd095a05a95d7e1b5336e613f231c06cd043691 /usr.bin/tmux/resize.c
parentWe can use ECH to clear sections of lines, so use it for internal panes (diff)
downloadwireguard-openbsd-d55f3e48dfdc86046947331464533372fd36e9e4.tar.xz
wireguard-openbsd-d55f3e48dfdc86046947331464533372fd36e9e4.zip
Prevent control clients from affecting the session size until they have
specified a size with refresh-client -C. Prompted by a different change with the same purpose from George Nachman.
Diffstat (limited to 'usr.bin/tmux/resize.c')
-rw-r--r--usr.bin/tmux/resize.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/tmux/resize.c b/usr.bin/tmux/resize.c
index 4914ae6af95..b67005d2263 100644
--- a/usr.bin/tmux/resize.c
+++ b/usr.bin/tmux/resize.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: resize.c,v 1.22 2017/02/08 13:53:32 nicm Exp $ */
+/* $OpenBSD: resize.c,v 1.23 2017/05/10 16:48:36 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -60,6 +60,9 @@ recalculate_sizes(void)
TAILQ_FOREACH(c, &clients, entry) {
if (c->flags & CLIENT_SUSPENDED)
continue;
+ if ((c->flags & (CLIENT_CONTROL|CLIENT_SIZECHANGED)) ==
+ CLIENT_CONTROL)
+ continue;
if (c->session == s) {
if (c->tty.sx < ssx)
ssx = c->tty.sx;