From 29c29e771767b037f2929b889bb0de2b0b6ee138 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sun, 14 Jun 2015 10:07:44 +0000
Subject: Add a format for client PID (client_pid) and server PID (pid). Diff
 for client_pid from Thomas Adam.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 265fdc40..dfd6bf49 100644
--- a/tmux.h
+++ b/tmux.h
@@ -425,6 +425,7 @@ enum msgtype {
 	MSG_IDENTIFY_STDIN,
 	MSG_IDENTIFY_ENVIRON,
 	MSG_IDENTIFY_DONE,
+	MSG_IDENTIFY_CLIENTPID,
 
 	MSG_COMMAND = 200,
 	MSG_DETACH,
@@ -1206,6 +1207,7 @@ RB_HEAD(status_out_tree, status_out);
 struct client {
 	struct imsgbuf	 ibuf;
 
+	pid_t		 pid;
 	int		 fd;
 	struct event	 event;
 	int		 retval;
-- 
cgit 


From d96ab3401960ab4a7c9434dfda1ebdc5204873e0 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 15 Jun 2015 10:58:01 +0000
Subject: Add window_activity format, from Thomas Adam based on a diff
 originally from propos6 at gmail dot com.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index dfd6bf49..da91d4db 100644
--- a/tmux.h
+++ b/tmux.h
@@ -892,6 +892,7 @@ struct window {
 	char		*name;
 	struct event	 name_timer;
 	struct timeval	 silence_timer;
+	struct timeval	 activity_time;
 
 	struct window_pane *active;
 	struct window_pane *last;
-- 
cgit 


From 021cdbe1c0111951a1f63b09b41c9e3db3793db5 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 17 Jun 2015 16:44:49 +0000
Subject: Use an explicit job state instead of avoid closing our side of the
 socketpair and setting it to -1 to mark when the other side is closed. This
 avoids closing it while the libevent bufferevent still has it (it could try
 to add it to the polled set which some mechanisms don't like). Fixes part a
 problem reported by Bruno Sutic.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index da91d4db..ff0b4c84 100644
--- a/tmux.h
+++ b/tmux.h
@@ -714,6 +714,12 @@ struct options {
 
 /* Scheduled job. */
 struct job {
+	enum {
+		JOB_RUNNING,
+		JOB_DEAD,
+		JOB_CLOSED
+	} state;
+
 	char		*cmd;
 	pid_t		 pid;
 	int		 status;
-- 
cgit 


From 0ff335961eec019d776f19bd8c26cce7cde0effa Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 17 Jun 2015 16:50:28 +0000
Subject: Move the shuffle code from new-window -a into a function and add a -a
 flag for move-window too. From Thomas Adam.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index ff0b4c84..663832e5 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2166,6 +2166,7 @@ struct window_pane *window_pane_find_right(struct window_pane *);
 void		 window_set_name(struct window *, const char *);
 void		 window_remove_ref(struct window *);
 void		 winlink_clear_flags(struct winlink *);
+int		 winlink_shuffle_up(struct session *, struct winlink *);
 
 /* layout.c */
 u_int		 layout_count_cells(struct layout_cell *);
-- 
cgit