diff options
| author |   nicm <nicm@openbsd.org> | 2016-04-30 18:59:02 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2016-04-30 18:59:02 +0000 |
| commit | 6bc468a09992d714263afb663d579d5ca45ad166 (patch) | |
| tree | 4ede954abc666af2752a482dc2935bc6d41ee8da | |
| parent | Mask all gpio interrupts when we attach. Fixes interrupt storm on the Lenovo (diff) | |
| download | wireguard-openbsd-6bc468a09992d714263afb663d579d5ca45ad166.tar.xz wireguard-openbsd-6bc468a09992d714263afb663d579d5ca45ad166.zip | |
tty_client_ready can not be internal to tty.c again.
| -rw-r--r-- | usr.bin/tmux/server-client.c | 7 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 3 | ||||
| -rw-r--r-- | usr.bin/tmux/tty.c | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 6a7fddbc4b1..5f744ba1c79 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.185 2016/04/29 15:00:48 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.186 2016/04/30 18:59:02 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -854,10 +854,7 @@ server_client_reset_state(struct client *c) struct options *oo = c->session->options; int status, mode, o; - if (c->flags & CLIENT_SUSPENDED) - return; - - if (c->flags & CLIENT_CONTROL) + if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED)) return; tty_region(&c->tty, 0, c->tty.sy - 1); diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 78dd385f7d1..daa1d4f6200 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.627 2016/04/29 15:00:48 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.628 2016/04/30 18:59:02 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1725,7 +1725,6 @@ 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 *); diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c index 5e795e70c30..1c85d043a6a 100644 --- a/usr.bin/tmux/tty.c +++ b/usr.bin/tmux/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.200 2016/03/03 12:58:15 nicm Exp $ */ +/* $OpenBSD: tty.c,v 1.201 2016/04/30 18:59:02 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -42,6 +42,8 @@ static int tty_same_colours(const struct grid_cell *, const struct grid_cell *); static int tty_is_fg(const struct grid_cell *, int); static int tty_is_bg(const struct grid_cell *, int); +static int tty_client_ready(struct client *, struct window_pane *); + void tty_set_italics(struct tty *); int tty_try_256(struct tty *, u_char, const char *); int tty_try_rgb(struct tty *, const struct grid_cell_rgb *, const char *); @@ -776,7 +778,7 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp, tty_update_mode(tty, tty->mode, s); } -int +static int tty_client_ready(struct client *c, struct window_pane *wp) { if (c->session == NULL || c->tty.term == NULL) |