circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add a way to set individual defaults for an array option.

This commit is contained in:
nicm 2019-03-15 21:54:47 +00:00
parent 1d306e926a
commit e8b33af780
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
options.c
View File

@ -169,12 +169,17 @@ options_empty(struct options *oo, const struct options_table_entry *oe)
struct options_entry * 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 options_entry *o; struct options_entry *o;
u_int i;
o = options_empty(oo, oe); o = options_empty(oo, oe);
if (oe->type == OPTIONS_TABLE_ARRAY) if (oe->type == OPTIONS_TABLE_ARRAY) {
options_array_assign(o, oe->default_str); if (oe->default_arr != NULL) {
else if (oe->type == OPTIONS_TABLE_STRING) for (i = 0; oe->default_arr[i] != NULL; i++)
options_array_set(o, i, oe->default_arr[i], 0);
} else
options_array_assign(o, oe->default_str);
} else if (oe->type == OPTIONS_TABLE_STRING)
o->string = xstrdup(oe->default_str); o->string = xstrdup(oe->default_str);
else if (oe->type == OPTIONS_TABLE_STYLE) { else if (oe->type == OPTIONS_TABLE_STYLE) {
style_set(&o->style, &grid_default_cell); style_set(&o->style, &grid_default_cell);

1
tmux.h
View File

@ -1497,6 +1497,7 @@ struct options_table_entry {
const char *default_str; const char *default_str;
long long default_num; long long default_num;
const char **default_arr;
const char *separator; const char *separator;
const char *style; const char *style;