Sync OpenBSD patchset 433:

Client tidying: get rid of client_ctx struct in favour of two variables in
client.c, and move the functions in client-fn.c into other files.
This commit is contained in:
Tiago Cunha
2009-10-23 17:32:26 +00:00
parent c6828bf32b
commit 84392ffc0d
4 changed files with 142 additions and 218 deletions

25
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.482 2009-10-23 17:27:40 tcunha Exp $ */
/* $Id: tmux.h,v 1.483 2009-10-23 17:32:26 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1050,19 +1050,6 @@ struct client {
};
ARRAY_DECL(clients, struct client *);
/* Client context. */
struct client_ctx {
struct imsgbuf ibuf;
enum {
CCTX_DETACH,
CCTX_EXIT,
CCTX_DIED,
CCTX_SHUTDOWN
} exittype;
const char *errstr;
};
/* Key/command line command. */
struct cmd_ctx {
/*
@ -1501,14 +1488,8 @@ void cmd_buffer_free(struct cmd *);
size_t cmd_buffer_print(struct cmd *, char *, size_t);
/* client.c */
int client_init(char *, struct client_ctx *, int, int);
int client_main(struct client_ctx *);
int client_msg_dispatch(struct client_ctx *);
/* client-fn.c */
void client_write_server(struct client_ctx *, enum msgtype, void *, size_t);
void client_fill_session(struct msg_command_data *);
void client_suspend(void);
struct imsgbuf *client_init(char *, int, int);
__dead void client_main(void);
/* key-bindings.c */
extern struct key_bindings key_bindings;