mirror of
https://github.com/tmux/tmux.git
synced 2026-10-10 20:24:21 +00:00
Merge branch 'master' into fp-merge
This commit is contained in:
16
tmux.h
16
tmux.h
@@ -1305,6 +1305,7 @@ struct window_pane {
|
||||
char tty[TTY_NAME_MAX];
|
||||
int status;
|
||||
struct timeval dead_time;
|
||||
struct cmdq_item *block_item; /* new-pane -B: waiting for pane exit */
|
||||
|
||||
int fd;
|
||||
struct bufferevent *event;
|
||||
@@ -2436,6 +2437,7 @@ void proc_flush_peer(struct tmuxpeer *);
|
||||
void proc_toggle_log(struct tmuxproc *);
|
||||
pid_t proc_fork_and_daemon(int *);
|
||||
uid_t proc_get_peer_uid(struct tmuxpeer *);
|
||||
gid_t proc_get_peer_gid(struct tmuxpeer *);
|
||||
|
||||
/* cfg.c */
|
||||
extern int cfg_finished;
|
||||
@@ -3433,6 +3435,7 @@ struct window *window_find_by_id(u_int);
|
||||
void window_update_activity(struct window *);
|
||||
struct window *window_create(u_int, u_int, u_int, u_int);
|
||||
void window_pane_set_event(struct window_pane *);
|
||||
void window_pane_block_finish(struct window_pane *);
|
||||
struct window_pane *window_get_active_at(struct window *, u_int, u_int);
|
||||
struct window_pane *window_find_string(struct window *, const char *);
|
||||
int window_has_floating_panes(struct window *);
|
||||
@@ -3875,15 +3878,16 @@ struct screen *sixel_to_screen(struct sixel_image *);
|
||||
#endif
|
||||
|
||||
/* server-acl.c */
|
||||
#define SERVER_ACL_READONLY 0x1
|
||||
#define SERVER_ACL_IS_GROUP 0x2
|
||||
void server_acl_init(void);
|
||||
struct server_acl_user *server_acl_user_find(uid_t);
|
||||
int server_acl_find(id_t, int);
|
||||
void server_acl_display(struct cmdq_item *);
|
||||
void server_acl_user_allow(uid_t);
|
||||
void server_acl_user_deny(uid_t);
|
||||
void server_acl_user_allow_write(uid_t);
|
||||
void server_acl_user_deny_write(uid_t);
|
||||
void server_acl_allow(id_t, int);
|
||||
void server_acl_deny(id_t, int);
|
||||
void server_acl_allow_write(id_t, int);
|
||||
void server_acl_deny_write(id_t, int);
|
||||
int server_acl_join(struct client *);
|
||||
uid_t server_acl_get_uid(struct server_acl_user *);
|
||||
|
||||
/* hyperlink.c */
|
||||
u_int hyperlinks_put(struct hyperlinks *, const char *,
|
||||
|
||||
Reference in New Issue
Block a user