diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-03-09 21:33:28 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-03-09 21:33:28 +0000 |
| commit | 2ac6501698d5499967b33013d9f3fc8091fddc41 (patch) | |
| tree | e699425a8ea2296d96aa0cd953646188a81df955 /tmux.h | |
| parent | 06ac399ce6dc25201cfd1670b08ed8758034e2dc (diff) | |
| parent | dde5d49a5ed305cfa32f18c08d6f1b769d8ccef7 (diff) | |
| download | rtmux-2ac6501698d5499967b33013d9f3fc8091fddc41.tar.gz rtmux-2ac6501698d5499967b33013d9f3fc8091fddc41.tar.bz2 rtmux-2ac6501698d5499967b33013d9f3fc8091fddc41.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -462,8 +462,8 @@ enum msgtype { * Don't forget to bump PROTOCOL_VERSION if any of these change! */ struct msg_command_data { - pid_t pid; /* PID from $TMUX or -1 */ - int idx; /* index from $TMUX or -1 */ + pid_t pid; /* from $TMUX or -1 */ + int session_id; /* from $TMUX or -1 */ int argc; char argv[COMMAND_LENGTH]; @@ -1086,7 +1086,7 @@ struct session_group { TAILQ_HEAD(session_groups, session_group); struct session { - u_int idx; + u_int id; char *name; char *cwd; @@ -1513,7 +1513,7 @@ extern char socket_path[MAXPATHLEN]; extern int login_shell; extern char *environ_path; extern pid_t environ_pid; -extern int environ_idx; +extern int environ_session_id; void logfile(const char *); const char *getshell(void); int checkshell(const char *); @@ -2287,7 +2287,7 @@ int session_cmp(struct session *, struct session *); RB_PROTOTYPE(sessions, session, entry, session_cmp); int session_alive(struct session *); struct session *session_find(const char *); -struct session *session_find_by_index(u_int); +struct session *session_find_by_id(u_int); struct session *session_create(const char *, const char *, const char *, struct environ *, struct termios *, int, u_int, u_int, char **); |