mirror of
https://github.com/tmux/tmux.git
synced 2026-03-07 00:05:33 +00:00
Merge branch 'master' into floating_panes
This commit is contained in:
16
tmux.h
16
tmux.h
@@ -1146,6 +1146,7 @@ struct input_request_palette_data {
|
||||
struct input_request_clipboard_data {
|
||||
char *buf;
|
||||
size_t len;
|
||||
char clip;
|
||||
};
|
||||
|
||||
/* Request sent to client on behalf of pane. */
|
||||
@@ -2157,6 +2158,7 @@ struct key_binding {
|
||||
key_code key;
|
||||
struct cmd_list *cmdlist;
|
||||
const char *note;
|
||||
const char *tablename;
|
||||
|
||||
int flags;
|
||||
#define KEY_BINDING_REPEAT 0x1
|
||||
@@ -2296,6 +2298,7 @@ enum sort_order {
|
||||
SORT_ACTIVITY,
|
||||
SORT_CREATION,
|
||||
SORT_INDEX,
|
||||
SORT_MODIFIER,
|
||||
SORT_NAME,
|
||||
SORT_ORDER,
|
||||
SORT_SIZE,
|
||||
@@ -2394,6 +2397,10 @@ struct window_pane **sort_get_panes_window(struct window *, u_int *,
|
||||
struct winlink **sort_get_winlinks(u_int *, struct sort_criteria *);
|
||||
struct winlink **sort_get_winlinks_session(struct session *, u_int *,
|
||||
struct sort_criteria *);
|
||||
struct key_binding **sort_get_key_bindings(u_int *,
|
||||
struct sort_criteria *);
|
||||
struct key_binding **sort_get_key_bindings_table(struct key_table *,
|
||||
u_int *, struct sort_criteria *);
|
||||
|
||||
/* format.c */
|
||||
#define FORMAT_STATUS 0x1
|
||||
@@ -2906,6 +2913,7 @@ void key_bindings_reset(const char *, key_code);
|
||||
void key_bindings_remove_table(const char *);
|
||||
void key_bindings_reset_table(const char *);
|
||||
void key_bindings_init(void);
|
||||
int key_bindings_has_repeat(struct key_binding **, u_int);
|
||||
struct cmdq_item *key_bindings_dispatch(struct key_binding *,
|
||||
struct cmdq_item *, struct client *, struct key_event *,
|
||||
struct cmd_find_state *);
|
||||
@@ -3079,7 +3087,7 @@ void input_parse_buffer(struct window_pane *, u_char *, size_t);
|
||||
void input_parse_screen(struct input_ctx *, struct screen *,
|
||||
screen_write_init_ctx_cb, void *, u_char *, size_t);
|
||||
void input_reply_clipboard(struct bufferevent *, const char *, size_t,
|
||||
const char *);
|
||||
const char *, char);
|
||||
void input_set_buffer_size(size_t);
|
||||
void input_request_reply(struct client *, enum input_request_type, void *);
|
||||
void input_cancel_requests(struct client *);
|
||||
@@ -3637,9 +3645,9 @@ void utf8_copy(struct utf8_data *, const struct utf8_data *);
|
||||
enum utf8_state utf8_open(struct utf8_data *, u_char);
|
||||
enum utf8_state utf8_append(struct utf8_data *, u_char);
|
||||
int utf8_isvalid(const char *);
|
||||
int utf8_strvis(char *, const char *, size_t, int);
|
||||
int utf8_stravis(char **, const char *, int);
|
||||
int utf8_stravisx(char **, const char *, size_t, int);
|
||||
size_t utf8_strvis(char *, const char *, size_t, int);
|
||||
size_t utf8_stravis(char **, const char *, int);
|
||||
size_t utf8_stravisx(char **, const char *, size_t, int);
|
||||
char *utf8_sanitize(const char *);
|
||||
size_t utf8_strlen(const struct utf8_data *);
|
||||
u_int utf8_strwidth(const struct utf8_data *, ssize_t);
|
||||
|
||||
Reference in New Issue
Block a user