===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/server-window.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/tmux/Attic/server-window.c	2009/11/04 08:35:11	1.4
--- src/usr.bin/tmux/Attic/server-window.c	2009/11/04 20:50:11	1.5
***************
*** 1,4 ****
! /* $OpenBSD: server-window.c,v 1.4 2009/11/04 08:35:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-window.c,v 1.5 2009/11/04 20:50:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 18,23 ****
--- 18,24 ----
  
  #include <sys/types.h>
  
+ #include <event.h>
  #include <unistd.h>
  
  #include "tmux.h"
***************
*** 47,65 ****
  				continue;
  			events = 0;
  			if (!server_window_backoff(wp))
! 				events |= POLLIN;
  			if (BUFFER_USED(wp->out) > 0)
! 				events |= POLLOUT;
! 			server_poll_add(
  			    wp->fd, events, server_window_callback, wp);
  
  			if (wp->pipe_fd == -1)
  				continue;
  			events = 0;
  			if (BUFFER_USED(wp->pipe_buf) > 0)
! 				events |= POLLOUT;
! 			server_poll_add(
  			    wp->pipe_fd, events, server_window_callback, wp);
  		}
  	}
  }
--- 48,70 ----
  				continue;
  			events = 0;
  			if (!server_window_backoff(wp))
! 				events = EV_READ;
  			if (BUFFER_USED(wp->out) > 0)
! 				events |= EV_WRITE;
! 			event_del(&wp->event);
! 			event_set(&wp->event,
  			    wp->fd, events, server_window_callback, wp);
+ 			event_add(&wp->event, NULL);
  
  			if (wp->pipe_fd == -1)
  				continue;
  			events = 0;
  			if (BUFFER_USED(wp->pipe_buf) > 0)
! 				events |= EV_WRITE;
! 			event_del(&wp->pipe_event);
! 			event_set(&wp->pipe_event,
  			    wp->pipe_fd, events, server_window_callback, wp);
+ 			event_add(&wp->pipe_event, NULL);
  		}
  	}
  }
***************
*** 90,96 ****
  
  /* Process a single window pane event. */
  void
! server_window_callback(int fd, int events, void *data)
  {
  	struct window_pane	*wp = data;
  
--- 95,101 ----
  
  /* Process a single window pane event. */
  void
! server_window_callback(int fd, short events, void *data)
  {
  	struct window_pane	*wp = data;