circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/77/head
Thomas Adam 2015-07-29 14:01:09 +01:00
parent a568aaa0c0 5ec3621101
commit 73b4d098ce
3 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server-client.c
View File

@ -114,8 +114,6 @@ server_client_create(int fd)
c->tty.sy = 24;
screen_init(&c->status, c->tty.sx, 1, 0);
RB_INIT(&c->status_new);
RB_INIT(&c->status_old);
c->message_string = NULL;
TAILQ_INIT(&c->message_log);

10
status.c
View File

@ -142,16 +142,6 @@ status_prompt_save_history(void)
}
/* Status output tree. */
RB_GENERATE(status_out_tree, status_out, entry, status_out_cmp);
/* Output tree comparison function. */
int
status_out_cmp(struct status_out *so1, struct status_out *so2)
{
return (strcmp(so1->cmd, so2->cmd));
}
/* Get screen line of status line. -1 means off. */
int
status_at_line(struct client *c)

15
tmux.h
View File

@ -1180,15 +1180,6 @@ struct message_entry {
TAILQ_ENTRY(message_entry) entry;
};
/* Status output data from a job. */
struct status_out {
char *cmd;
char *out;
RB_ENTRY(status_out) entry;
};
RB_HEAD(status_out_tree, status_out);
/* Client connection. */
struct client {
struct imsgbuf ibuf;
@ -1219,8 +1210,6 @@ struct client {
struct event repeat_timer;
struct status_out_tree status_old;
struct status_out_tree status_new;
struct timeval status_timer;
struct screen status;
@ -1908,11 +1897,7 @@ int server_set_stdin_callback(struct client *, void (*)(struct client *,
void server_unzoom_window(struct window *);
/* status.c */
int status_out_cmp(struct status_out *, struct status_out *);
RB_PROTOTYPE(status_out_tree, status_out, entry, status_out_cmp);
int status_at_line(struct client *);
void status_free_jobs(struct status_out_tree *);
void status_update_jobs(struct client *);
struct window *status_get_window_at(struct client *, u_int);
int status_redraw(struct client *);
void printflike(2, 3) status_message_set(struct client *, const char *, ...);