Move alerts onto events rather than checking every loop.

1 files changed, 0 insertions, 191 deletions

diff --git a/server-window.c b/server-window.c
deleted file mode 100644
index be1dde2a..00000000
--- a/server-window.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* $OpenBSD$ */
-
-/*
- * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <event.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "tmux.h"
-
-int	server_window_check_bell(struct session *, struct winlink *);
-int	server_window_check_activity(struct session *, struct winlink *);
-int	server_window_check_silence(struct session *, struct winlink *);
-void	ring_bell(struct session *);
-
-/* Window functions that need to happen every loop. */
-void
-server_window_loop(void)
-{
-	struct window	*w;
-	struct session	*s;
-	struct winlink	*wl;
-
-	RB_FOREACH(w, windows, &windows) {
-		RB_FOREACH(s, sessions, &sessions) {
-			RB_FOREACH(wl, winlinks, &s->windows) {
-				if (wl->window != w)
-					continue;
-
-				if (server_window_check_bell(s, wl) ||
-				    server_window_check_activity(s, wl) ||
-				    server_window_check_silence(s, wl))
-					server_status_session(s);
-			}
-		}
-		check_window_name(w);
-	}
-}
-
-/* Check for bell in window. */
-int
-server_window_check_bell(struct session *s, struct winlink *wl)
-{
-	struct client	*c;
-	struct window	*w = wl->window;
-	int		 action, visual;
-
-	if (!(w->flags & WINDOW_BELL) || wl->flags & WINLINK_BELL)
-		return (0);
-	if (s->curw != wl || s->flags & SESSION_UNATTACHED)
-		wl->flags |= WINLINK_BELL;
-	if (s->flags & SESSION_UNATTACHED)
-		return (0);
-	if (s->curw->window == w)
-		w->flags &= ~WINDOW_BELL;
-
-	visual = options_get_number(&s->options, "visual-bell");
-	action = options_get_number(&s->options, "bell-action");
-	if (action == BELL_NONE)
-		return (0);
-	TAILQ_FOREACH(c, &clients, entry) {
-		if (c->session != s || c->flags & CLIENT_CONTROL)
-			continue;
-		if (!visual) {
-			if ((action == BELL_CURRENT &&
-			    c->session->curw->window == w) ||
-			    (action == BELL_OTHER &&
-			    c->session->curw->window != w) ||
-			    action == BELL_ANY)
-				tty_bell(&c->tty);
-			continue;
-		}
-		if (action == BELL_CURRENT && c->session->curw->window == w)
-			status_message_set(c, "Bell in current window");
-		else if (action == BELL_ANY || (action == BELL_OTHER &&
-		    c->session->curw->window != w))
-			status_message_set(c, "Bell in window %d", wl->idx);
-	}
-
-	return (1);
-}
-
-/* Check for activity in window. */
-int
-server_window_check_activity(struct session *s, struct winlink *wl)
-{
-	struct client	*c;
-	struct window	*w = wl->window;
-
-	if (s->curw->window == w)
-		w->flags &= ~WINDOW_ACTIVITY;
-
-	if (!(w->flags & WINDOW_ACTIVITY) || wl->flags & WINLINK_ACTIVITY)
-		return (0);
-	if (s->curw == wl && !(s->flags & SESSION_UNATTACHED))
-		return (0);
-
-	if (!options_get_number(&w->options, "monitor-activity"))
-		return (0);
-
-	if (options_get_number(&s->options, "bell-on-alert"))
-		ring_bell(s);
-	wl->flags |= WINLINK_ACTIVITY;
-
-	if (options_get_number(&s->options, "visual-activity")) {
-		TAILQ_FOREACH(c, &clients, entry) {
-			if (c->session != s)
-				continue;
-			status_message_set(c, "Activity in window %d", wl->idx);
-		}
-	}
-
-	return (1);
-}
-
-/* Check for silence in window. */
-int
-server_window_check_silence(struct session *s, struct winlink *wl)
-{
-	struct client	*c;
-	struct window	*w = wl->window;
-	struct timeval	 timer;
-	int		 silence_interval, timer_difference;
-
-	if (!(w->flags & WINDOW_SILENCE) || wl->flags & WINLINK_SILENCE)
-		return (0);
-
-	if (s->curw == wl && !(s->flags & SESSION_UNATTACHED)) {
-		/*
-		 * Reset the timer for this window if we've focused it.  We
-		 * don't want the timer tripping as soon as we've switched away
-		 * from this window.
-		 */
-		if (gettimeofday(&w->silence_timer, NULL) != 0)
-			fatal("gettimeofday failed");
-
-		return (0);
-	}
-
-	silence_interval = options_get_number(&w->options, "monitor-silence");
-	if (silence_interval == 0)
-		return (0);
-
-	if (gettimeofday(&timer, NULL) != 0)
-		fatal("gettimeofday");
-	timer_difference = timer.tv_sec - w->silence_timer.tv_sec;
-	if (timer_difference <= silence_interval)
-		return (0);
-
-	if (options_get_number(&s->options, "bell-on-alert"))
-		ring_bell(s);
-	wl->flags |= WINLINK_SILENCE;
-
-	if (options_get_number(&s->options, "visual-silence")) {
-		TAILQ_FOREACH(c, &clients, entry) {
-			if (c->session != s)
-				continue;
-			status_message_set(c, "Silence in window %d", wl->idx);
-		}
-	}
-
-	return (1);
-}
-
-/* Ring terminal bell. */
-void
-ring_bell(struct session *s)
-{
-	struct client	*c;
-
-	TAILQ_FOREACH(c, &clients, entry) {
-		if (c->session == s && !(c->flags & CLIENT_CONTROL))
-			tty_bell(&c->tty);
-	}
-}