Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-01-07 16:01:17 +00:00
9 changed files with 185 additions and 20 deletions

11
tmux.h
View File

@ -578,6 +578,7 @@ enum utf8_state {
#define GRID_FLAG_PADDING 0x4
#define GRID_FLAG_EXTENDED 0x8
#define GRID_FLAG_SELECTED 0x10
#define GRID_FLAG_NOPALETTE 0x20
/* Grid line flags. */
#define GRID_LINE_WRAPPED 0x1
@ -831,6 +832,8 @@ struct window_pane {
struct grid_cell colgc;
int *palette;
int pipe_fd;
struct bufferevent *pipe_event;
size_t pipe_off;
@ -859,6 +862,11 @@ struct window_pane {
TAILQ_HEAD(window_panes, window_pane);
RB_HEAD(window_pane_tree, window_pane);
#define WINDOW_PANE_PALETTE_HAS(wp, c) \
((wp) != NULL && (wp)->palette != NULL && \
((c) < 0x100 || (c) & COLOUR_FLAG_256) && \
(wp)->palette[(c) & 0xff] != 0)
/* Window structure. */
struct window {
u_int id;
@ -2128,6 +2136,9 @@ void window_pane_alternate_on(struct window_pane *,
struct grid_cell *, int);
void window_pane_alternate_off(struct window_pane *,
struct grid_cell *, int);
void window_pane_set_palette(struct window_pane *, u_int, int);
void window_pane_unset_palette(struct window_pane *, u_int);
void window_pane_reset_palette(struct window_pane *);
int window_pane_set_mode(struct window_pane *,
const struct window_mode *);
void window_pane_reset_mode(struct window_pane *);