Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-09-16 00:01:25 +01:00
5 changed files with 65 additions and 28 deletions

11
tmux.h
View File

@@ -682,6 +682,13 @@ struct style_range {
};
TAILQ_HEAD(style_ranges, style_range);
/* Style default. */
enum style_default_type {
STYLE_DEFAULT_BASE,
STYLE_DEFAULT_PUSH,
STYLE_DEFAULT_POP
};
/* Style option. */
struct style {
struct grid_cell gc;
@@ -692,6 +699,8 @@ struct style {
enum style_range_type range_type;
u_int range_argument;
enum style_default_type default_type;
};
/* Virtual screen. */
@@ -2652,8 +2661,6 @@ int style_parse(struct style *,const struct grid_cell *,
const char *style_tostring(struct style *);
void style_apply(struct grid_cell *, struct options *,
const char *);
void style_apply_update(struct grid_cell *, struct options *,
const char *);
int style_equal(struct style *, struct style *);
void style_set(struct style *, const struct grid_cell *);
void style_copy(struct style *, struct style *);