summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd-set-option.c55
-rw-r--r--cmd-show-options.c46
-rw-r--r--options.c52
-rw-r--r--tmux.h3
4 files changed, 62 insertions, 94 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c
index 7be561f2..10b70304 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -92,16 +92,19 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
struct options *oo;
struct options_entry *parent, *o;
char *name, *argument, *value = NULL, *cause;
- const char *target;
int window, idx, already, error, ambiguous;
struct style *sy;
+ window = (self->entry == &cmd_set_window_option_entry);
+
/* Expand argument. */
c = cmd_find_client(item, NULL, 1);
argument = format_single(item, args->argv[0], c, s, wl, NULL);
+ /* If set-hook -R, fire the hook straight away. */
if (self->entry == &cmd_set_hook_entry && args_has(args, 'R')) {
notify_hook(item, argument);
+ free(argument);
return (CMD_RETURN_NORMAL);
}
@@ -123,25 +126,8 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
else
value = xstrdup(args->argv[1]);
- /*
- * Figure out the scope: for user options it comes from the arguments,
- * otherwise from the option name.
- */
- if (*name == '@') {
- window = (self->entry == &cmd_set_window_option_entry);
- scope = options_scope_from_flags(args, window, fs, &oo, &cause);
- } else {
- if (options_get_only(global_options, name) != NULL)
- scope = OPTIONS_TABLE_SERVER;
- else if (options_get_only(global_s_options, name) != NULL)
- scope = OPTIONS_TABLE_SESSION;
- else if (options_get_only(global_w_options, name) != NULL)
- scope = OPTIONS_TABLE_WINDOW;
- else {
- scope = OPTIONS_TABLE_NONE;
- xasprintf(&cause, "unknown option: %s", argument);
- }
- }
+ /* Get the scope and table for the option .*/
+ scope = options_scope_from_name(args, window, name, fs, &oo, &cause);
if (scope == OPTIONS_TABLE_NONE) {
if (args_has(args, 'q'))
goto out;
@@ -149,35 +135,6 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
free(cause);
goto fail;
}
-
- /* Which table should this option go into? */
- if (scope == OPTIONS_TABLE_SERVER)
- oo = global_options;
- else if (scope == OPTIONS_TABLE_SESSION) {
- if (args_has(self->args, 'g'))
- oo = global_s_options;
- else if (s == NULL) {
- target = args_get(args, 't');
- if (target != NULL)
- cmdq_error(item, "no such session: %s", target);
- else
- cmdq_error(item, "no current session");
- goto fail;
- } else
- oo = s->options;
- } else if (scope == OPTIONS_TABLE_WINDOW) {
- if (args_has(self->args, 'g'))
- oo = global_w_options;
- else if (wl == NULL) {
- target = args_get(args, 't');
- if (target != NULL)
- cmdq_error(item, "no such window: %s", target);
- else
- cmdq_error(item, "no current window");
- goto fail;
- } else
- oo = wl->window->options;
- }
o = options_get_only(oo, name);
parent = options_get(oo, name);
diff --git a/cmd-show-options.c b/cmd-show-options.c
index 3c5b6d47..109c6c52 100644
--- a/cmd-show-options.c
+++ b/cmd-show-options.c
@@ -85,11 +85,11 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
struct options *oo;
enum options_table_scope scope;
char *argument, *name = NULL, *cause;
- const char *target;
int window, idx, ambiguous, parent;
struct options_entry *o;
window = (self->entry == &cmd_show_window_options_entry);
+
if (args->argc == 0) {
scope = options_scope_from_flags(args, window, fs, &oo, &cause);
if (scope == OPTIONS_TABLE_NONE) {
@@ -113,49 +113,7 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
cmdq_error(item, "invalid option: %s", argument);
goto fail;
}
- if (*name == '@')
- scope = options_scope_from_flags(args, window, fs, &oo, &cause);
- else {
- if (options_get_only(global_options, name) != NULL)
- scope = OPTIONS_TABLE_SERVER;
- else if (options_get_only(global_s_options, name) != NULL)
- scope = OPTIONS_TABLE_SESSION;
- else if (options_get_only(global_w_options, name) != NULL)
- scope = OPTIONS_TABLE_WINDOW;
- else {
- scope = OPTIONS_TABLE_NONE;
- xasprintf(&cause, "unknown option: %s", argument);
- }
- if (scope == OPTIONS_TABLE_SERVER)
- oo = global_options;
- else if (scope == OPTIONS_TABLE_SESSION) {
- if (args_has(self->args, 'g'))
- oo = global_s_options;
- else if (s == NULL) {
- target = args_get(args, 't');
- if (target != NULL) {
- cmdq_error(item, "no such session: %s",
- target);
- } else
- cmdq_error(item, "no current session");
- goto fail;
- } else
- oo = s->options;
- } else if (scope == OPTIONS_TABLE_WINDOW) {
- if (args_has(self->args, 'g'))
- oo = global_w_options;
- else if (wl == NULL) {
- target = args_get(args, 't');
- if (target != NULL) {
- cmdq_error(item, "no such window: %s",
- target);
- } else
- cmdq_error(item, "no current window");
- goto fail;
- } else
- oo = wl->window->options;
- }
- }
+ scope = options_scope_from_name(args, window, name, fs, &oo, &cause);
if (scope == OPTIONS_TABLE_NONE) {
if (args_has(args, 'q'))
goto fail;
diff --git a/options.c b/options.c
index 619c27ed..3bce6041 100644
--- a/options.c
+++ b/options.c
@@ -726,12 +726,62 @@ options_set_style(struct options *oo, const char *name, int append,
}
enum options_table_scope
+options_scope_from_name(struct args *args, int window,
+ const char *name, struct cmd_find_state *fs, struct options **oo,
+ char **cause)
+{
+ struct session *s = fs->s;
+ struct winlink *wl = fs->wl;
+ const char *target = args_get(args, 't');
+ enum options_table_scope scope;
+
+ if (*name == '@')
+ return (options_scope_from_flags(args, window, fs, oo, cause));
+
+ if (options_get_only(global_options, name) != NULL)
+ scope = OPTIONS_TABLE_SERVER;
+ else if (options_get_only(global_s_options, name) != NULL)
+ scope = OPTIONS_TABLE_SESSION;
+ else if (options_get_only(global_w_options, name) != NULL)
+ scope = OPTIONS_TABLE_WINDOW;
+ else {
+ xasprintf(cause, "unknown option: %s", name);
+ return (OPTIONS_TABLE_NONE);
+ }
+
+ if (scope == OPTIONS_TABLE_SERVER)
+ *oo = global_options;
+ else if (scope == OPTIONS_TABLE_SESSION) {
+ if (args_has(args, 'g'))
+ *oo = global_s_options;
+ else if (s == NULL) {
+ if (target != NULL)
+ xasprintf(cause, "no such session: %s", target);
+ else
+ xasprintf(cause, "no current session");
+ } else
+ *oo = s->options;
+ } else if (scope == OPTIONS_TABLE_WINDOW) {
+ if (args_has(args, 'g'))
+ *oo = global_w_options;
+ else if (wl == NULL) {
+ if (target != NULL)
+ xasprintf(cause, "no such window: %s", target);
+ else
+ xasprintf(cause, "no current window");
+ } else
+ *oo = wl->window->options;
+ }
+ return (scope);
+}
+
+enum options_table_scope
options_scope_from_flags(struct args *args, int window,
struct cmd_find_state *fs, struct options **oo, char **cause)
{
struct session *s = fs->s;
struct winlink *wl = fs->wl;
- const char *target= args_get(args, 't');
+ const char *target = args_get(args, 't');
if (args_has(args, 's')) {
*oo = global_options;
diff --git a/tmux.h b/tmux.h
index cc5e55c0..0557e98d 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1819,6 +1819,9 @@ struct options_entry *options_set_number(struct options *, const char *,
long long);
struct options_entry *options_set_style(struct options *, const char *, int,
const char *);
+enum options_table_scope options_scope_from_name(struct args *, int,
+ const char *, struct cmd_find_state *, struct options **,
+ char **);
enum options_table_scope options_scope_from_flags(struct args *, int,
struct cmd_find_state *, struct options **, char **);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 07:04:27 +0000