Split the server code handling clients, jobs and windows off into separate

files from server.c (merging server-msg.c into the client file) and rather than
iterating over each set after poll(), allow a callback to be specified when the
fd is added and just walk once over the returned pollfds calling each callback
where needed.

More to come, getting this in so it is tested.

1 files changed, 281 insertions, 0 deletions

diff --git a/server-window.c b/server-window.c
new file mode 100644
index 00000000..d9ff128d
--- /dev/null
+++ b/server-window.c
@@ -0,0 +1,281 @@
+/* $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 <unistd.h>
+
+#include "tmux.h"
+
+int	server_window_check_bell(struct session *, struct window *);
+int	server_window_check_activity(struct session *, struct window *);
+int	server_window_check_content(
+	    struct session *, struct window *, struct window_pane *);
+void	server_window_check_alive(struct window *);
+
+/* Process a single window pane event. */
+void
+server_window_callback(int fd, int events, void *data)
+{
+	struct window_pane	*wp = data;
+
+	if (wp->fd == -1)
+		return;
+
+	if (fd == wp->fd) {
+		if (buffer_poll(fd, events, wp->in, wp->out) != 0) {
+			close(wp->fd);
+			wp->fd = -1;
+		} else
+			window_pane_parse(wp);
+	}
+
+	if (fd == wp->pipe_fd) {
+		if (buffer_poll(fd, events, NULL, wp->pipe_buf) != 0) {
+			buffer_destroy(wp->pipe_buf);
+			close(wp->pipe_fd);
+			wp->pipe_fd = -1;
+		}
+	}
+}
+
+/* Window functions that need to happen every loop. */
+void
+server_window_loop(void)
+{
+	struct window		*w;
+	struct window_pane	*wp;
+	struct session		*s;
+	u_int		 	 i, j;
+
+	for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
+		w = ARRAY_ITEM(&windows, i);
+		if (w == NULL)
+			continue;
+
+		for (j = 0; j < ARRAY_LENGTH(&sessions); j++) {
+			s = ARRAY_ITEM(&sessions, j);
+			if (s == NULL || !session_has(s, w))
+				continue;
+			
+			if (server_window_check_bell(s, w) ||
+			    server_window_check_activity(s, w))
+				server_status_session(s);
+			TAILQ_FOREACH(wp, &w->panes, entry)
+				server_window_check_content(s, w, wp);
+		}
+		w->flags &= ~(WINDOW_BELL|WINDOW_ACTIVITY|WINDOW_CONTENT);
+
+		server_window_check_alive(w);
+	}
+
+	set_window_names();
+}
+
+/* Check for bell in window. */
+int
+server_window_check_bell(struct session *s, struct window *w)
+{
+	struct client	*c;
+	u_int		 i;
+	int		 action, visual;
+
+	if (!(w->flags & WINDOW_BELL))
+		return (0);
+
+	if (session_alert_has_window(s, w, WINDOW_BELL))
+		return (0);
+	session_alert_add(s, w, WINDOW_BELL);
+
+	action = options_get_number(&s->options, "bell-action");
+	switch (action) {
+	case BELL_ANY:
+		if (s->flags & SESSION_UNATTACHED)
+			break;
+		visual = options_get_number(&s->options, "visual-bell");
+		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+			c = ARRAY_ITEM(&clients, i);
+			if (c == NULL || c->session != s)
+				continue;
+			if (!visual) {
+				tty_putcode(&c->tty, TTYC_BEL);
+				continue;
+			}
+ 			if (c->session->curw->window == w) {
+				status_message_set(c, "Bell in current window");
+				continue;
+			}
+			status_message_set(c, "Bell in window %u",
+			    winlink_find_by_window(&s->windows, w)->idx);
+		}
+		break;
+	case BELL_CURRENT:
+		if (s->flags & SESSION_UNATTACHED)
+			break;
+		visual = options_get_number(&s->options, "visual-bell");
+		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+			c = ARRAY_ITEM(&clients, i);
+			if (c == NULL || c->session != s)
+				continue;
+ 			if (c->session->curw->window != w)
+				continue;
+			if (!visual) {
+				tty_putcode(&c->tty, TTYC_BEL);
+				continue;
+			}
+			status_message_set(c, "Bell in current window");
+		}
+		break;
+	}
+
+	return (1);
+}
+
+/* Check for activity in window. */
+int
+server_window_check_activity(struct session *s, struct window *w)
+{
+	struct client	*c;
+	u_int		 i;
+
+	if (!(w->flags & WINDOW_ACTIVITY))
+		return (0);
+	if (s->curw->window == w)
+		return (0);
+
+ 	if (!options_get_number(&w->options, "monitor-activity"))
+		return (0);
+
+	if (session_alert_has_window(s, w, WINDOW_ACTIVITY))
+		return (0);
+	session_alert_add(s, w, WINDOW_ACTIVITY);
+
+	if (s->flags & SESSION_UNATTACHED)
+		return (0);
+ 	if (options_get_number(&s->options, "visual-activity")) {
+		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+			c = ARRAY_ITEM(&clients, i);
+			if (c == NULL || c->session != s)
+				continue;
+			status_message_set(c, "Activity in window %u",
+			    winlink_find_by_window(&s->windows, w)->idx);
+		}
+	}
+
+	return (1);
+}
+
+/* Check for content change in window. */
+int
+server_window_check_content(
+    struct session *s, struct window *w, struct window_pane *wp)
+{
+	struct client	*c;
+	u_int		 i;
+	char		*found, *ptr;
+	
+	if (!(w->flags & WINDOW_ACTIVITY))	/* activity for new content */
+		return (0);
+	if (s->curw->window == w)
+		return (0);
+
+	ptr = options_get_string(&w->options, "monitor-content");
+	if (ptr == NULL || *ptr == '\0')
+		return (0);
+
+	if (session_alert_has_window(s, w, WINDOW_CONTENT))
+		return (0);
+
+	if ((found = window_pane_search(wp, ptr, NULL)) == NULL)
+		return (0);
+    	xfree(found);
+
+	session_alert_add(s, w, WINDOW_CONTENT);
+	if (s->flags & SESSION_UNATTACHED)
+		return (0);
+ 	if (options_get_number(&s->options, "visual-content")) {
+		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+			c = ARRAY_ITEM(&clients, i);
+			if (c == NULL || c->session != s)
+				continue;
+			status_message_set(c, "Content in window %u",
+			    winlink_find_by_window(&s->windows, w)->idx);
+		}
+	}
+
+	return (1);
+}
+
+/* Check if window still exists. */
+void
+server_window_check_alive(struct window *w)
+{
+	struct window_pane	*wp, *wq;
+	struct options		*oo = &w->options;
+	struct session		*s;
+	struct winlink		*wl;
+	u_int		 	 i;
+	int		 	 destroyed;
+
+	destroyed = 1;
+
+	wp = TAILQ_FIRST(&w->panes);
+	while (wp != NULL) {
+		wq = TAILQ_NEXT(wp, entry);
+		/*
+		 * If the pane has died and the remain-on-exit flag is not set,
+		 * remove the pane; otherwise, if the flag is set, don't allow
+		 * the window to be destroyed (or it'll close when the last
+		 * pane dies).
+		 */
+		if (wp->fd == -1 && !options_get_number(oo, "remain-on-exit")) {
+			layout_close_pane(wp);
+			window_remove_pane(w, wp);
+			server_redraw_window(w);
+		} else 
+			destroyed = 0;
+		wp = wq;
+	}
+
+	if (!destroyed)
+		return;
+
+	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
+		s = ARRAY_ITEM(&sessions, i);
+		if (s == NULL)
+			continue;
+		if (!session_has(s, w))
+			continue;
+
+	restart:
+		/* Detach window and either redraw or kill clients. */
+		RB_FOREACH(wl, winlinks, &s->windows) {
+			if (wl->window != w)
+				continue;
+			if (session_detach(s, wl)) {
+				server_destroy_session_group(s);
+				break;
+			}
+			server_redraw_session(s);
+			server_status_session_group(s);
+			goto restart;
+		}
+	}
+
+	recalculate_sizes();
+}