aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-06-05 10:01:22 +0100
committerThomas Adam <thomas@xteddy.org>2020-06-05 10:01:22 +0100
commita06cf900c7f8443a63005b6a2c59d11095d2a259 (patch)
tree6d4882ef037117aaf9c8663e5fb42a96f7966000 /tmux.h
parent976cf6c60fbb7bb95a805ce451281bf9dd5d43f8 (diff)
parent4e5e2c19d0bb9aaad12ddd6dd0fc50a150a6c0cb (diff)
downloadrtmux-a06cf900c7f8443a63005b6a2c59d11095d2a259.tar.gz
rtmux-a06cf900c7f8443a63005b6a2c59d11095d2a259.tar.bz2
rtmux-a06cf900c7f8443a63005b6a2c59d11095d2a259.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/tmux.h b/tmux.h
index 1105b5a4..9b3bf216 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1577,7 +1577,9 @@ struct client {
struct cmdq_list *queue;
struct client_windows windows;
+
struct control_state *control_state;
+ u_int pause_age;
pid_t pid;
int fd;
@@ -1645,6 +1647,7 @@ struct client {
#define CLIENT_REDRAWPANES 0x20000000
#define CLIENT_NOFORK 0x40000000
#define CLIENT_ACTIVEPANE 0x80000000ULL
+#define CLIENT_CONTROL_PAUSEAFTER 0x100000000ULL
#define CLIENT_ALLREDRAWFLAGS \
(CLIENT_REDRAWWINDOW| \
CLIENT_REDRAWSTATUS| \
@@ -2451,8 +2454,9 @@ void status_prompt_save_history(void);
void resize_window(struct window *, u_int, u_int, int, int);
void default_window_size(struct client *, struct session *, struct window *,
u_int *, u_int *, u_int *, u_int *, int);
-void recalculate_size(struct window *);
+void recalculate_size(struct window *, int);
void recalculate_sizes(void);
+void recalculate_sizes_now(int);
/* input.c */
struct input_ctx *input_init(struct window_pane *, struct bufferevent *);
@@ -2839,11 +2843,12 @@ char *default_window_name(struct window *);
char *parse_window_name(const char *);
/* control.c */
-void control_flush(struct client *);
+void control_discard(struct client *);
void control_start(struct client *);
void control_stop(struct client *);
void control_set_pane_on(struct client *, struct window_pane *);
void control_set_pane_off(struct client *, struct window_pane *);
+void control_continue_pane(struct client *, struct window_pane *);
struct window_pane_offset *control_pane_offset(struct client *,
struct window_pane *, int *);
void control_reset_offsets(struct client *);