From 5f2bfd980737d2f13b744e288532e5d2daf97a0f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 29 Apr 2016 13:21:33 +0000
Subject: Make the grid_cell passed into screen_write_* const.

---
 tmux.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 0b868537..0ceb14e9 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2034,15 +2034,15 @@ void	 screen_write_stop(struct screen_write_ctx *);
 void	 screen_write_reset(struct screen_write_ctx *);
 size_t printflike(1, 2) screen_write_cstrlen(const char *, ...);
 void printflike(4, 5) screen_write_cnputs(struct screen_write_ctx *,
-	     ssize_t, struct grid_cell *, const char *, ...);
+	     ssize_t, const struct grid_cell *, const char *, ...);
 size_t printflike(1, 2) screen_write_strlen(const char *, ...);
 void printflike(3, 4) screen_write_puts(struct screen_write_ctx *,
-	     struct grid_cell *, const char *, ...);
+	     const struct grid_cell *, const char *, ...);
 void printflike(4, 5) screen_write_nputs(struct screen_write_ctx *,
-	     ssize_t, struct grid_cell *, const char *, ...);
+	     ssize_t, const struct grid_cell *, const char *, ...);
 void	 screen_write_vnputs(struct screen_write_ctx *, ssize_t,
-	     struct grid_cell *, const char *, va_list);
-void	 screen_write_putc(struct screen_write_ctx *, struct grid_cell *,
+	     const struct grid_cell *, const char *, va_list);
+void	 screen_write_putc(struct screen_write_ctx *, const struct grid_cell *,
 	     u_char);
 void	 screen_write_copy(struct screen_write_ctx *, struct screen *, u_int,
 	     u_int, u_int, u_int);
-- 
cgit 


From c5443da2d3bd5ef2464cc59941e55890aaff3fb0 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 29 Apr 2016 13:36:10 +0000
Subject: The backoff timer is causing no end of trouble with disconnected
 clients stopping data in attached ones. So get rid of it and see how we get
 on with just a high watermark on each pane.

---
 tmux.h | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 0ceb14e9..d6cf114e 100644
--- a/tmux.h
+++ b/tmux.h
@@ -60,15 +60,8 @@ struct tmuxproc;
 /* Automatic name refresh interval, in microseconds. Must be < 1 second. */
 #define NAME_INTERVAL 500000
 
-/*
- * 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
+/* The maximum amount of data to hold from a pty (the event high watermark). */
+#define READ_SIZE 128
 
 /* Attribute to make gcc check printf-like arguments. */
 #define printflike(a, b) __attribute__ ((format (printf, a, b)))
@@ -889,7 +882,6 @@ struct window_pane {
 
 	int		 fd;
 	struct bufferevent *event;
-	struct event	 timer;
 
 	struct input_ctx *ictx;
 
-- 
cgit