From e0929262db947f984964f979a23215c0de75ceb2 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 14 Nov 2014 02:19:47 +0000
Subject: Label windows which are smaller than expected with a reason.

---
 tmux.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 7e520641..a15bd3d3 100644
--- a/tmux.h
+++ b/tmux.h
@@ -946,7 +946,9 @@ struct window {
 #define WINDOW_ACTIVITY 0x2
 #define WINDOW_REDRAW 0x4
 #define WINDOW_SILENCE 0x8
-#define WINDOW_ZOOMED 0x10
+#define WINDOW_ZOOMED 0x1000
+#define WINDOW_FORCEWIDTH 0x2000
+#define WINDOW_FORCEHEIGHT 0x4000
 #define WINDOW_ALERTFLAGS (WINDOW_BELL|WINDOW_ACTIVITY|WINDOW_SILENCE)
 
 	struct options	 options;
-- 
cgit 


From c403bfc89488bf3867cee9d5c3b4083a3f80bee6 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sun, 30 Nov 2014 08:03:29 +0000
Subject: Remove dead code, from Thomas Adam.

---
 tmux.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index a15bd3d3..f979a4b8 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2236,9 +2236,6 @@ struct window_choose_data	*window_choose_add_window(struct window_pane *,
 struct window_choose_data	*window_choose_add_session(struct window_pane *,
 			struct client *, struct session *, const char *,
 			const char *, u_int);
-struct window_choose_data	*window_choose_add_item(struct window_pane *,
-			struct client *, struct winlink *, const char *,
-			const char *, u_int);
 void	window_choose_expand_all(struct window_pane *);
 void	window_choose_collapse_all(struct window_pane *);
 void	window_choose_set_current(struct window_pane *, u_int);
-- 
cgit 


From 575fd1e322b15a3e9f0d1892ebb82c2e8a30ba46 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 2 Dec 2014 23:19:45 +0000
Subject: Permit option values to be used in formats.

---
 tmux.h | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index f979a4b8..d8cb5da8 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1461,15 +1461,6 @@ struct options_table_entry {
 	const char	       *style;
 };
 
-/* Tree of format entries. */
-struct format_entry {
-	char		       *key;
-	char		       *value;
-
-	RB_ENTRY(format_entry)	entry;
-};
-RB_HEAD(format_tree, format_entry);
-
 /* Common command usages. */
 #define CMD_TARGET_PANE_USAGE "[-t target-pane]"
 #define CMD_TARGET_WINDOW_USAGE "[-t target-window]"
@@ -1513,8 +1504,7 @@ void		 cfg_print_causes(struct cmd_q *);
 void		 cfg_show_causes(struct session *);
 
 /* format.c */
-int		 format_cmp(struct format_entry *, struct format_entry *);
-RB_PROTOTYPE(format_tree, format_entry, entry, format_cmp);
+struct format_tree;
 struct format_tree *format_create(void);
 void		 format_free(struct format_tree *);
 void printflike(3, 4) format_add(struct format_tree *, const char *,
-- 
cgit