From a870c255c48afc15a79c3ea5b0a205485fb949f6 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 4 Mar 2019 09:29:40 +0000
Subject: [PATCH 1/2] Don't set client offset if client is not a terminal

---
 tty.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tty.c b/tty.c
index d3db798f..a198b89c 100644
--- a/tty.c
+++ b/tty.c
@@ -807,6 +807,9 @@ tty_update_client_offset(struct client *c)
 {
 	u_int	ox, oy, sx, sy;
 
+	if (~c->flags & CLIENT_TERMINAL)
+		return;
+
 	c->tty.oflag = tty_window_offset1(&c->tty, &ox, &oy, &sx, &sy);
 	if (ox == c->tty.oox &&
 	    oy == c->tty.ooy &&

From 5cdd578906985c7abb9d1bba39384e201dada10e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 4 Mar 2019 09:29:52 +0000
Subject: [PATCH 2/2] Fix sense of aggressive-resize flag.

---
 resize.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resize.c b/resize.c
index fef8feeb..2134165f 100644
--- a/resize.c
+++ b/resize.c
@@ -188,7 +188,7 @@ recalculate_sizes(void)
 		type = options_get_number(w->options, "window-size");
 		if (type == WINDOW_SIZE_MANUAL)
 			continue;
-		current = !options_get_number(w->options, "aggressive-resize");
+		current = options_get_number(w->options, "aggressive-resize");
 
 		changed = 1;
 		if (type == WINDOW_SIZE_LARGEST) {