diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-06-20 08:45:19 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-06-20 08:45:19 +0100 |
| commit | 8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b (patch) | |
| tree | 10612c9842dbdb0749e0840cf057ca4a08a84948 /tmux.h | |
| parent | 8abcea18a24dea24d6049fefa31c877133489092 (diff) | |
| parent | 0ef3e28609ba89f53bedf40f5facc990cc57e60d (diff) | |
| download | rtmux-8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b.tar.gz rtmux-8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b.tar.bz2 rtmux-8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b.zip | |
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -429,6 +429,7 @@ enum msgtype { MSG_IDENTIFY_STDIN, MSG_IDENTIFY_ENVIRON, MSG_IDENTIFY_DONE, + MSG_IDENTIFY_CLIENTPID, MSG_COMMAND = 200, MSG_DETACH, @@ -717,6 +718,12 @@ struct options { /* Scheduled job. */ struct job { + enum { + JOB_RUNNING, + JOB_DEAD, + JOB_CLOSED + } state; + char *cmd; pid_t pid; int status; @@ -895,6 +902,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; @@ -1210,6 +1218,7 @@ RB_HEAD(status_out_tree, status_out); struct client { struct imsgbuf ibuf; + pid_t pid; int fd; struct event event; int retval; @@ -2161,6 +2170,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 *); |