mirror of
https://github.com/tmux/tmux.git
synced 2025-09-03 14:27:09 +00:00
Merge branch 'obsd-master'
This commit is contained in:
14
tmux.h
14
tmux.h
@ -1342,8 +1342,7 @@ struct session {
|
||||
|
||||
struct options *options;
|
||||
|
||||
#define SESSION_PASTING 0x1
|
||||
#define SESSION_ALERTED 0x2
|
||||
#define SESSION_ALERTED 0x1
|
||||
int flags;
|
||||
|
||||
u_int attached;
|
||||
@ -1421,8 +1420,11 @@ struct mouse_event {
|
||||
|
||||
/* Key event. */
|
||||
struct key_event {
|
||||
key_code key;
|
||||
struct mouse_event m;
|
||||
key_code key;
|
||||
struct mouse_event m;
|
||||
|
||||
char *buf;
|
||||
size_t len;
|
||||
};
|
||||
|
||||
/* Terminal definition. */
|
||||
@ -1840,6 +1842,7 @@ struct client {
|
||||
|
||||
struct timeval creation_time;
|
||||
struct timeval activity_time;
|
||||
struct timeval last_activity_time;
|
||||
|
||||
struct environ *environ;
|
||||
struct format_job_tree *jobs;
|
||||
@ -1906,6 +1909,7 @@ struct client {
|
||||
#define CLIENT_WINDOWSIZECHANGED 0x400000000ULL
|
||||
#define CLIENT_CLIPBOARDBUFFER 0x800000000ULL
|
||||
#define CLIENT_BRACKETPASTING 0x1000000000ULL
|
||||
#define CLIENT_ASSUMEPASTING 0x2000000000ULL
|
||||
#define CLIENT_ALLREDRAWFLAGS \
|
||||
(CLIENT_REDRAWWINDOW| \
|
||||
CLIENT_REDRAWSTATUS| \
|
||||
@ -3058,6 +3062,7 @@ void screen_reinit(struct screen *);
|
||||
void screen_free(struct screen *);
|
||||
void screen_reset_tabs(struct screen *);
|
||||
void screen_reset_hyperlinks(struct screen *);
|
||||
void screen_set_default_cursor(struct screen *, struct options *);
|
||||
void screen_set_cursor_style(u_int, enum screen_cursor_style *, int *);
|
||||
void screen_set_cursor_colour(struct screen *, int);
|
||||
int screen_set_title(struct screen *, const char *);
|
||||
@ -3145,6 +3150,7 @@ void window_pane_reset_mode_all(struct window_pane *);
|
||||
int window_pane_key(struct window_pane *, struct client *,
|
||||
struct session *, struct winlink *, key_code,
|
||||
struct mouse_event *);
|
||||
void window_pane_paste(struct window_pane *, char *, size_t);
|
||||
int window_pane_visible(struct window_pane *);
|
||||
int window_pane_exited(struct window_pane *);
|
||||
u_int window_pane_search(struct window_pane *, const char *, int,
|
||||
|
Reference in New Issue
Block a user