===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/notify.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/tmux/notify.c	2016/10/16 19:36:37	1.16
--- src/usr.bin/tmux/notify.c	2016/10/16 19:55:52	1.17
***************
*** 1,4 ****
! /* $OpenBSD: notify.c,v 1.16 2016/10/16 19:36:37 nicm Exp $ */
  
  /*
   * Copyright (c) 2012 George Nachman <tmux@georgester.com>
--- 1,4 ----
! /* $OpenBSD: notify.c,v 1.17 2016/10/16 19:55:52 nicm Exp $ */
  
  /*
   * Copyright (c) 2012 George Nachman <tmux@georgester.com>
***************
*** 41,48 ****
  	"window-renamed",
  	NULL, /* "attached-session-changed", */
  	"session-renamed",
! 	NULL, /* "session-created", */
! 	NULL, /* "session-closed" */
  };
  
  struct notify_entry {
--- 41,48 ----
  	"window-renamed",
  	NULL, /* "attached-session-changed", */
  	"session-renamed",
! 	"session-created",
! 	"session-closed"
  };
  
  struct notify_entry {
***************
*** 60,77 ****
  	struct cmd_find_state	 fs;
  	struct hook		*hook;
  	struct cmdq_item	*new_item;
  
  	name = notify_hooks[ne->type];
  	if (name == NULL)
  		return;
  
  	cmd_find_clear_state(&fs, NULL, 0);
! 	if (ne->session != NULL && ne->window != NULL)
! 		cmd_find_from_session_window(&fs, ne->session, ne->window);
! 	else if (ne->window != NULL)
! 		cmd_find_from_window(&fs, ne->window);
! 	else if (ne->session != NULL)
! 		cmd_find_from_session(&fs, ne->session);
  	else
  		cmd_find_current(&fs, item, CMD_FIND_QUIET);
  	if (cmd_find_empty_state(&fs) || !cmd_find_valid_state(&fs))
--- 60,79 ----
  	struct cmd_find_state	 fs;
  	struct hook		*hook;
  	struct cmdq_item	*new_item;
+ 	struct session		*s = ne->session;
+ 	struct window		*w = ne->window;
  
  	name = notify_hooks[ne->type];
  	if (name == NULL)
  		return;
  
  	cmd_find_clear_state(&fs, NULL, 0);
! 	if (s != NULL && w != NULL)
! 		cmd_find_from_session_window(&fs, s, w);
! 	else if (w != NULL)
! 		cmd_find_from_window(&fs, w);
! 	else if (s != NULL && session_alive(s))
! 		cmd_find_from_session(&fs, s);
  	else
  		cmd_find_current(&fs, item, CMD_FIND_QUIET);
  	if (cmd_find_empty_state(&fs) || !cmd_find_valid_state(&fs))
***************
*** 84,89 ****
--- 86,101 ----
  
  	new_item = cmdq_get_command(hook->cmdlist, &fs, NULL, CMDQ_NOHOOKS);
  	cmdq_format(new_item, "hook", "%s", name);
+ 
+ 	if (s != NULL) {
+ 		cmdq_format(new_item, "hook_session", "$%u", s->id);
+ 		cmdq_format(new_item, "hook_session_name", "%s", s->name);
+ 	}
+ 	if (w != NULL) {
+ 		cmdq_format(new_item, "hook_window", "@%u", w->id);
+ 		cmdq_format(new_item, "hook_window_name", "%s", w->name);
+ 	}
+ 
  	cmdq_insert_after(item, new_item);
  }