===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/alerts.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/tmux/alerts.c	2016/05/11 20:56:58	1.11
--- src/usr.bin/tmux/alerts.c	2016/10/03 22:52:11	1.12
***************
*** 1,4 ****
! /* $OpenBSD: alerts.c,v 1.11 2016/05/11 20:56:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: alerts.c,v 1.12 2016/10/03 22:52:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 22,42 ****
  
  #include "tmux.h"
  
! int	alerts_fired;
  
! void	alerts_timer(int, short, void *);
! int	alerts_enabled(struct window *, int);
! void	alerts_callback(int, short, void *);
! void	alerts_reset(struct window *);
  
! void	alerts_run_hook(struct session *, struct winlink *, int);
! int	alerts_check_all(struct session *, struct winlink *);
! int	alerts_check_bell(struct session *, struct winlink *);
! int	alerts_check_activity(struct session *, struct winlink *);
! int	alerts_check_silence(struct session *, struct winlink *);
! void	alerts_ring_bell(struct session *);
  
! void
  alerts_timer(__unused int fd, __unused short events, void *arg)
  {
  	struct window	*w = arg;
--- 22,42 ----
  
  #include "tmux.h"
  
! static int	alerts_fired;
  
! static void	alerts_timer(int, short, void *);
! static int	alerts_enabled(struct window *, int);
! static void	alerts_callback(int, short, void *);
! static void	alerts_reset(struct window *);
  
! static void	alerts_run_hook(struct session *, struct winlink *, int);
! static int	alerts_check_all(struct session *, struct winlink *);
! static int	alerts_check_bell(struct session *, struct winlink *);
! static int	alerts_check_activity(struct session *, struct winlink *);
! static int	alerts_check_silence(struct session *, struct winlink *);
! static void	alerts_ring_bell(struct session *);
  
! static void
  alerts_timer(__unused int fd, __unused short events, void *arg)
  {
  	struct window	*w = arg;
***************
*** 46,52 ****
  	alerts_queue(w, WINDOW_SILENCE);
  }
  
! void
  alerts_callback(__unused int fd, __unused short events, __unused void *arg)
  {
  	struct window	*w;
--- 46,52 ----
  	alerts_queue(w, WINDOW_SILENCE);
  }
  
! static void
  alerts_callback(__unused int fd, __unused short events, __unused void *arg)
  {
  	struct window	*w;
***************
*** 72,78 ****
  	alerts_fired = 0;
  }
  
! void
  alerts_run_hook(struct session *s, struct winlink *wl, int flags)
  {
  	struct cmd_find_state	 fs;
--- 72,78 ----
  	alerts_fired = 0;
  }
  
! static void
  alerts_run_hook(struct session *s, struct winlink *wl, int flags)
  {
  	struct cmd_find_state	 fs;
***************
*** 88,94 ****
  		hooks_run(s->hooks, NULL, &fs, "alert-activity");
  }
  
! int
  alerts_check_all(struct session *s, struct winlink *wl)
  {
  	int	alerts;
--- 88,94 ----
  		hooks_run(s->hooks, NULL, &fs, "alert-activity");
  }
  
! static int
  alerts_check_all(struct session *s, struct winlink *wl)
  {
  	int	alerts;
***************
*** 113,119 ****
  		alerts_check_all(s, wl);
  }
  
! int
  alerts_enabled(struct window *w, int flags)
  {
  	if (flags & WINDOW_BELL)
--- 113,119 ----
  		alerts_check_all(s, wl);
  }
  
! static int
  alerts_enabled(struct window *w, int flags)
  {
  	if (flags & WINDOW_BELL)
***************
*** 138,144 ****
  		alerts_reset(w);
  }
  
! void
  alerts_reset(struct window *w)
  {
  	struct timeval	tv;
--- 138,144 ----
  		alerts_reset(w);
  }
  
! static void
  alerts_reset(struct window *w)
  {
  	struct timeval	tv;
***************
*** 175,181 ****
  	}
  }
  
! int
  alerts_check_bell(struct session *s, struct winlink *wl)
  {
  	struct client	*c;
--- 175,181 ----
  	}
  }
  
! static int
  alerts_check_bell(struct session *s, struct winlink *wl)
  {
  	struct client	*c;
***************
*** 218,224 ****
  	return (WINDOW_BELL);
  }
  
! int
  alerts_check_activity(struct session *s, struct winlink *wl)
  {
  	struct client	*c;
--- 218,224 ----
  	return (WINDOW_BELL);
  }
  
! static int
  alerts_check_activity(struct session *s, struct winlink *wl)
  {
  	struct client	*c;
***************
*** 250,256 ****
  	return (WINDOW_ACTIVITY);
  }
  
! int
  alerts_check_silence(struct session *s, struct winlink *wl)
  {
  	struct client	*c;
--- 250,256 ----
  	return (WINDOW_ACTIVITY);
  }
  
! static int
  alerts_check_silence(struct session *s, struct winlink *wl)
  {
  	struct client	*c;
***************
*** 282,288 ****
  	return (WINDOW_SILENCE);
  }
  
! void
  alerts_ring_bell(struct session *s)
  {
  	struct client	*c;
--- 282,288 ----
  	return (WINDOW_SILENCE);
  }
  
! static void
  alerts_ring_bell(struct session *s)
  {
  	struct client	*c;