mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 01:34:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2016-05-01 14:01:12 +01:00
parent 2b9f8ae485 87be2da4e1
commit fe4ef307b7
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server-client.c
View File

@@ -862,10 +862,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);

3
tmux.1
View File

@@ -3541,9 +3541,10 @@ The following variables are available, where appropriate:
.It Li "session_name" Ta "#S" Ta "Name of session" .It Li "session_name" Ta "#S" Ta "Name of session"
.It Li "session_width" Ta "" Ta "Width of session" .It Li "session_width" Ta "" Ta "Width of session"
.It Li "session_windows" Ta "" Ta "Number of windows in session" .It Li "session_windows" Ta "" Ta "Number of windows in session"
.It Li "socket_path" Ta "" "Server socket path" .It Li "socket_path" Ta "" Ta "Server socket path"
.It Li "start_time" Ta "" Ta "Server start time" .It Li "start_time" Ta "" Ta "Server start time"
.It Li "window_activity" Ta "" Ta "Integer time of window last activity" .It Li "window_activity" Ta "" Ta "Integer time of window last activity"
.It Li "window_activity_flag" Ta "" Ta "1 if window has activity"
.It Li "window_active" Ta "" Ta "1 if window active" .It Li "window_active" Ta "" Ta "1 if window active"
.It Li "window_bell_flag" Ta "" Ta "1 if window has bell" .It Li "window_bell_flag" Ta "" Ta "1 if window has bell"
.It Li "window_find_matches" Ta "" Ta "Matched data from the find-window" .It Li "window_find_matches" Ta "" Ta "Matched data from the find-window"

1
tmux.h
View File

@@ -1727,7 +1727,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)