Sync OpenBSD patchset 1045:

Remove some bits leftover from unused backoff code.
This commit is contained in:
Tiago Cunha 2012-03-18 01:33:56 +00:00
parent 1fdac2adf1
commit 166681eee9
3 changed files with 1 additions and 6 deletions

View File

@ -31,7 +31,6 @@ void server_client_check_mouse(struct client *c,
void server_client_handle_key(int, struct mouse_event *, void *); void server_client_handle_key(int, struct mouse_event *, void *);
void server_client_repeat_timer(int, short, void *); void server_client_repeat_timer(int, short, void *);
void server_client_check_exit(struct client *); void server_client_check_exit(struct client *);
void server_client_check_backoff(struct client *);
void server_client_check_redraw(struct client *); void server_client_check_redraw(struct client *);
void server_client_set_title(struct client *); void server_client_set_title(struct client *);
void server_client_reset_state(struct client *); void server_client_reset_state(struct client *);

4
tmux.h
View File

@ -55,9 +55,6 @@ extern char **environ;
/* Automatic name refresh interval, in milliseconds. */ /* Automatic name refresh interval, in milliseconds. */
#define NAME_INTERVAL 500 #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 * Maximum sizes of strings in message data. Don't forget to bump
* PROTOCOL_VERSION if any of these change! * PROTOCOL_VERSION if any of these change!
@ -1044,7 +1041,6 @@ struct tty {
#define TTY_UTF8 0x8 #define TTY_UTF8 0x8
#define TTY_STARTED 0x10 #define TTY_STARTED 0x10
#define TTY_OPENED 0x20 #define TTY_OPENED 0x20
#define TTY_BACKOFF 0x40
int flags; int flags;
int term_flags; int term_flags;

2
tty.c
View File

@ -627,7 +627,7 @@ tty_write(
if (s->curw->window == wp->window) { if (s->curw->window == wp->window) {
if (c->tty.term == NULL) if (c->tty.term == NULL)
continue; continue;
if (c->tty.flags & (TTY_FREEZE|TTY_BACKOFF)) if (c->tty.flags & TTY_FREEZE)
continue; continue;
oo = &s->options; oo = &s->options;