mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-17 08:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2017-01-16 15:36:02 +00:00
parent f20e3ee62c ef15b4195f
commit 7e110b9d99
5 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd-set-option.c
View File

@@ -30,7 +30,7 @@
static enum cmd_retval cmd_set_option_exec(struct cmd *, struct cmdq_item *); static enum cmd_retval cmd_set_option_exec(struct cmd *, struct cmdq_item *);
static int cmd_set_option_set(struct cmd *, struct cmdq_item *, static int cmd_set_option_set(struct cmd *, struct cmdq_item *,
struct options *, struct option *, const char *); struct options *, struct options_entry *, const char *);
static int cmd_set_option_flag(struct cmdq_item *, static int cmd_set_option_flag(struct cmdq_item *,
const struct options_table_entry *, struct options *, const struct options_table_entry *, struct options *,
const char *); const char *);
@@ -75,7 +75,7 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
struct client *c; struct client *c;
enum options_table_scope scope; enum options_table_scope scope;
struct options *oo; struct options *oo;
struct option *parent, *o; struct options_entry *parent, *o;
const char *name, *value, *target; const char *name, *value, *target;
int window, idx, already, error, ambiguous; int window, idx, already, error, ambiguous;
char *cause; char *cause;
@@ -256,12 +256,12 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
static int static int
cmd_set_option_set(struct cmd *self, struct cmdq_item *item, struct options *oo, cmd_set_option_set(struct cmd *self, struct cmdq_item *item, struct options *oo,
struct option *parent, const char *value) struct options_entry *parent, const char *value)
{ {
const struct options_table_entry *oe; const struct options_table_entry *oe;
struct args *args = self->args; struct args *args = self->args;
int append = args_has(args, 'a'); int append = args_has(args, 'a');
struct option *o; struct options_entry *o;
long long number; long long number;
const char *errstr; const char *errstr;
key_code key; key_code key;

16
cmd-show-options.c
View File

@@ -86,7 +86,7 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
static void static void
cmd_show_options_print(struct cmd *self, struct cmdq_item *item, cmd_show_options_print(struct cmd *self, struct cmdq_item *item,
struct option *o, int idx) struct options_entry *o, int idx)
{ {
const char *name; const char *name;
const char *value; const char *value;
@@ -117,10 +117,10 @@ static enum cmd_retval
cmd_show_options_one(struct cmd *self, struct cmdq_item *item, cmd_show_options_one(struct cmd *self, struct cmdq_item *item,
struct options *oo) struct options *oo)
{ {
struct args *args = self->args; struct args *args = self->args;
struct option *o; struct options_entry *o;
int idx, ambiguous; int idx, ambiguous;
const char *name = args->argv[0]; const char *name = args->argv[0];
o = options_match_get(oo, name, &idx, 1, &ambiguous); o = options_match_get(oo, name, &idx, 1, &ambiguous);
if (o == NULL) { if (o == NULL) {
@@ -143,9 +143,9 @@ static enum cmd_retval
cmd_show_options_all(struct cmd *self, struct cmdq_item *item, cmd_show_options_all(struct cmd *self, struct cmdq_item *item,
struct options *oo) struct options *oo)
{ {
struct option *o; struct options_entry *o;
const struct options_table_entry *oe; const struct options_table_entry *oe;
u_int size, idx; u_int size, idx;
o = options_first(oo); o = options_first(oo);
while (o != NULL) { while (o != NULL) {

2
format.c
View File

@@ -642,7 +642,7 @@ format_find(struct format_tree *ft, const char *key, int modifiers)
struct format_entry *fe, fe_find; struct format_entry *fe, fe_find;
struct environ_entry *envent; struct environ_entry *envent;
static char s[64]; static char s[64];
struct option *o; struct options_entry *o;
const char *found; const char *found;
int idx; int idx;
char *copy, *saved; char *copy, *saved;

106
options.c
View File

@@ -30,7 +30,7 @@
* a red-black tree. * a red-black tree.
*/ */
struct option { struct options_entry {
struct options *owner; struct options *owner;
const char *name; const char *name;
@@ -46,15 +46,15 @@ struct option {
}; };
}; };
RB_ENTRY(option) entry; RB_ENTRY(options_entry) entry;
}; };
struct options { struct options {
RB_HEAD(options_tree, option) tree; RB_HEAD(options_tree, options_entry) tree;
struct options *parent; struct options *parent;
}; };
static struct option *options_add(struct options *, const char *); static struct options_entry *options_add(struct options *, const char *);
#define OPTIONS_ARRAY_LIMIT 1000 #define OPTIONS_ARRAY_LIMIT 1000
@@ -76,11 +76,11 @@ static struct option *options_add(struct options *, const char *);
((o)->tableentry != NULL && \ ((o)->tableentry != NULL && \
(o)->tableentry->type == OPTIONS_TABLE_ARRAY) (o)->tableentry->type == OPTIONS_TABLE_ARRAY)
static int options_cmp(struct option *, struct option *); static int options_cmp(struct options_entry *, struct options_entry *);
RB_GENERATE_STATIC(options_tree, option, entry, options_cmp); RB_GENERATE_STATIC(options_tree, options_entry, entry, options_cmp);
static int static int
options_cmp(struct option *lhs, struct option *rhs) options_cmp(struct options_entry *lhs, struct options_entry *rhs)
{ {
return (strcmp(lhs->name, rhs->name)); return (strcmp(lhs->name, rhs->name));
} }
@@ -88,7 +88,7 @@ options_cmp(struct option *lhs, struct option *rhs)
static const struct options_table_entry * static const struct options_table_entry *
options_parent_table_entry(struct options *oo, const char *s) options_parent_table_entry(struct options *oo, const char *s)
{ {
struct option *o; struct options_entry *o;
if (oo->parent == NULL) if (oo->parent == NULL)
fatalx("no parent options for %s", s); fatalx("no parent options for %s", s);
@@ -112,38 +112,38 @@ options_create(struct options *parent)
void void
options_free(struct options *oo) options_free(struct options *oo)
{ {
struct option *o, *tmp; struct options_entry *o, *tmp;
RB_FOREACH_SAFE (o, options_tree, &oo->tree, tmp) RB_FOREACH_SAFE (o, options_tree, &oo->tree, tmp)
options_remove(o); options_remove(o);
free(oo); free(oo);
} }
struct option * struct options_entry *
options_first(struct options *oo) options_first(struct options *oo)
{ {
return (RB_MIN(options_tree, &oo->tree)); return (RB_MIN(options_tree, &oo->tree));
} }
struct option * struct options_entry *
options_next(struct option *o) options_next(struct options_entry *o)
{ {
return (RB_NEXT(options_tree, &oo->tree, o)); return (RB_NEXT(options_tree, &oo->tree, o));
} }
struct option * struct options_entry *
options_get_only(struct options *oo, const char *name) options_get_only(struct options *oo, const char *name)
{ {
struct option o; struct options_entry o;
o.name = name; o.name = name;
return (RB_FIND(options_tree, &oo->tree, &o)); return (RB_FIND(options_tree, &oo->tree, &o));
} }
struct option * struct options_entry *
options_get(struct options *oo, const char *name) options_get(struct options *oo, const char *name)
{ {
struct option *o; struct options_entry *o;
o = options_get_only(oo, name); o = options_get_only(oo, name);
while (o == NULL) { while (o == NULL) {
@@ -155,10 +155,10 @@ options_get(struct options *oo, const char *name)
return (o); return (o);
} }
struct option * struct options_entry *
options_empty(struct options *oo, const struct options_table_entry *oe) options_empty(struct options *oo, const struct options_table_entry *oe)
{ {
struct option *o; struct options_entry *o;
o = options_add(oo, oe->name); o = options_add(oo, oe->name);
o->tableentry = oe; o->tableentry = oe;
@@ -166,12 +166,12 @@ options_empty(struct options *oo, const struct options_table_entry *oe)
return (o); return (o);
} }
struct option * struct options_entry *
options_default(struct options *oo, const struct options_table_entry *oe) options_default(struct options *oo, const struct options_table_entry *oe)
{ {
struct option *o; struct options_entry *o;
char *cp, *copy, *next; char *cp, *copy, *next;
u_int idx = 0; u_int idx = 0;
o = options_empty(oo, oe); o = options_empty(oo, oe);
@@ -195,10 +195,10 @@ options_default(struct options *oo, const struct options_table_entry *oe)
return (o); return (o);
} }
static struct option * static struct options_entry *
options_add(struct options *oo, const char *name) options_add(struct options *oo, const char *name)
{ {
struct option *o; struct options_entry *o;
o = options_get_only(oo, name); o = options_get_only(oo, name);
if (o != NULL) if (o != NULL)
@@ -213,7 +213,7 @@ options_add(struct options *oo, const char *name)
} }
void void
options_remove(struct option *o) options_remove(struct options_entry *o)
{ {
struct options *oo = o->owner; struct options *oo = o->owner;
u_int i; u_int i;
@@ -231,19 +231,19 @@ options_remove(struct option *o)
} }
const char * const char *
options_name(struct option *o) options_name(struct options_entry *o)
{ {
return (o->name); return (o->name);
} }
const struct options_table_entry * const struct options_table_entry *
options_table_entry(struct option *o) options_table_entry(struct options_entry *o)
{ {
return (o->tableentry); return (o->tableentry);
} }
const char * const char *
options_array_get(struct option *o, u_int idx) options_array_get(struct options_entry *o, u_int idx)
{ {
if (!OPTIONS_IS_ARRAY(o)) if (!OPTIONS_IS_ARRAY(o))
return (NULL); return (NULL);
@@ -253,7 +253,7 @@ options_array_get(struct option *o, u_int idx)
} }
int int
options_array_set(struct option *o, u_int idx, const char *value) options_array_set(struct options_entry *o, u_int idx, const char *value)
{ {
u_int i; u_int i;
@@ -278,7 +278,7 @@ options_array_set(struct option *o, u_int idx, const char *value)
} }
int int
options_array_size(struct option *o, u_int *size) options_array_size(struct options_entry *o, u_int *size)
{ {
if (!OPTIONS_IS_ARRAY(o)) if (!OPTIONS_IS_ARRAY(o))
return (-1); return (-1);
@@ -288,7 +288,7 @@ options_array_size(struct option *o, u_int *size)
} }
int int
options_isstring(struct option *o) options_isstring(struct options_entry *o)
{ {
if (o->tableentry == NULL) if (o->tableentry == NULL)
return (1); return (1);
@@ -296,7 +296,7 @@ options_isstring(struct option *o)
} }
const char * const char *
options_tostring(struct option *o, int idx) options_tostring(struct options_entry *o, int idx)
{ {
static char s[1024]; static char s[1024];
const char *tmp; const char *tmp;
@@ -370,11 +370,11 @@ options_parse(const char *name, int *idx)
return (copy); return (copy);
} }
struct option * struct options_entry *
options_parse_get(struct options *oo, const char *s, int *idx, int only) options_parse_get(struct options *oo, const char *s, int *idx, int only)
{ {
struct option *o; struct options_entry *o;
char *name; char *name;
name = options_parse(s, idx); name = options_parse(s, idx);
if (name == NULL) if (name == NULL)
@@ -426,12 +426,12 @@ options_match(const char *s, int *idx, int* ambiguous)
return (xstrdup(found->name)); return (xstrdup(found->name));
} }
struct option * struct options_entry *
options_match_get(struct options *oo, const char *s, int *idx, int only, options_match_get(struct options *oo, const char *s, int *idx, int only,
int* ambiguous) int* ambiguous)
{ {
char *name; char *name;
struct option *o; struct options_entry *o;
name = options_match(s, idx, ambiguous); name = options_match(s, idx, ambiguous);
if (name == NULL) if (name == NULL)
@@ -455,7 +455,7 @@ options_match_get(struct options *oo, const char *s, int *idx, int only,
const char * const char *
options_get_string(struct options *oo, const char *name) options_get_string(struct options *oo, const char *name)
{ {
struct option *o; struct options_entry *o;
o = options_get(oo, name); o = options_get(oo, name);
if (o == NULL) if (o == NULL)
@@ -468,7 +468,7 @@ options_get_string(struct options *oo, const char *name)
long long long long
options_get_number(struct options *oo, const char *name) options_get_number(struct options *oo, const char *name)
{ {
struct option *o; struct options_entry *o;
o = options_get(oo, name); o = options_get(oo, name);
if (o == NULL) if (o == NULL)
@@ -481,7 +481,7 @@ options_get_number(struct options *oo, const char *name)
const struct grid_cell * const struct grid_cell *
options_get_style(struct options *oo, const char *name) options_get_style(struct options *oo, const char *name)
{ {
struct option *o; struct options_entry *o;
o = options_get(oo, name); o = options_get(oo, name);
if (o == NULL) if (o == NULL)
@@ -491,13 +491,13 @@ options_get_style(struct options *oo, const char *name)
return (&o->style); return (&o->style);
} }
struct option * struct options_entry *
options_set_string(struct options *oo, const char *name, int append, options_set_string(struct options *oo, const char *name, int append,
const char *fmt, ...) const char *fmt, ...)
{ {
struct option *o; struct options_entry *o;
va_list ap; va_list ap;
char *s, *value; char *s, *value;
va_start(ap, fmt); va_start(ap, fmt);
xvasprintf(&s, fmt, ap); xvasprintf(&s, fmt, ap);
@@ -524,10 +524,10 @@ options_set_string(struct options *oo, const char *name, int append,
return (o); return (o);
} }
struct option * struct options_entry *
options_set_number(struct options *oo, const char *name, long long value) options_set_number(struct options *oo, const char *name, long long value)
{ {
struct option *o; struct options_entry *o;
if (*name == '@') if (*name == '@')
fatalx("user option %s must be a string", name); fatalx("user option %s must be a string", name);
@@ -545,11 +545,11 @@ options_set_number(struct options *oo, const char *name, long long value)
return (o); return (o);
} }
struct option * struct options_entry *
options_set_style(struct options *oo, const char *name, int append, options_set_style(struct options *oo, const char *name, int append,
const char *value) const char *value)
{ {
struct option *o; struct options_entry *o;
struct grid_cell gc; struct grid_cell gc;
if (*name == '@') if (*name == '@')
@@ -619,10 +619,10 @@ options_scope_from_flags(struct args *args, int window,
} }
void void
options_style_update_new(struct options *oo, struct option *o) options_style_update_new(struct options *oo, struct options_entry *o)
{ {
const char *newname = o->tableentry->style; const char *newname = o->tableentry->style;
struct option *new; struct options_entry *new;
if (newname == NULL) if (newname == NULL)
return; return;
@@ -639,7 +639,7 @@ options_style_update_new(struct options *oo, struct option *o)
} }
void void
options_style_update_old(struct options *oo, struct option *o) options_style_update_old(struct options *oo, struct options_entry *o)
{ {
char newname[128]; char newname[128];
int size; int size;

52
tmux.h
View File

@@ -49,6 +49,7 @@ struct input_ctx;
struct mode_key_cmdstr; struct mode_key_cmdstr;
struct mouse_event; struct mouse_event;
struct options; struct options;
struct options_entry;
struct session; struct session;
struct tmuxpeer; struct tmuxpeer;
struct tmuxproc; struct tmuxproc;
@@ -1449,11 +1450,7 @@ struct key_table {
}; };
RB_HEAD(key_tables, key_table); RB_HEAD(key_tables, key_table);
/* /* Option table entries. */
* Option table entries. The option table is the user-visible part of the
* option, as opposed to the internal options (struct option) which are just
* number or string.
*/
enum options_table_type { enum options_table_type {
OPTIONS_TABLE_STRING, OPTIONS_TABLE_STRING,
OPTIONS_TABLE_NUMBER, OPTIONS_TABLE_NUMBER,
@@ -1609,40 +1606,43 @@ void notify_pane(const char *, struct window_pane *);
/* options.c */ /* options.c */
struct options *options_create(struct options *); struct options *options_create(struct options *);
void options_free(struct options *); void options_free(struct options *);
struct option *options_first(struct options *); struct options_entry *options_first(struct options *);
struct option *options_next(struct option *); struct options_entry *options_next(struct options_entry *);
struct option *options_empty(struct options *, struct options_entry *options_empty(struct options *,
const struct options_table_entry *); const struct options_table_entry *);
struct option *options_default(struct options *, struct options_entry *options_default(struct options *,
const struct options_table_entry *); const struct options_table_entry *);
const char *options_name(struct option *); const char *options_name(struct options_entry *);
const struct options_table_entry *options_table_entry(struct option *); const struct options_table_entry *options_table_entry(struct options_entry *);
struct option *options_get_only(struct options *, const char *); struct options_entry *options_get_only(struct options *, const char *);
struct option *options_get(struct options *, const char *); struct options_entry *options_get(struct options *, const char *);
void options_remove(struct option *); void options_remove(struct options_entry *);
const char *options_array_get(struct option *, u_int); const char *options_array_get(struct options_entry *, u_int);
int options_array_set(struct option *, u_int, const char *); int options_array_set(struct options_entry *, u_int, const char *);
int options_array_size(struct option *, u_int *); int options_array_size(struct options_entry *, u_int *);
int options_isstring(struct option *); int options_isstring(struct options_entry *);
const char *options_tostring(struct option *, int); const char *options_tostring(struct options_entry *, int);
char *options_parse(const char *, int *); char *options_parse(const char *, int *);
struct option *options_parse_get(struct options *, const char *, int *, struct options_entry *options_parse_get(struct options *, const char *, int *,
int); int);
char *options_match(const char *, int *, int *); char *options_match(const char *, int *, int *);
struct option *options_match_get(struct options *, const char *, int *, struct options_entry *options_match_get(struct options *, const char *, int *,
int, int *); int, int *);
const char *options_get_string(struct options *, const char *); const char *options_get_string(struct options *, const char *);
long long options_get_number(struct options *, const char *); long long options_get_number(struct options *, const char *);
const struct grid_cell *options_get_style(struct options *, const char *); const struct grid_cell *options_get_style(struct options *, const char *);
struct option * printflike(4, 5) options_set_string(struct options *, struct options_entry * printflike(4, 5) options_set_string(struct options *,
const char *, int, const char *, ...); const char *, int, const char *, ...);
struct option *options_set_number(struct options *, const char *, long long); struct options_entry *options_set_number(struct options *, const char *,
struct option *options_set_style(struct options *, const char *, int, long long);
struct options_entry *options_set_style(struct options *, const char *, int,
const char *); const char *);
enum options_table_scope options_scope_from_flags(struct args *, int, enum options_table_scope options_scope_from_flags(struct args *, int,
struct cmd_find_state *, struct options **, char **); struct cmd_find_state *, struct options **, char **);
void options_style_update_new(struct options *, struct option *); void options_style_update_new(struct options *,
void options_style_update_old(struct options *, struct option *); struct options_entry *);
void options_style_update_old(struct options *,
struct options_entry *);
/* options-table.c */ /* options-table.c */
extern const struct options_table_entry options_table[]; extern const struct options_table_entry options_table[];