circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-02 22:08:49 +00:00
Code Issues Projects Releases Wiki Activity

tty_client_ready can not be internal to tty.c again.

Browse Source
This commit is contained in:
nicm 2016-04-30 18:59:02 +00:00
parent 0c7895076e
commit 88bd5b15ff
3 changed files with 4 additions and 6 deletions

5
server-client.c
View File

@ -854,10 +854,7 @@ server_client_reset_state(struct client *c)
struct options *oo = c->session->options; struct options *oo = c->session->options;
int status, mode, o; int status, mode, o;
if (c->flags & CLIENT_SUSPENDED) if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))
return;
if (c->flags & CLIENT_CONTROL)
return; return;
tty_region(&c->tty, 0, c->tty.sy - 1); tty_region(&c->tty, 0, c->tty.sy - 1);

1
tmux.h
View File

@ -1725,7 +1725,6 @@ void tty_close(struct tty *);
void tty_free(struct tty *); void tty_free(struct tty *);
void tty_write(void (*)(struct tty *, const struct tty_ctx *), void tty_write(void (*)(struct tty *, const struct tty_ctx *),
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_alignmenttest(struct tty *, const struct tty_ctx *);
void tty_cmd_cell(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 *); void tty_cmd_clearendofline(struct tty *, const struct tty_ctx *);

4
tty.c
View File

@ -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_fg(const struct grid_cell *, int);
static int tty_is_bg(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 *); void tty_set_italics(struct tty *);
int tty_try_256(struct tty *, u_char, const char *); int tty_try_256(struct tty *, u_char, const char *);
int tty_try_rgb(struct tty *, const struct grid_cell_rgb *, 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); tty_update_mode(tty, tty->mode, s);
} }
int static int
tty_client_ready(struct client *c, struct window_pane *wp) tty_client_ready(struct client *c, struct window_pane *wp)
{ {
if (c->session == NULL || c->tty.term == NULL) if (c->session == NULL || c->tty.term == NULL)