===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/control-notify.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/tmux/control-notify.c	2013/03/25 11:40:40	1.6
--- src/usr.bin/tmux/control-notify.c	2013/03/25 11:40:54	1.7
***************
*** 1,4 ****
! /* $OpenBSD: control-notify.c,v 1.6 2013/03/25 11:40:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2012 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: control-notify.c,v 1.7 2013/03/25 11:40:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2012 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 45,51 ****
  	 */
  	if (winlink_find_by_window(&c->session->windows, wp->window) != NULL) {
  		message = evbuffer_new();
! 		evbuffer_add_printf(message, "%%output %u ", wp->id);
  		for (i = 0; i < len; i++) {
  			if (buf[i] < ' ' || buf[i] == '\\')
  			    evbuffer_add_printf(message, "\\%03o", buf[i]);
--- 45,51 ----
  	 */
  	if (winlink_find_by_window(&c->session->windows, wp->window) != NULL) {
  		message = evbuffer_new();
! 		evbuffer_add_printf(message, "%%output %%%u ", wp->id);
  		for (i = 0; i < len; i++) {
  			if (buf[i] < ' ' || buf[i] == '\\')
  			    evbuffer_add_printf(message, "\\%03o", buf[i]);
***************
*** 108,114 ****
  			continue;
  		cs = c->session;
  
! 		control_write(c, "%%window-close %u", w->id);
  	}
  }
  
--- 108,114 ----
  			continue;
  		cs = c->session;
  
! 		control_write(c, "%%window-close @%u", w->id);
  	}
  }
  
***************
*** 126,134 ****
  		cs = c->session;
  
  		if (winlink_find_by_window_id(&cs->windows, w->id) != NULL)
! 			control_write(c, "%%window-add %u", w->id);
  		else
! 			control_write(c, "%%unlinked-window-add %u", w->id);
  	}
  }
  
--- 126,134 ----
  		cs = c->session;
  
  		if (winlink_find_by_window_id(&cs->windows, w->id) != NULL)
! 			control_write(c, "%%window-add @%u", w->id);
  		else
! 			control_write(c, "%%unlinked-window-add @%u", w->id);
  	}
  }
  
***************
*** 145,151 ****
  			continue;
  		s = c->session;
  
! 		control_write(c, "%%window-renamed %u %s", w->id, w->name);
  	}
  }
  
--- 145,151 ----
  			continue;
  		s = c->session;
  
! 		control_write(c, "%%window-renamed @%u %s", w->id, w->name);
  	}
  }
  
***************
*** 158,164 ****
  		return;
  	s = c->session;
  
! 	control_write(c, "%%session-changed %u %s", s->id, s->name);
  }
  
  void
--- 158,164 ----
  		return;
  	s = c->session;
  
! 	control_write(c, "%%session-changed $%u %s", s->id, s->name);
  }
  
  void
***************
*** 169,178 ****
  
  	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
  		c = ARRAY_ITEM(&clients, i);
! 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session != s)
  			continue;
  
! 		control_write(c, "%%session-renamed %s", s->name);
  	}
  }
  
--- 169,178 ----
  
  	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
  		c = ARRAY_ITEM(&clients, i);
! 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
  			continue;
  
! 		control_write(c, "%%session-renamed $%u %s", s->id, s->name);
  	}
  }
  
***************
*** 184,190 ****
  
  	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
  		c = ARRAY_ITEM(&clients, i);
! 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
  			continue;
  
  		control_write(c, "%%sessions-changed");
--- 184,190 ----
  
  	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
  		c = ARRAY_ITEM(&clients, i);
! 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
  			continue;
  
  		control_write(c, "%%sessions-changed");
***************
*** 199,205 ****
  
  	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
  		c = ARRAY_ITEM(&clients, i);
! 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
  			continue;
  
  		control_write(c, "%%sessions-changed");
--- 199,205 ----
  
  	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
  		c = ARRAY_ITEM(&clients, i);
! 		if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
  			continue;
  
  		control_write(c, "%%sessions-changed");