circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 20:57:00 +00:00
Code Issues Projects Releases Wiki Activity

Major tidy up and rework of options tree and set-option/show-options

Browse Source 
commands this pushes more of the code into options.c and ties it more
closely to the options table rather than having an unnecessary
split. Also add support for array options (will be used later). Only
(intentional) user visible change is that show-options output is now
passed through vis(3) with VIS_DQ so quotes are escaped.
This commit is contained in:
nicm
2017-01-15 20:48:41 +00:00
parent 404214b0ac
commit 2b0bc9f1c5
8 changed files with 898 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
format.c
View File

@ -620,39 +620,29 @@ static char *
format_find(struct format_tree *ft, const char *key, int modifiers)
{
struct format_entry *fe, fe_find;
struct options_entry *o;
struct environ_entry *envent;
static char s[64];
struct option *o;
const char *found;
int idx;
char *copy, *saved;
found = NULL;
if (~modifiers & FORMAT_TIMESTRING) {
o = options_find(global_options, key);
o = options_parse_get(global_options, key, &idx, 0);
if (o == NULL && ft->w != NULL)
o = options_find(ft->w->options, key);
o = options_parse_get(ft->w->options, key, &idx, 0);
if (o == NULL)
o = options_find(global_w_options, key);
o = options_parse_get(global_w_options, key, &idx, 0);
if (o == NULL && ft->s != NULL)
o = options_find(ft->s->options, key);
o = options_parse_get(ft->s->options, key, &idx, 0);
if (o == NULL)
o = options_find(global_s_options, key);
o = options_parse_get(global_s_options, key, &idx, 0);
if (o != NULL) {
switch (o->type) {
case OPTIONS_STRING:
found = o->str;
goto found;
case OPTIONS_NUMBER:
xsnprintf(s, sizeof s, "%lld", o->num);
found = s;
goto found;
case OPTIONS_STYLE:
found = style_tostring(&o->style);
goto found;
}
found = options_tostring(o, idx);
goto found;
}
}
found = NULL;
fe_find.key = (char *) key;
fe = RB_FIND(format_entry_tree, &ft->tree, &fe_find);