diff options
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 29 |
1 files changed, 14 insertions, 15 deletions
@@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.496 2009-11-04 22:46:25 tcunha Exp $ */ +/* $Id: tmux.h,v 1.497 2009-11-08 22:40:36 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -27,6 +27,7 @@ #include <sys/time.h> #include <sys/uio.h> +#include <event.h> #include <limits.h> #include <signal.h> #include <stdarg.h> @@ -659,6 +660,7 @@ struct job { struct client *client; int fd; + struct event event; struct buffer *out; void (*callbackfn)(struct job *); @@ -794,14 +796,17 @@ struct window_pane { char *cwd; pid_t pid; - int fd; char tty[TTY_NAME_MAX]; + + int fd; + struct event event; struct buffer *in; struct buffer *out; struct input_ctx ictx; int pipe_fd; + struct event pipe_event; struct buffer *pipe_buf; size_t pipe_off; @@ -996,6 +1001,7 @@ struct tty { struct tty_term *term; int fd; + struct event event; struct buffer *in; struct buffer *out; @@ -1060,6 +1066,7 @@ struct mouse_event { /* Client connection. */ struct client { struct imsgbuf ibuf; + struct event event; struct timeval creation_time; struct timeval activity_time; @@ -1233,12 +1240,6 @@ extern const struct set_option_entry set_option_table[]; extern const struct set_option_entry set_window_option_table[]; /* tmux.c */ -extern volatile sig_atomic_t sigwinch; -extern volatile sig_atomic_t sigterm; -extern volatile sig_atomic_t sigcont; -extern volatile sig_atomic_t sigchld; -extern volatile sig_atomic_t sigusr1; -extern volatile sig_atomic_t sigusr2; extern struct options global_s_options; extern struct options global_w_options; extern struct environ global_environ; @@ -1249,9 +1250,6 @@ extern time_t start_time; extern char *socket_path; extern int login_shell; void logfile(const char *); -void siginit(void); -void sigreset(void); -void sighandler(int); const char *getshell(void); int checkshell(const char *); int areshell(const char *); @@ -1580,23 +1578,24 @@ const char *key_string_lookup_key(int); extern struct clients clients; extern struct clients dead_clients; int server_start(char *); -void server_poll_add(int, int, void (*)(int, int, void *), void *); +void server_signal_set(void); +void server_signal_clear(void); /* server-client.c */ void server_client_create(int); void server_client_lost(struct client *); void server_client_prepare(void); -void server_client_callback(int, int, void *); +void server_client_callback(int, short, void *); void server_client_loop(void); /* server-job.c */ void server_job_prepare(void); -void server_job_callback(int, int, void *); +void server_job_callback(int, short, void *); void server_job_loop(void); /* server-window.c */ void server_window_prepare(void); -void server_window_callback(int, int, void *); +void server_window_callback(int, short, void *); void server_window_loop(void); /* server-fn.c */ |