===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.513
retrieving revision 1.514
diff -c -r1.513 -r1.514
*** src/usr.bin/tmux/tmux.h	2015/05/12 15:27:46	1.513
--- src/usr.bin/tmux/tmux.h	2015/05/12 22:40:38	1.514
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.513 2015/05/12 15:27:46 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.514 2015/05/12 22:40:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 56,61 ****
--- 56,71 ----
   */
  #define UTF8_SIZE 9
  
+ /*
+  * READ_SIZE is the maximum size of data to hold from a pty (the event high
+  * watermark). READ_BACKOFF is the amount of data waiting to be output to a tty
+  * before pty reads will be backed off. READ_TIME is how long to back off
+  * before the next read (in microseconds) if a tty is above READ_BACKOFF.
+  */
+ #define READ_SIZE 1024
+ #define READ_BACKOFF 512
+ #define READ_TIME 100
+ 
  /* Fatal errors. */
  #define fatal(msg) log_fatal("%s: %s", __func__, msg);
  #define fatalx(msg) log_fatalx("%s: %s", __func__, msg);
***************
*** 847,852 ****
--- 857,863 ----
  
  	int		 fd;
  	struct bufferevent *event;
+ 	struct event	 timer;
  
  	struct input_ctx *ictx;
  
***************
*** 1595,1602 ****
  int	tty_open(struct tty *, char **);
  void	tty_close(struct tty *);
  void	tty_free(struct tty *);
! void	tty_write(
! 	    void (*)(struct tty *, const struct tty_ctx *), struct tty_ctx *);
  void	tty_cmd_alignmenttest(struct tty *, const struct tty_ctx *);
  void	tty_cmd_cell(struct tty *, const struct tty_ctx *);
  void	tty_cmd_clearendofline(struct tty *, const struct tty_ctx *);
--- 1606,1614 ----
  int	tty_open(struct tty *, char **);
  void	tty_close(struct tty *);
  void	tty_free(struct tty *);
! void	tty_write(void (*)(struct tty *, const struct tty_ctx *),
! 	    struct tty_ctx *);
! int	tty_client_ready(struct client *, struct window_pane *wp);
  void	tty_cmd_alignmenttest(struct tty *, const struct tty_ctx *);
  void	tty_cmd_cell(struct tty *, const struct tty_ctx *);
  void	tty_cmd_clearendofline(struct tty *, const struct tty_ctx *);