===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/tmux/server-client.c	2009/10/22 19:41:51	1.1
--- src/usr.bin/tmux/server-client.c	2009/10/22 20:04:21	1.2
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.1 2009/10/22 19:41:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.2 2009/10/22 20:04:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 175,181 ****
  
  		if (buffer_poll(fd, events, c->tty.in, c->tty.out) != 0)
  			goto client_lost;
- 		server_client_handle_data(c);
  	}
  
  	return;
--- 175,180 ----
***************
*** 184,191 ****
  	server_client_lost(c);
  }
  
! /* Input data from client. */
  void
  server_client_handle_data(struct client *c)
  {
  	struct window		*w;
--- 183,225 ----
  	server_client_lost(c);
  }
  
! /* Client functions that need to happen every loop. */
  void
+ server_client_loop(void)
+ {
+ 	struct client		*c;
+ 	struct window		*w;
+ 	struct window_pane	*wp;
+ 	u_int		 	 i;
+ 
+ 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+ 		c = ARRAY_ITEM(&clients, i);
+ 		if (c == NULL || c->session == NULL)
+ 			continue;
+ 
+ 		server_client_check_timers(c);
+ 		server_client_check_redraw(c);
+ 
+ 		server_client_handle_data(c);
+ 	}
+ 
+ 	/*
+ 	 * Any windows will have been redrawn as part of clients, so clear
+ 	 * their flags now.
+ 	 */
+ 	for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
+ 		w = ARRAY_ITEM(&windows, i);
+ 		if (w == NULL)
+ 			continue;
+ 
+ 		w->flags &= ~WINDOW_REDRAW;
+ 		TAILQ_FOREACH(wp, &w->panes, entry)
+ 			wp->flags &= ~PANE_REDRAW;
+ 	}
+ }
+ 
+ /* Handle data input or output from client. */
+ void
  server_client_handle_data(struct client *c)
  {
  	struct window		*w;
***************
*** 336,374 ****
  		mode |= MODE_MOUSE;
  	tty_update_mode(&c->tty, mode);
  	tty_reset(&c->tty);
- }
- 
- /* Client functions that need to happen every loop. */
- void
- server_client_loop(void)
- {
- 	struct client		*c;
- 	struct window		*w;
- 	struct window_pane	*wp;
- 	u_int		 	 i;
- 
- 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
- 		c = ARRAY_ITEM(&clients, i);
- 		if (c == NULL || c->session == NULL)
- 			continue;
- 
- 		server_client_check_timers(c);
- 		server_client_check_redraw(c);
- 	}
- 
- 	/*
- 	 * Any windows will have been redrawn as part of clients, so clear
- 	 * their flags now.
- 	 */
- 	for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
- 		w = ARRAY_ITEM(&windows, i);
- 		if (w == NULL)
- 			continue;
- 
- 		w->flags &= ~WINDOW_REDRAW;
- 		TAILQ_FOREACH(wp, &w->panes, entry)
- 			wp->flags &= ~PANE_REDRAW;
- 	}
  }
  
  /* Check for client redraws. */
--- 370,375 ----