From b11de5adc7a89a23af2a778d4de12ac697c902a0 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 31 Mar 2014 21:37:55 +0000
Subject: Make session_attached a count and add session_many_attached flag.

---
 format.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'format.c')

diff --git a/format.c b/format.c
index bcb897d6..1dca6011 100644
--- a/format.c
+++ b/format.c
@@ -401,10 +401,8 @@ format_session(struct format_tree *ft, struct session *s)
 	*strchr(tim, '\n') = '\0';
 	format_add(ft, "session_created_string", "%s", tim);
 
-	if (s->flags & SESSION_UNATTACHED)
-		format_add(ft, "session_attached", "%d", 0);
-	else
-		format_add(ft, "session_attached", "%d", 1);
+	format_add(ft, "session_attached", "%u", s->attached);
+	format_add(ft, "session_many_attached", "%u", s->attached > 1);
 }
 
 /* Set default format keys for a client. */
-- 
cgit 


From 252a7373d69646ae866e3a4fa18d46f673864c0e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 2 Apr 2014 18:12:18 +0000
Subject: Support UTF-8 with choose-buffer, from Kosuke ASAMI. Also make
 buffer_sample bigger to let it trim at window right edge.

---
 format.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'format.c')

diff --git a/format.c b/format.c
index 1dca6011..5fc76b2b 100644
--- a/format.c
+++ b/format.c
@@ -601,12 +601,14 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp)
 
 /* Set default format keys for paste buffer. */
 void
-format_paste_buffer(struct format_tree *ft, struct paste_buffer *pb)
+format_paste_buffer(struct format_tree *ft, struct paste_buffer *pb,
+    int utf8flag)
 {
-	char	*pb_print = paste_print(pb, 50);
+	char	*s;
 
 	format_add(ft, "buffer_size", "%zu", pb->size);
-	format_add(ft, "buffer_sample", "%s", pb_print);
 
-	free(pb_print);
+	s = paste_make_sample(pb, utf8flag);
+	format_add(ft, "buffer_sample", "%s", s);
+	free(s);
 }
-- 
cgit