diff options
author | Thomas Adam <thomas@xteddy.org> | 2021-03-11 08:01:29 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2021-03-11 08:01:29 +0000 |
commit | 12cfd0d22b630ead9c6d739b13c3409485ea551c (patch) | |
tree | ee2535b2b0e0075078cae6a2eb0bf5171d11078d /tmux.h | |
parent | 541872bc5754a8f4daa84f23043c356f7ac4f663 (diff) | |
parent | ee0df1b8f8a9099fbd67a73c9fb20b89c64d6106 (diff) | |
download | rtmux-12cfd0d22b630ead9c6d739b13c3409485ea551c.tar.gz rtmux-12cfd0d22b630ead9c6d739b13c3409485ea551c.tar.bz2 rtmux-12cfd0d22b630ead9c6d739b13c3409485ea551c.zip |
Merge branch 'obsd-master' into master
Diffstat (limited to 'tmux.h')
-rw-r--r-- | tmux.h | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -741,7 +741,8 @@ enum style_align { STYLE_ALIGN_DEFAULT, STYLE_ALIGN_LEFT, STYLE_ALIGN_CENTRE, - STYLE_ALIGN_RIGHT + STYLE_ALIGN_RIGHT, + STYLE_ALIGN_ABSOLUTE_CENTRE }; /* Style list. */ @@ -1863,6 +1864,7 @@ struct spawn_context { #define SPAWN_NONOTIFY 0x10 #define SPAWN_FULLSIZE 0x20 #define SPAWN_EMPTY 0x40 +#define SPAWN_ZOOM 0x80 }; /* Mode tree sort order. */ @@ -1946,6 +1948,7 @@ char *paste_make_sample(struct paste_buffer *); struct format_tree; struct format_modifier; typedef void *(*format_cb)(struct format_tree *); +void format_tidy_jobs(void); const char *format_skip(const char *, const char *); int format_true(const char *); struct format_tree *format_create(struct client *, struct cmdq_item *, int, @@ -2753,7 +2756,7 @@ void window_resize(struct window *, u_int, u_int, int, int); void window_pane_send_resize(struct window_pane *, int); int window_zoom(struct window_pane *); int window_unzoom(struct window *); -int window_push_zoom(struct window *, int); +int window_push_zoom(struct window *, int, int); int window_pop_zoom(struct window *); void window_lost_pane(struct window *, struct window_pane *); void window_remove_pane(struct window *, struct window_pane *); @@ -2816,7 +2819,7 @@ void layout_set_size(struct layout_cell *, u_int, u_int, u_int, void layout_make_leaf(struct layout_cell *, struct window_pane *); void layout_make_node(struct layout_cell *, enum layout_type); void layout_fix_offsets(struct window *); -void layout_fix_panes(struct window *); +void layout_fix_panes(struct window *, struct window_pane *); void layout_resize_adjust(struct window *, struct layout_cell *, enum layout_type, int); void layout_init(struct window *, struct window_pane *); @@ -2826,7 +2829,8 @@ void layout_resize_pane(struct window_pane *, enum layout_type, int, int); void layout_resize_pane_to(struct window_pane *, enum layout_type, u_int); -void layout_assign_pane(struct layout_cell *, struct window_pane *); +void layout_assign_pane(struct layout_cell *, struct window_pane *, + int); struct layout_cell *layout_split_pane(struct window_pane *, enum layout_type, int, int); void layout_close_pane(struct window_pane *); |