circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-05 16:27:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-10-28 12:01:11 +00:00
parent da1f6fc2c8 bf9c933cae
commit a5e4d3a2d8
19 changed files with 125 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tmux.h
View File

@ -39,6 +39,15 @@
extern char *__progname;
extern char **environ;
struct client;
struct environ;
struct input_ctx;
struct mouse_event;
struct options;
struct session;
struct tmuxpeer;
struct tmuxproc;
/* Default global configuration file. */
#define TMUX_CONF "/etc/tmux.conf"
@ -765,9 +774,6 @@ struct screen_write_ctx {
* Window mode. Windows can be in several modes and this is used to call the
* right function to handle input and output.
*/
struct client;
struct session;
struct mouse_event;
struct window_mode {
struct screen *(*init)(struct window_pane *);
void (*free)(struct window_pane *);
@ -799,7 +805,6 @@ struct window_choose_data {
};
/* Child window structure. */
struct input_ctx;
struct window_pane {
u_int id;
u_int active_point;
@ -864,7 +869,6 @@ TAILQ_HEAD(window_panes, window_pane);
RB_HEAD(window_pane_tree, window_pane);
/* Window structure. */
struct options;
struct window {
u_int id;
@ -962,7 +966,6 @@ struct environ_entry {
RB_ENTRY(environ_entry) entry;
};
RB_HEAD(environ, environ_entry);
/* Client session. */
struct session_group {
@ -1001,7 +1004,7 @@ struct session {
struct termios *tio;
struct environ environ;
struct environ *environ;
int references;
@ -1167,8 +1170,6 @@ struct message_entry {
};
/* Client connection. */
struct tmuxproc;
struct tmuxpeer;
struct client {
struct tmuxpeer *peer;
@ -1180,7 +1181,7 @@ struct client {
struct timeval creation_time;
struct timeval activity_time;
struct environ environ;
struct environ *environ;
char *title;
int cwd;
@ -1407,7 +1408,7 @@ struct options_table_entry {
extern struct options *global_options;
extern struct options *global_s_options;
extern struct options *global_w_options;
extern struct environ global_environ;
extern struct environ *global_environ;
extern char *shell_cmd;
extern int debug_level;
extern time_t start_time;
@ -1544,10 +1545,10 @@ void job_free(struct job *);
void job_died(struct job *, int);
/* environ.c */
int environ_cmp(struct environ_entry *, struct environ_entry *);
RB_PROTOTYPE(environ, environ_entry, entry, environ_cmp);
void environ_init(struct environ *);
struct environ *environ_create(void);
void environ_free(struct environ *);
struct environ_entry *environ_first(struct environ *);
struct environ_entry *environ_next(struct environ_entry *);
void environ_copy(struct environ *, struct environ *);
struct environ_entry *environ_find(struct environ *, const char *);
void environ_set(struct environ *, const char *, const char *);