From 89e80cabd56bf2f7fa783575fe9b1f6192fade42 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 22 Apr 2015 15:05:03 +0000
Subject: window_index is only used in one place (window_destroy) so inline it
 there.

---
 tmux.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 53fd9b28..52dc1529 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2141,7 +2141,6 @@ struct winlink	*winlink_previous_by_number(struct winlink *, struct session *,
 		     int);
 void		 winlink_stack_push(struct winlink_stack *, struct winlink *);
 void		 winlink_stack_remove(struct winlink_stack *, struct winlink *);
-int		 window_index(struct window *, u_int *);
 struct window	*window_find_by_id(u_int);
 struct window	*window_create1(u_int, u_int);
 struct window	*window_create(const char *, int, char **, const char *,
-- 
cgit 


From 8d66f4fba4972d45be64d108c7c8d952f85016a8 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 22 Apr 2015 15:30:11 +0000
Subject: Change the windows array into an RB tree and fix some places where we
 were only looking at the first winlink for a window in a session.

---
 tmux.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 52dc1529..e52b14f1 100644
--- a/tmux.h
+++ b/tmux.h
@@ -983,8 +983,10 @@ struct window {
 	struct options	 options;
 
 	u_int		 references;
+
+	RB_ENTRY(window) entry;
 };
-ARRAY_DECL(windows, struct window *);
+RB_HEAD(windows, window);
 
 /* Entry on local window list. */
 struct winlink {
@@ -2121,6 +2123,8 @@ void	 screen_reflow(struct screen *, u_int);
 /* window.c */
 extern struct windows windows;
 extern struct window_pane_tree all_window_panes;
+int		 window_cmp(struct window *, struct window *);
+RB_PROTOTYPE(windows, window, entry, window_cmp);
 int		 winlink_cmp(struct winlink *, struct winlink *);
 RB_PROTOTYPE(winlinks, winlink, entry, winlink_cmp);
 int		 window_pane_cmp(struct window_pane *, struct window_pane *);
-- 
cgit 


From 9a453dd3546b2c3053e8e34bf4d6775b1a05d3a8 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 22 Apr 2015 15:32:33 +0000
Subject: Make session_has return a flag, returning the first winlink found is
 a recipe for errors.

---
 tmux.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index e52b14f1..a47218e5 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2321,7 +2321,7 @@ struct winlink	*session_new(struct session *, const char *, int, char **,
 struct winlink	*session_attach(struct session *, struct window *, int,
 		     char **);
 int		 session_detach(struct session *, struct winlink *);
-struct winlink	*session_has(struct session *, struct window *);
+int		 session_has(struct session *, struct window *);
 int		 session_next(struct session *, int);
 int		 session_previous(struct session *, int);
 int		 session_select(struct session *, int);
-- 
cgit 


From 583b4ab72b7bf66fda8ab63a08fe435483de5e5a Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 24 Apr 2015 22:19:36 +0000
Subject: Set working directory for run-shell and if-shell.

---
 tmux.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index a47218e5..9a6e4c83 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1613,7 +1613,7 @@ int	options_table_find(const char *, const struct options_table_entry **,
 
 /* job.c */
 extern struct joblist all_jobs;
-struct job *job_run(const char *, struct session *,
+struct job *job_run(const char *, struct session *, int,
 	    void (*)(struct job *), void (*)(void *), void *);
 void	job_free(struct job *);
 void	job_died(struct job *, int);
-- 
cgit 


From aeedb464a6ee038289ddcfefae437928ab020cb1 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 24 Apr 2015 23:17:11 +0000
Subject: Convert clients list into a TAILQ.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 9a6e4c83..c38149ab 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1349,8 +1349,10 @@ struct client {
 
 	struct cmd_q	*cmdq;
 	int		 references;
+
+	TAILQ_ENTRY(client) entry;
 };
-ARRAY_DECL(clients, struct client *);
+TAILQ_HEAD(clients, client);
 
 /* Parsed arguments structures. */
 struct args_entry {
-- 
cgit