diff options
author | Thomas Adam <thomas@xteddy.org> | 2012-11-27 22:24:00 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2012-11-27 22:24:00 +0000 |
commit | 739a76634c956016c44a89530d8ee9d20c4ed9f0 (patch) | |
tree | cda15fec72c5e350fa188359f6d8325a030d092a /tmux.h | |
parent | 39631edb98a542be53fce6f1eeef41880c9a76b4 (diff) | |
parent | 47c097cb51da9622180963af5391d142e7d4ade3 (diff) | |
download | rtmux-739a76634c956016c44a89530d8ee9d20c4ed9f0.tar.gz rtmux-739a76634c956016c44a89530d8ee9d20c4ed9f0.tar.bz2 rtmux-739a76634c956016c44a89530d8ee9d20c4ed9f0.zip |
Merge branch 'obsd-master'
Sync from OpenBSD.
Diffstat (limited to 'tmux.h')
-rw-r--r-- | tmux.h | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -1678,8 +1678,8 @@ const char *tty_term_string2( struct tty_term *, enum tty_code_code, int, int); const char *tty_term_ptr1( struct tty_term *, enum tty_code_code, const void *); -const char *tty_term_ptr2( - struct tty_term *, enum tty_code_code, const void *, const void *); +const char *tty_term_ptr2(struct tty_term *, enum tty_code_code, + const void *, const void *); int tty_term_number(struct tty_term *, enum tty_code_code); int tty_term_flag(struct tty_term *, enum tty_code_code); @@ -1700,6 +1700,9 @@ int paste_free_index(struct paste_stack *, u_int); void paste_add(struct paste_stack *, char *, size_t, u_int); int paste_replace(struct paste_stack *, u_int, char *, size_t); char *paste_print(struct paste_buffer *, size_t); +void paste_send_pane(struct paste_buffer *, struct window_pane *, + const char *, int); + /* clock.c */ extern const char clock_table[14][5][5]; @@ -1902,7 +1905,7 @@ void server_unlink_window(struct session *, struct winlink *); void server_destroy_pane(struct window_pane *); void server_destroy_session_group(struct session *); void server_destroy_session(struct session *); -void server_check_unattached (void); +void server_check_unattached(void); void server_set_identify(struct client *); void server_clear_identify(struct client *); void server_update_event(struct client *); @@ -2141,10 +2144,10 @@ int window_pane_spawn(struct window_pane *, const char *, const char *, const char *, struct environ *, struct termios *, char **); void window_pane_resize(struct window_pane *, u_int, u_int); -void window_pane_alternate_on( - struct window_pane *, struct grid_cell *); -void window_pane_alternate_off( - struct window_pane *, struct grid_cell *); +void window_pane_alternate_on(struct window_pane *, + struct grid_cell *, int); +void window_pane_alternate_off(struct window_pane *, + struct grid_cell *, int); int window_pane_set_mode( struct window_pane *, const struct window_mode *); void window_pane_reset_mode(struct window_pane *); |