diff options
| author | nicm <nicm> | 2016-04-30 18:59:02 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2016-04-30 18:59:02 +0000 |
| commit | 88bd5b15ffc59f826e1e24ed7a233c8cb7c3afe5 (patch) | |
| tree | d747a83749669f5597b6e8bdb6ce92238a492211 | |
| parent | 0c7895076e1b2c87956fd594ae4408f6de3432ca (diff) | |
| download | rtmux-88bd5b15ffc59f826e1e24ed7a233c8cb7c3afe5.tar.gz rtmux-88bd5b15ffc59f826e1e24ed7a233c8cb7c3afe5.tar.bz2 rtmux-88bd5b15ffc59f826e1e24ed7a233c8cb7c3afe5.zip | |
tty_client_ready can not be internal to tty.c again.
| -rw-r--r-- | server-client.c | 5 | ||||
| -rw-r--r-- | tmux.h | 1 | ||||
| -rw-r--r-- | tty.c | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/server-client.c b/server-client.c index 08f48b31..11995f40 100644 --- a/server-client.c +++ b/server-client.c @@ -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); @@ -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 *); @@ -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) |