===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.401
retrieving revision 1.402
diff -c -r1.401 -r1.402
*** src/usr.bin/tmux/tmux.h	2013/03/25 10:09:07	1.401
--- src/usr.bin/tmux/tmux.h	2013/03/25 10:11:45	1.402
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.401 2013/03/25 10:09:07 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.402 2013/03/25 10:11:45 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 466,473 ****
   * 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 */
  
  	int		argc;
  	char		argv[COMMAND_LENGTH];
--- 466,473 ----
   * Don't forget to bump PROTOCOL_VERSION if any of these change!
   */
  struct msg_command_data {
! 	pid_t		pid;		/* from $TMUX or -1 */
! 	int		session_id;	/* from $TMUX or -1 */
  
  	int		argc;
  	char		argv[COMMAND_LENGTH];
***************
*** 1090,1096 ****
  TAILQ_HEAD(session_groups, session_group);
  
  struct session {
! 	u_int		 idx;
  
  	char		*name;
  	char		*cwd;
--- 1090,1096 ----
  TAILQ_HEAD(session_groups, session_group);
  
  struct session {
! 	u_int		 id;
  
  	char		*name;
  	char		*cwd;
***************
*** 1517,1523 ****
  extern int	 login_shell;
  extern char	*environ_path;
  extern pid_t	 environ_pid;
! extern int	 environ_idx;
  void		 logfile(const char *);
  const char	*getshell(void);
  int		 checkshell(const char *);
--- 1517,1523 ----
  extern int	 login_shell;
  extern char	*environ_path;
  extern pid_t	 environ_pid;
! extern int	 environ_session_id;
  void		 logfile(const char *);
  const char	*getshell(void);
  int		 checkshell(const char *);
***************
*** 2291,2297 ****
  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_create(const char *, const char *, const char *,
  		     struct environ *, struct termios *, int, u_int, u_int,
  		     char **);
--- 2291,2297 ----
  RB_PROTOTYPE(sessions, session, entry, session_cmp);
  int		 session_alive(struct session *);
  struct session	*session_find(const char *);
! 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 **);