summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/tmux/server-client.c3
-rw-r--r--usr.bin/tmux/tmux.h6
-rw-r--r--usr.bin/tmux/tty.c4
3 files changed, 4 insertions, 9 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c
index cddbe32c691..ea8baa37c50 100644
--- a/usr.bin/tmux/server-client.c
+++ b/usr.bin/tmux/server-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.67 2012/02/02 00:04:54 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.68 2012/03/09 21:42:13 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,6 @@ void server_client_check_mouse(struct client *c,
void server_client_handle_key(int, struct mouse_event *, void *);
void server_client_repeat_timer(int, short, void *);
void server_client_check_exit(struct client *);
-void server_client_check_backoff(struct client *);
void server_client_check_redraw(struct client *);
void server_client_set_title(struct client *);
void server_client_reset_state(struct client *);
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 571a9fce4e2..b57d86dfe82 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.319 2012/03/09 09:57:40 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.320 2012/03/09 21:42:13 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -59,9 +59,6 @@ extern char **environ;
/* Automatic name refresh interval, in milliseconds. */
#define NAME_INTERVAL 500
-/* Maximum data to buffer for output before suspending writing to a tty. */
-#define BACKOFF_THRESHOLD 16384
-
/*
* Maximum sizes of strings in message data. Don't forget to bump
* PROTOCOL_VERSION if any of these change!
@@ -1048,7 +1045,6 @@ struct tty {
#define TTY_UTF8 0x8
#define TTY_STARTED 0x10
#define TTY_OPENED 0x20
-#define TTY_BACKOFF 0x40
int flags;
int term_flags;
diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index 6ba77cc7a19..fcefcbb6f4d 100644
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.115 2012/03/03 09:43:23 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.116 2012/03/09 21:42:13 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -627,7 +627,7 @@ tty_write(
if (s->curw->window == wp->window) {
if (c->tty.term == NULL)
continue;
- if (c->tty.flags & (TTY_FREEZE|TTY_BACKOFF))
+ if (c->tty.flags & TTY_FREEZE)
continue;
oo = &s->options;