diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2017-07-12 09:24:18 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2017-07-12 09:24:18 +0000 |
| commit | a0abd8f9b95def0ebf3cdf38b71291594a970daf (patch) | |
| tree | cab5f2792e4009b1bbea7e92a956d41df55504b1 /usr.bin/tmux/tmux.h | |
| parent | c9b01ab256541fdc54b723b8163431cc71fa516d (diff) | |
Move signal code into proc.c.
Diffstat (limited to 'usr.bin/tmux/tmux.h')
| -rw-r--r-- | usr.bin/tmux/tmux.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 7140564e83b..ed4a46eb201 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.794 2017/07/12 09:21:25 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.795 2017/07/12 09:24:17 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1485,6 +1485,7 @@ extern struct options *global_w_options; extern struct environ *global_environ; extern struct timeval start_time; extern const char *socket_path; +extern const char *shell_command; extern int ptm_fd; extern const char *shell_command; int areshell(const char *); @@ -1494,10 +1495,11 @@ const char *find_home(void); /* proc.c */ struct imsg; int proc_send(struct tmuxpeer *, enum msgtype, int, const void *, size_t); -struct tmuxproc *proc_start(const char *, struct event_base *, int, - void (*)(int)); +struct tmuxproc *proc_start(const char *); void proc_loop(struct tmuxproc *, int (*)(void)); void proc_exit(struct tmuxproc *); +void proc_set_signals(struct tmuxproc *, void(*)(int)); +void proc_clear_signals(struct tmuxproc *); struct tmuxpeer *proc_add_peer(struct tmuxproc *, int, void (*)(struct imsg *, void *), void *); void proc_remove_peer(struct tmuxpeer *); @@ -1857,7 +1859,7 @@ void server_clear_marked(void); int server_is_marked(struct session *, struct winlink *, struct window_pane *); int server_check_marked(void); -int server_start(struct event_base *, int, char *); +int server_start(struct tmuxproc *, struct event_base *, int, char *); void server_update_socket(void); void server_add_accept(int); @@ -2257,10 +2259,6 @@ void check_window_name(struct window *); char *default_window_name(struct window *); char *parse_window_name(const char *); -/* signal.c */ -void set_signals(void(*)(int, short, void *), void *); -void clear_signals(int); - /* control.c */ void control_callback(struct client *, int, void *); void printflike(2, 3) control_write(struct client *, const char *, ...); |