===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -c -r1.142 -r1.143
*** src/usr.bin/tmux/window.c	2015/08/29 00:39:18	1.142
--- src/usr.bin/tmux/window.c	2015/08/29 08:30:54	1.143
***************
*** 1,4 ****
! /* $OpenBSD: window.c,v 1.142 2015/08/29 00:39:18 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window.c,v 1.143 2015/08/29 08:30:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 277,282 ****
--- 277,289 ----
  	return (RB_FIND(windows, &windows, &w));
  }
  
+ void
+ window_update_activity(struct window *w)
+ {
+ 	gettimeofday(&w->activity_time, NULL);
+ 	alerts_queue(w, WINDOW_ACTIVITY);
+ }
+ 
  struct window *
  window_create1(u_int sx, u_int sy)
  {
***************
*** 295,303 ****
  	w->sx = sx;
  	w->sy = sy;
  
- 	if (gettimeofday(&w->activity_time, NULL) != 0)
- 		fatal("gettimeofday failed");
- 
  	options_init(&w->options, &global_w_options);
  
  	w->references = 0;
--- 302,307 ----
***************
*** 305,310 ****
--- 309,316 ----
  	w->id = next_window_id++;
  	RB_INSERT(windows, &windows, w);
  
+ 	window_update_activity(w);
+ 
  	return (w);
  }
  
***************
*** 350,355 ****
--- 356,364 ----
  	if (event_initialized(&w->name_event))
  		evtimer_del(&w->name_event);
  
+ 	if (event_initialized(&w->alerts_timer))
+ 		evtimer_del(&w->alerts_timer);
+ 
  	options_free(&w->options);
  
  	window_destroy_panes(w);
***************
*** 929,942 ****
  	input_parse(wp);
  
  	wp->pipe_off = EVBUFFER_LENGTH(evb);
- 
- 	/*
- 	 * If we get here, we're not outputting anymore, so set the silence
- 	 * flag on the window.
- 	 */
- 	wp->window->flags |= WINDOW_SILENCE;
- 	if (gettimeofday(&wp->window->silence_timer, NULL) != 0)
- 		fatal("gettimeofday failed");
  	return;
  
  start_timer:
--- 938,943 ----