From 67b4d5b6094c8845af344d1386bb3fed86f54b5a Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Fri, 22 Mar 2013 10:33:50 +0000
Subject: Support the latest theory for mouse input, this is enabled/disabled
 with SM/RM 1006 and is similar in style to SGR input: \033[<b;x;yM or
 \033[b;x;ym. From Egmont Koblinger.

---
 input-keys.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'input-keys.c')

diff --git a/input-keys.c b/input-keys.c
index 2111f5f3..23549e32 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -202,12 +202,25 @@ input_key(struct window_pane *wp, int key)
 void
 input_mouse(struct window_pane *wp, struct session *s, struct mouse_event *m)
 {
-	char			 buf[10];
+	char			 buf[40];
 	size_t			 len;
 	struct paste_buffer	*pb;
 
 	if (wp->screen->mode & ALL_MOUSE_MODES) {
-		if (wp->screen->mode & MODE_MOUSE_UTF8) {
+		/*
+		 * Use the SGR (1006) extension only if the application
+		 * requested it and the underlying terminal also sent the event
+		 * in this format (this is because an old style mouse release
+		 * event cannot be converted into the new SGR format, since the
+		 * released button is unknown). Otherwise pretend that tmux
+		 * doesn't speak this extension, and fall back to the UTF-8
+		 * (1005) extension if the application requested, or to the
+		 * legacy format.
+		 */
+		if (m->sgr && (wp->screen->mode & MODE_MOUSE_SGR)) {
+			len = xsnprintf(buf, sizeof buf, "\033[<%d;%d;%d%c",
+			    m->sgr_xb, m->x + 1, m->y + 1, m->sgr_rel ? 'm' : 'M');
+		} else if (wp->screen->mode & MODE_MOUSE_UTF8) {
 			len = xsnprintf(buf, sizeof buf, "\033[M");
 			len += utf8_split2(m->xb + 32, &buf[len]);
 			len += utf8_split2(m->x + 33, &buf[len]);
-- 
cgit 


From c71844de631186f3df7ff5a6e3aab613da1e4853 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Sun, 24 Mar 2013 09:57:59 +0000
Subject: Add resize-pane -Z to temporary zoom the active pane to occupy the
 full window or unzoom (restored to the normal layout) if it already zoomed,
 bound to C-b z by default. The pane is unzoomed on pretty much any excuse
 whatsoever.

We considered making this a new layout but the requirements are quite
different from layouts so decided it is better as a special case. Each
current layout cell is saved, a temporary one-cell layout generated and
all except the active pane set to NULL.

Prompted by suggestions and scripts from several. Thanks to Aaron Jensen
and Thiago Padilha for testing an earlier version.
---
 input-keys.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'input-keys.c')

diff --git a/input-keys.c b/input-keys.c
index 23549e32..d7e8513d 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -219,7 +219,8 @@ input_mouse(struct window_pane *wp, struct session *s, struct mouse_event *m)
 		 */
 		if (m->sgr && (wp->screen->mode & MODE_MOUSE_SGR)) {
 			len = xsnprintf(buf, sizeof buf, "\033[<%d;%d;%d%c",
-			    m->sgr_xb, m->x + 1, m->y + 1, m->sgr_rel ? 'm' : 'M');
+			    m->sgr_xb, m->x + 1, m->y + 1,
+			    m->sgr_rel ? 'm' : 'M');
 		} else if (wp->screen->mode & MODE_MOUSE_UTF8) {
 			len = xsnprintf(buf, sizeof buf, "\033[M");
 			len += utf8_split2(m->xb + 32, &buf[len]);
-- 
cgit