===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/input.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -c -r1.82 -r1.83
*** src/usr.bin/tmux/input.c	2015/08/28 07:49:24	1.82
--- src/usr.bin/tmux/input.c	2015/08/29 08:30:54	1.83
***************
*** 1,4 ****
! /* $OpenBSD: input.c,v 1.82 2015/08/28 07:49:24 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: input.c,v 1.83 2015/08/29 08:30:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 844,857 ****
  	if (EVBUFFER_LENGTH(evb) == 0)
  		return;
  
  	wp->flags |= PANE_CHANGED;
  
- 	wp->window->flags |= WINDOW_ACTIVITY;
- 	wp->window->flags &= ~WINDOW_SILENCE;
- 
- 	if (gettimeofday(&wp->window->activity_time, NULL) != 0)
- 		fatal("gettimeofday failed");
- 
  	/*
  	 * Open the screen. Use NULL wp if there is a mode set as don't want to
  	 * update the tty.
--- 844,852 ----
  	if (EVBUFFER_LENGTH(evb) == 0)
  		return;
  
+ 	window_update_activity(wp->window);
  	wp->flags |= PANE_CHANGED;
  
  	/*
  	 * Open the screen. Use NULL wp if there is a mode set as don't want to
  	 * update the tty.
***************
*** 1081,1087 ****
  	case '\000':	/* NUL */
  		break;
  	case '\007':	/* BEL */
! 		wp->window->flags |= WINDOW_BELL;
  		break;
  	case '\010':	/* BS */
  		screen_write_backspace(sctx);
--- 1076,1082 ----
  	case '\000':	/* NUL */
  		break;
  	case '\007':	/* BEL */
! 		alerts_queue(wp->window, WINDOW_BELL);
  		break;
  	case '\010':	/* BS */
  		screen_write_backspace(sctx);