From 04876f20ca146fdeefe9c05859abca4849d5522e Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Wed, 9 Oct 2019 16:59:04 -0500
Subject: user/tmux: restore xterm-DECLRMM.patch

This patch will be needed until >= 3.0.
https://github.com/tmux/tmux/commit/26f274011096b9eacfd2753d8f7afcb63e796ab9
---
 user/tmux/APKBUILD            |  8 +++++---
 user/tmux/xterm-DECLRMM.patch | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 user/tmux/xterm-DECLRMM.patch

(limited to 'user')

diff --git a/user/tmux/APKBUILD b/user/tmux/APKBUILD
index 12caf643d..eed2ea5e2 100644
--- a/user/tmux/APKBUILD
+++ b/user/tmux/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: 
 pkgname=tmux
 pkgver=2.9a
-pkgrel=0
+pkgrel=1
 pkgdesc="Tool to control multiple terminals from a single terminal"
 url="https://tmux.github.io/"
 arch="all"
@@ -10,7 +10,8 @@ license="MIT"
 depends="ncurses-terminfo"
 makedepends="bsd-compat-headers libevent-dev libutempter-dev ncurses-dev"
 subpackages="$pkgname-doc"
-source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
+source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz
+	xterm-DECLRMM.patch"
 
 build() {
 	./configure \
@@ -37,4 +38,5 @@ package() {
 	done
 }
 
-sha512sums="aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713  tmux-2.9a.tar.gz"
+sha512sums="aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713  tmux-2.9a.tar.gz
+7fb006f8f24d60614fcaeadace933c2ad6674d2476980736a830f63a40d7110638942478322336849d47707c99ab7de0cb01ff39806a4c9144650daf2f666773  xterm-DECLRMM.patch"
diff --git a/user/tmux/xterm-DECLRMM.patch b/user/tmux/xterm-DECLRMM.patch
new file mode 100644
index 000000000..b9bef3455
--- /dev/null
+++ b/user/tmux/xterm-DECLRMM.patch
@@ -0,0 +1,23 @@
+From 26f274011096b9eacfd2753d8f7afcb63e796ab9 Mon Sep 17 00:00:00 2001
+From: nicm <nicm>
+Date: Thu, 1 Aug 2019 11:45:34 +0000
+Subject: [PATCH] xterm 348 now disables margins when resized, so send DECLRMM
+ again.
+
+---
+ tty.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tty.c b/tty.c
+index ab1da9fd3..024aef271 100644
+--- a/tty.c
++++ b/tty.c
+@@ -1879,6 +1879,8 @@ tty_invalidate(struct tty *tty)
+ 	tty->rlower = tty->rright = UINT_MAX;
+ 
+ 	if (tty->flags & TTY_STARTED) {
++		if (tty_use_margin(tty))
++			tty_puts(tty, "\033[?69h"); /* DECLRMM */
+ 		tty_putcode(tty, TTYC_SGR0);
+ 
+ 		tty->mode = ALL_MODES;
-- 
cgit v1.2.3-70-g09d2