===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.540
retrieving revision 1.541
diff -c -r1.540 -r1.541
*** src/usr.bin/tmux/tmux.h	2015/08/29 00:29:15	1.540
--- src/usr.bin/tmux/tmux.h	2015/08/29 08:30:54	1.541
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.540 2015/08/29 00:29:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.541 2015/08/29 08:30:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 874,880 ****
  	struct event	 name_event;
  	struct timeval	 name_time;
  
! 	struct timeval	 silence_timer;
  	struct timeval	 activity_time;
  
  	struct window_pane *active;
--- 874,881 ----
  	struct event	 name_event;
  	struct timeval	 name_time;
  
! 	struct event	 alerts_timer;
! 
  	struct timeval	 activity_time;
  
  	struct window_pane *active;
***************
*** 1829,1834 ****
--- 1830,1839 ----
  int	 key_string_lookup_string(const char *);
  const char *key_string_lookup_key(int);
  
+ /* alerts.c */
+ void	alerts_reset_all(void);
+ void	alerts_queue(struct window *, int);
+ 
  /* server.c */
  extern struct clients clients;
  extern struct clients dead_clients;
***************
*** 1856,1864 ****
  void	 server_client_status_timer(void);
  void	 server_client_loop(void);
  
- /* server-window.c */
- void	 server_window_loop(void);
- 
  /* server-fn.c */
  void	 server_fill_environ(struct session *, struct environ *);
  void	 server_write_ready(struct client *);
--- 1861,1866 ----
***************
*** 2084,2089 ****
--- 2086,2092 ----
  void		 winlink_stack_remove(struct winlink_stack *, struct winlink *);
  struct window	*window_find_by_id_str(const char *);
  struct window	*window_find_by_id(u_int);
+ void		 window_update_activity(struct window *);
  struct window	*window_create1(u_int, u_int);
  struct window	*window_create(const char *, int, char **, const char *,
  		     const char *, int, struct environ *, struct termios *,