extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-11-23 08:33:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
58b3d66229
tmate/cmd-set-option.c

526 lines
14 KiB
C
Raw Normal View History

Import tmux, a terminal multiplexor allowing (among other things) a single terminal to be switched between several different windows and programs displayed on one terminal be detached from one terminal and moved to another. ok deraadt pirofti
2009-06-02 00:58:49 +02:00
/* $OpenBSD$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
#include "tmux.h"
/*
* Set an option.
*/
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
enum cmd_retval cmd_set_option_exec(struct cmd *, struct cmd_q *);
Add user options, prefixed with @. May be set to any arbitrary string.
2013-03-21 17:17:01 +01:00
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
enum cmd_retval cmd_set_option_user(struct cmd *, struct cmd_q *,
const char *, const char *);
Import tmux, a terminal multiplexor allowing (among other things) a single terminal to be switched between several different windows and programs displayed on one terminal be detached from one terminal and moved to another. ok deraadt pirofti
2009-06-02 00:58:49 +02:00
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
int cmd_set_option_unset(struct cmd *, struct cmd_q *,
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
const struct options_table_entry *, struct options *,
const char *);
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
int cmd_set_option_set(struct cmd *, struct cmd_q *,
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
const struct options_table_entry *, struct options *,
const char *);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
struct options_entry *cmd_set_option_string(struct cmd *, struct cmd_q *,
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
const struct options_table_entry *, struct options *,
const char *);
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
struct options_entry *cmd_set_option_number(struct cmd *, struct cmd_q *,
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
const struct options_table_entry *, struct options *,
const char *);
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
struct options_entry *cmd_set_option_key(struct cmd *, struct cmd_q *,
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
const struct options_table_entry *, struct options *,
const char *);
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
struct options_entry *cmd_set_option_colour(struct cmd *, struct cmd_q *,
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
const struct options_table_entry *, struct options *,
const char *);
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
struct options_entry *cmd_set_option_attributes(struct cmd *, struct cmd_q *,
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
const struct options_table_entry *, struct options *,
const char *);
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
struct options_entry *cmd_set_option_flag(struct cmd *, struct cmd_q *,
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
const struct options_table_entry *, struct options *,
const char *);
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
struct options_entry *cmd_set_option_choice(struct cmd *, struct cmd_q *,
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
const struct options_table_entry *, struct options *,
const char *);
Allow replacing each of the many sets of separate foo-{fg,bg,attr} options with a single foo-style option. For example: set -g status-fg yellow set -g status-bg red set -g status-attr blink Becomes: set -g status-style fg=yellow,bg=red,blink The -a flag to set can be used to add to rather than replace a style. So: set -g status-bg red Becomes: set -ag status-style bg=red Currently this is fully backwards compatible (all *-{fg,bg,attr} options remain) but the plan is to deprecate them over time. From Tiago Cunha.
2014-01-29 00:07:09 +01:00
struct options_entry *cmd_set_option_style(struct cmd *, struct cmd_q *,
const struct options_table_entry *, struct options *,
const char *);
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
Import tmux, a terminal multiplexor allowing (among other things) a single terminal to be switched between several different windows and programs displayed on one terminal be detached from one terminal and moved to another. ok deraadt pirofti
2009-06-02 00:58:49 +02:00
const struct cmd_entry cmd_set_option_entry = {
Use member names in cmd_entry definitions so I stop getting confused about the order.
2015-12-13 22:53:57 +01:00
.name = "set-option",
.alias = "set",
.args = { "agoqst:uw", 1, 2 },
.usage = "[-agosquw] [-t target-window] option [value]",
Instead of combined flags for -c, -s, -t, split into different sets using an enum and simplify the parsing code.
2015-12-14 01:31:54 +01:00
.tflag = CMD_WINDOW_CANFAIL,
.flags = 0,
Use member names in cmd_entry definitions so I stop getting confused about the order.
2015-12-13 22:53:57 +01:00
.exec = cmd_set_option_exec
Import tmux, a terminal multiplexor allowing (among other things) a single terminal to be switched between several different windows and programs displayed on one terminal be detached from one terminal and moved to another. ok deraadt pirofti
2009-06-02 00:58:49 +02:00
};
Now that parsing is common, merge some of the small, related commands together to use the same code. Also add some arguments (such as -n and -p) to some commands to match existing commands.
2011-01-04 03:03:41 +01:00
const struct cmd_entry cmd_set_window_option_entry = {
Use member names in cmd_entry definitions so I stop getting confused about the order.
2015-12-13 22:53:57 +01:00
.name = "set-window-option",
.alias = "setw",
.args = { "agoqt:u", 1, 2 },
.usage = "[-agoqu] " CMD_TARGET_WINDOW_USAGE " option [value]",
Instead of combined flags for -c, -s, -t, split into different sets using an enum and simplify the parsing code.
2015-12-14 01:31:54 +01:00
.tflag = CMD_WINDOW_CANFAIL,
.flags = 0,
Use member names in cmd_entry definitions so I stop getting confused about the order.
2015-12-13 22:53:57 +01:00
.exec = cmd_set_option_exec
Now that parsing is common, merge some of the small, related commands together to use the same code. Also add some arguments (such as -n and -p) to some commands to match existing commands.
2011-01-04 03:03:41 +01:00
};
Make command exec functions return an enum rather than -1/0/1 values and add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
2012-07-11 09:10:15 +02:00
enum cmd_retval
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
Import tmux, a terminal multiplexor allowing (among other things) a single terminal to be switched between several different windows and programs displayed on one terminal be detached from one terminal and moved to another. ok deraadt pirofti
2009-06-02 00:58:49 +02:00
{
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
struct args *args = self->args;
Instead of every command resolving the target (-t or -s) itself, prepare the state (client, session, winlink, pane) for it it before entering the command. Each command provides some flags that tell the prepare step what it is expecting. This is a requirement for having hooks on commands (for example, if you hook "select-window -t1:2", the hook command should to operate on window 1:2 not whatever it thinks is the current window), and should allow some other target improvements. The old cmd_find_* functions remain for the moment but that layer will be dropped later. Joint work with Thomas Adam.
2015-12-13 15:32:38 +01:00
struct session *s = cmdq->state.tflag.s;
struct winlink *wl = cmdq->state.tflag.wl;
struct window *w;
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
struct client *c;
Instead of every command resolving the target (-t or -s) itself, prepare the state (client, session, winlink, pane) for it it before entering the command. Each command provides some flags that tell the prepare step what it is expecting. This is a requirement for having hooks on commands (for example, if you hook "select-window -t1:2", the hook command should to operate on window 1:2 not whatever it thinks is the current window), and should allow some other target improvements. The old cmd_find_* functions remain for the moment but that layer will be dropped later. Joint work with Thomas Adam.
2015-12-13 15:32:38 +01:00
const struct options_table_entry *oe;
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
struct options *oo;
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
const char *optstr, *valstr;
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
For convenience, work out what type of option is being set by name regardless of the -s or -w flags (these remain documented however).
2011-03-29 23:09:13 +02:00
/* Get the option name and value. */
optstr = args->argv[0];
if (*optstr == '\0') {
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
cmdq_error(cmdq, "invalid option");
Make command exec functions return an enum rather than -1/0/1 values and add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
2012-07-11 09:10:15 +02:00
return (CMD_RETURN_ERROR);
For convenience, work out what type of option is being set by name regardless of the -s or -w flags (these remain documented however).
2011-03-29 23:09:13 +02:00
}
if (args->argc < 2)
valstr = NULL;
else
valstr = args->argv[1];
Add user options, prefixed with @. May be set to any arbitrary string.
2013-03-21 17:17:01 +01:00
/* Is this a user option? */
if (*optstr == '@')
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
return (cmd_set_option_user(self, cmdq, optstr, valstr));
Add user options, prefixed with @. May be set to any arbitrary string.
2013-03-21 17:17:01 +01:00
For convenience, work out what type of option is being set by name regardless of the -s or -w flags (these remain documented however).
2011-03-29 23:09:13 +02:00
/* Find the option entry, try each table. */
Instead of separate tables for different types of options, give each option a scope type (server, session, window) in one table.
2015-11-20 13:01:19 +01:00
oe = NULL;
if (options_table_find(optstr, &oe) != 0) {
Make -q suppress ambiguous option warnings too, from Cam Hutchison.
2015-07-27 10:45:45 +02:00
if (!args_has(args, 'q')) {
cmdq_error(cmdq, "ambiguous option: %s", optstr);
return (CMD_RETURN_ERROR);
}
return (CMD_RETURN_NORMAL);
For convenience, work out what type of option is being set by name regardless of the -s or -w flags (these remain documented however).
2011-03-29 23:09:13 +02:00
}
if (oe == NULL) {
Extend the -q flag to set-option to suppress errors about unknown options - this will allow options to be removed more easily.
2014-04-17 09:51:38 +02:00
if (!args_has(args, 'q')) {
cmdq_error(cmdq, "unknown option: %s", optstr);
return (CMD_RETURN_ERROR);
}
return (CMD_RETURN_NORMAL);
For convenience, work out what type of option is being set by name regardless of the -s or -w flags (these remain documented however).
2011-03-29 23:09:13 +02:00
}
Instead of separate tables for different types of options, give each option a scope type (server, session, window) in one table.
2015-11-20 13:01:19 +01:00
/* Work out the tree from the scope of the option. */
if (oe->scope == OPTIONS_TABLE_SERVER)
Move struct options into options.c.
2015-10-27 16:58:42 +01:00
oo = global_options;
Instead of separate tables for different types of options, give each option a scope type (server, session, window) in one table.
2015-11-20 13:01:19 +01:00
else if (oe->scope == OPTIONS_TABLE_WINDOW) {
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
if (args_has(self->args, 'g'))
Move struct options into options.c.
2015-10-27 16:58:42 +01:00
oo = global_w_options;
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
else {
Clarify error messages when setting options, from Thomas Adam.
2013-07-05 17:10:38 +02:00
if (wl == NULL) {
cmdq_error(cmdq,
"couldn't set '%s'%s", optstr,
(!args_has(args, 't') && !args_has(args,
'g')) ? " need target window or -g" : "");
Make command exec functions return an enum rather than -1/0/1 values and add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
2012-07-11 09:10:15 +02:00
return (CMD_RETURN_ERROR);
Clarify error messages when setting options, from Thomas Adam.
2013-07-05 17:10:38 +02:00
}
Move struct options into options.c.
2015-10-27 16:58:42 +01:00
oo = wl->window->options;
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Instead of separate tables for different types of options, give each option a scope type (server, session, window) in one table.
2015-11-20 13:01:19 +01:00
} else if (oe->scope == OPTIONS_TABLE_SESSION) {
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
if (args_has(self->args, 'g'))
Move struct options into options.c.
2015-10-27 16:58:42 +01:00
oo = global_s_options;
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
else {
Clarify error messages when setting options, from Thomas Adam.
2013-07-05 17:10:38 +02:00
if (s == NULL) {
cmdq_error(cmdq,
"couldn't set '%s'%s", optstr,
(!args_has(args, 't') && !args_has(args,
'g')) ? " need target session or -g" : "");
Make command exec functions return an enum rather than -1/0/1 values and add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
2012-07-11 09:10:15 +02:00
return (CMD_RETURN_ERROR);
Clarify error messages when setting options, from Thomas Adam.
2013-07-05 17:10:38 +02:00
}
Move struct options into options.c.
2015-10-27 16:58:42 +01:00
oo = s->options;
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
For convenience, work out what type of option is being set by name regardless of the -s or -w flags (these remain documented however).
2011-03-29 23:09:13 +02:00
} else {
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
cmdq_error(cmdq, "unknown table");
Make command exec functions return an enum rather than -1/0/1 values and add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
2012-07-11 09:10:15 +02:00
return (CMD_RETURN_ERROR);
Import tmux, a terminal multiplexor allowing (among other things) a single terminal to be switched between several different windows and programs displayed on one terminal be detached from one terminal and moved to another. ok deraadt pirofti
2009-06-02 00:58:49 +02:00
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
/* Unset or set the option. */
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
if (args_has(args, 'u')) {
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
if (cmd_set_option_unset(self, cmdq, oe, oo, valstr) != 0)
Make command exec functions return an enum rather than -1/0/1 values and add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
2012-07-11 09:10:15 +02:00
return (CMD_RETURN_ERROR);
Import tmux, a terminal multiplexor allowing (among other things) a single terminal to be switched between several different windows and programs displayed on one terminal be detached from one terminal and moved to another. ok deraadt pirofti
2009-06-02 00:58:49 +02:00
} else {
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
if (args_has(args, 'o') && options_find1(oo, optstr) != NULL) {
Extend the -q flag to set-option to suppress errors about unknown options - this will allow options to be removed more easily.
2014-04-17 09:51:38 +02:00
if (!args_has(args, 'q')) {
cmdq_error(cmdq, "already set: %s", optstr);
return (CMD_RETURN_ERROR);
}
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
return (CMD_RETURN_NORMAL);
}
if (cmd_set_option_set(self, cmdq, oe, oo, valstr) != 0)
Make command exec functions return an enum rather than -1/0/1 values and add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
2012-07-11 09:10:15 +02:00
return (CMD_RETURN_ERROR);
Import tmux, a terminal multiplexor allowing (among other things) a single terminal to be switched between several different windows and programs displayed on one terminal be detached from one terminal and moved to another. ok deraadt pirofti
2009-06-02 00:58:49 +02:00
}
Per-session timers for locking, and remove the global one-second timer.
2015-08-28 15:12:20 +02:00
/* Start or stop timers if necessary. */
Style nit - no space between function name and bracket.
2014-02-14 14:59:01 +01:00
if (strcmp(oe->name, "automatic-rename") == 0) {
Change the windows array into an RB tree and fix some places where we were only looking at the first winlink for a window in a session.
2015-04-22 17:30:11 +02:00
RB_FOREACH(w, windows, &windows) {
Move struct options into options.c.
2015-10-27 16:58:42 +01:00
if (options_get_number(w->options, "automatic-rename"))
Better take on reducing the name timer. Again check for name changes in the main loop after events that may have changed the pane, but do so at most once every 500 millis. If the pane changed too soon, use a timer to ensure that a check happens later.
2015-08-29 02:29:15 +02:00
w->active->flags |= PANE_CHANGED;
Do not fire name timer when automatic-rename is off, from Tim Ruehsen a while ago.
2012-04-08 08:47:26 +02:00
}
}
Add key-table option to set the default key table for a session, allows different key bindings for different sessions and a few other things.
2015-12-12 19:32:24 +01:00
if (strcmp(oe->name, "key-table") == 0) {
TAILQ_FOREACH(c, &clients, entry)
server_client_set_key_table(c, NULL);
}
Run status update on a per-client timer at status-interval.
2015-08-28 14:16:28 +02:00
if (strcmp(oe->name, "status") == 0 ||
strcmp(oe->name, "status-interval") == 0)
status_timer_start_all();
Move alerts onto events rather than checking every loop.
2015-08-29 10:30:54 +02:00
if (strcmp(oe->name, "monitor-silence") == 0)
alerts_reset_all();
Do not fire name timer when automatic-rename is off, from Tim Ruehsen a while ago.
2012-04-08 08:47:26 +02:00
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
/* Update sizes and redraw. May not need it but meh. */
Import tmux, a terminal multiplexor allowing (among other things) a single terminal to be switched between several different windows and programs displayed on one terminal be detached from one terminal and moved to another. ok deraadt pirofti
2009-06-02 00:58:49 +02:00
recalculate_sizes();
Convert clients list into a TAILQ.
2015-04-25 01:17:11 +02:00
TAILQ_FOREACH(c, &clients, entry) {
if (c->session != NULL)
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
server_redraw_client(c);
}
Add a flag for jobs that shouldn't be freed after they've died and use it for status jobs, then only kill those jobs when status-left, status-right or set-titles-string is changed. Fixes problems with changing options from inside #().
2009-11-02 00:20:37 +01:00
Make command exec functions return an enum rather than -1/0/1 values and add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
2012-07-11 09:10:15 +02:00
return (CMD_RETURN_NORMAL);
Import tmux, a terminal multiplexor allowing (among other things) a single terminal to be switched between several different windows and programs displayed on one terminal be detached from one terminal and moved to another. ok deraadt pirofti
2009-06-02 00:58:49 +02:00
}
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
Add user options, prefixed with @. May be set to any arbitrary string.
2013-03-21 17:17:01 +01:00
/* Set user option. */
enum cmd_retval
Various minor style and spacing nits.
2014-09-01 23:50:18 +02:00
cmd_set_option_user(struct cmd *self, struct cmd_q *cmdq, const char *optstr,
Add user options, prefixed with @. May be set to any arbitrary string.
2013-03-21 17:17:01 +01:00
const char *valstr)
{
struct args *args = self->args;
Instead of every command resolving the target (-t or -s) itself, prepare the state (client, session, winlink, pane) for it it before entering the command. Each command provides some flags that tell the prepare step what it is expecting. This is a requirement for having hooks on commands (for example, if you hook "select-window -t1:2", the hook command should to operate on window 1:2 not whatever it thinks is the current window), and should allow some other target improvements. The old cmd_find_* functions remain for the moment but that layer will be dropped later. Joint work with Thomas Adam.
2015-12-13 15:32:38 +01:00
struct session *s = cmdq->state.tflag.s;
struct winlink *wl = cmdq->state.tflag.wl;
Add user options, prefixed with @. May be set to any arbitrary string.
2013-03-21 17:17:01 +01:00
struct options *oo;
if (args_has(args, 's'))
Move struct options into options.c.
2015-10-27 16:58:42 +01:00
oo = global_options;
Add user options, prefixed with @. May be set to any arbitrary string.
2013-03-21 17:17:01 +01:00
else if (args_has(self->args, 'w') ||
self->entry == &cmd_set_window_option_entry) {
if (args_has(self->args, 'g'))
Move struct options into options.c.
2015-10-27 16:58:42 +01:00
oo = global_w_options;
Instead of every command resolving the target (-t or -s) itself, prepare the state (client, session, winlink, pane) for it it before entering the command. Each command provides some flags that tell the prepare step what it is expecting. This is a requirement for having hooks on commands (for example, if you hook "select-window -t1:2", the hook command should to operate on window 1:2 not whatever it thinks is the current window), and should allow some other target improvements. The old cmd_find_* functions remain for the moment but that layer will be dropped later. Joint work with Thomas Adam.
2015-12-13 15:32:38 +01:00
else
Move struct options into options.c.
2015-10-27 16:58:42 +01:00
oo = wl->window->options;
Add user options, prefixed with @. May be set to any arbitrary string.
2013-03-21 17:17:01 +01:00
} else {
if (args_has(self->args, 'g'))
Move struct options into options.c.
2015-10-27 16:58:42 +01:00
oo = global_s_options;
Instead of every command resolving the target (-t or -s) itself, prepare the state (client, session, winlink, pane) for it it before entering the command. Each command provides some flags that tell the prepare step what it is expecting. This is a requirement for having hooks on commands (for example, if you hook "select-window -t1:2", the hook command should to operate on window 1:2 not whatever it thinks is the current window), and should allow some other target improvements. The old cmd_find_* functions remain for the moment but that layer will be dropped later. Joint work with Thomas Adam.
2015-12-13 15:32:38 +01:00
else
Move struct options into options.c.
2015-10-27 16:58:42 +01:00
oo = s->options;
Add user options, prefixed with @. May be set to any arbitrary string.
2013-03-21 17:17:01 +01:00
}
if (args_has(args, 'u')) {
if (options_find1(oo, optstr) == NULL) {
Extend the -q flag to set-option to suppress errors about unknown options - this will allow options to be removed more easily.
2014-04-17 09:51:38 +02:00
if (!args_has(args, 'q')) {
cmdq_error(cmdq, "unknown option: %s", optstr);
return (CMD_RETURN_ERROR);
}
return (CMD_RETURN_NORMAL);
Add user options, prefixed with @. May be set to any arbitrary string.
2013-03-21 17:17:01 +01:00
}
if (valstr != NULL) {
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
cmdq_error(cmdq, "value passed to unset option: %s",
Add user options, prefixed with @. May be set to any arbitrary string.
2013-03-21 17:17:01 +01:00
optstr);
return (CMD_RETURN_ERROR);
}
options_remove(oo, optstr);
} else {
if (valstr == NULL) {
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
cmdq_error(cmdq, "empty value");
Add user options, prefixed with @. May be set to any arbitrary string.
2013-03-21 17:17:01 +01:00
return (CMD_RETURN_ERROR);
}
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
if (args_has(args, 'o') && options_find1(oo, optstr) != NULL) {
Extend the -q flag to set-option to suppress errors about unknown options - this will allow options to be removed more easily.
2014-04-17 09:51:38 +02:00
if (!args_has(args, 'q')) {
cmdq_error(cmdq, "already set: %s", optstr);
Various minor style and spacing nits.
2014-09-01 23:50:18 +02:00
return (CMD_RETURN_ERROR);
Extend the -q flag to set-option to suppress errors about unknown options - this will allow options to be removed more easily.
2014-04-17 09:51:38 +02:00
}
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
return (CMD_RETURN_NORMAL);
}
Add user options, prefixed with @. May be set to any arbitrary string.
2013-03-21 17:17:01 +01:00
options_set_string(oo, optstr, "%s", valstr);
}
return (CMD_RETURN_NORMAL);
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
/* Unset an option. */
int
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
cmd_set_option_unset(struct cmd *self, struct cmd_q *cmdq,
Some more long lines.
2014-04-17 16:45:49 +02:00
const struct options_table_entry *oe, struct options *oo,
const char *value)
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
{
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
struct args *args = self->args;
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
if (value != NULL) {
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
cmdq_error(cmdq, "value passed to unset option: %s", oe->name);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
return (-1);
}
Move struct options into options.c.
2015-10-27 16:58:42 +01:00
if (args_has(args, 'g') || oo == global_options) {
Make unsetting a global option restore it to the default. Diff lying around for a while, I have forgotten who suggested it :-/.
2015-06-04 16:29:33 +02:00
switch (oe->type) {
case OPTIONS_TABLE_STRING:
options_set_string(oo, oe->name, "%s", oe->default_str);
break;
case OPTIONS_TABLE_STYLE:
options_set_style(oo, oe->name, oe->default_str, 0);
break;
default:
options_set_number(oo, oe->name, oe->default_num);
break;
}
} else
options_remove(oo, oe->name);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
return (0);
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
/* Set an option. */
int
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
cmd_set_option_set(struct cmd *self, struct cmd_q *cmdq,
Some more long lines.
2014-04-17 16:45:49 +02:00
const struct options_table_entry *oe, struct options *oo,
const char *value)
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
{
struct options_entry *o;
Allow choice options (multiple states) to be toggled between states 0 and 1.
2015-04-24 23:38:18 +02:00
switch (oe->type) {
case OPTIONS_TABLE_FLAG:
case OPTIONS_TABLE_CHOICE:
break;
default:
if (value == NULL) {
cmdq_error(cmdq, "empty value");
return (-1);
}
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
o = NULL;
switch (oe->type) {
case OPTIONS_TABLE_STRING:
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
o = cmd_set_option_string(self, cmdq, oe, oo, value);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
break;
case OPTIONS_TABLE_NUMBER:
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
o = cmd_set_option_number(self, cmdq, oe, oo, value);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
break;
Drop the ability to have a list of keys in the prefix in favour of two separate options, prefix and prefix2. This simplifies the code and gets rid the data options type which was only used for this one option. Also add a -2 flag to send-prefix to send the secondary prefix key, fixing a cause of minor irritation. People who want three prefix keys are out of luck :-).
2012-01-21 09:40:09 +01:00
case OPTIONS_TABLE_KEY:
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
o = cmd_set_option_key(self, cmdq, oe, oo, value);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
break;
case OPTIONS_TABLE_COLOUR:
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
o = cmd_set_option_colour(self, cmdq, oe, oo, value);
Don't crash when given a invalid colour, reported by Felix Rosencrantz, fix from Thomas Adam.
2014-02-17 19:12:47 +01:00
if (o != NULL)
style_update_new(oo, o->name, oe->style);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
break;
case OPTIONS_TABLE_ATTRIBUTES:
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
o = cmd_set_option_attributes(self, cmdq, oe, oo, value);
Don't crash when given a invalid colour, reported by Felix Rosencrantz, fix from Thomas Adam.
2014-02-17 19:12:47 +01:00
if (o != NULL)
style_update_new(oo, o->name, oe->style);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
break;
case OPTIONS_TABLE_FLAG:
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
o = cmd_set_option_flag(self, cmdq, oe, oo, value);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
break;
case OPTIONS_TABLE_CHOICE:
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
o = cmd_set_option_choice(self, cmdq, oe, oo, value);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
break;
Allow replacing each of the many sets of separate foo-{fg,bg,attr} options with a single foo-style option. For example: set -g status-fg yellow set -g status-bg red set -g status-attr blink Becomes: set -g status-style fg=yellow,bg=red,blink The -a flag to set can be used to add to rather than replace a style. So: set -g status-bg red Becomes: set -ag status-style bg=red Currently this is fully backwards compatible (all *-{fg,bg,attr} options remain) but the plan is to deprecate them over time. From Tiago Cunha.
2014-01-29 00:07:09 +01:00
case OPTIONS_TABLE_STYLE:
o = cmd_set_option_style(self, cmdq, oe, oo, value);
break;
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
}
if (o == NULL)
return (-1);
return (0);
}
/* Set a string option. */
struct options_entry *
Use __unused rather than rolling our own.
2015-11-18 15:27:44 +01:00
cmd_set_option_string(struct cmd *self, __unused struct cmd_q *cmdq,
Some more long lines.
2014-04-17 16:45:49 +02:00
const struct options_table_entry *oe, struct options *oo,
const char *value)
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
{
Add -q option to set-option to turn off info message, from marcel partap.
2012-03-17 22:33:33 +01:00
struct args *args = self->args;
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
struct options_entry *o;
char *oldval, *newval;
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
if (args_has(args, 'a')) {
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
oldval = options_get_string(oo, oe->name);
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
xasprintf(&newval, "%s%s", oldval, value);
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
} else
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
newval = xstrdup(value);
Massive spaces->tabs and trailing whitespace cleanup, hopefully for the last time now I've configured emacs to make them displayed in really annoying colours...
2009-12-03 23:50:09 +01:00
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
o = options_set_string(oo, oe->name, "%s", newval);
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
xfree is not particularly helpful, remove it. From Thomas Adam.
2012-07-10 13:53:01 +02:00
free(newval);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
return (o);
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
/* Set a number option. */
struct options_entry *
Use __unused rather than rolling our own.
2015-11-18 15:27:44 +01:00
cmd_set_option_number(__unused struct cmd *self, struct cmd_q *cmdq,
Some more long lines.
2014-04-17 16:45:49 +02:00
const struct options_table_entry *oe, struct options *oo,
const char *value)
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
{
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
long long ll;
const char *errstr;
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
ll = strtonum(value, oe->minimum, oe->maximum, &errstr);
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
if (errstr != NULL) {
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
cmdq_error(cmdq, "value is %s: %s", errstr, value);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
return (NULL);
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
return (options_set_number(oo, oe->name, ll));
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Drop the ability to have a list of keys in the prefix in favour of two separate options, prefix and prefix2. This simplifies the code and gets rid the data options type which was only used for this one option. Also add a -2 flag to send-prefix to send the secondary prefix key, fixing a cause of minor irritation. People who want three prefix keys are out of luck :-).
2012-01-21 09:40:09 +01:00
/* Set a key option. */
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
struct options_entry *
Use __unused rather than rolling our own.
2015-11-18 15:27:44 +01:00
cmd_set_option_key(__unused struct cmd *self, struct cmd_q *cmdq,
Some more long lines.
2014-04-17 16:45:49 +02:00
const struct options_table_entry *oe, struct options *oo,
const char *value)
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
{
Support UTF-8 key bindings by expanding the key type from int to uint64_t and converting UTF-8 to Unicode on input and the reverse on output. (This allows key bindings, there are still omissions - the largest being that the various prompts do not accept UTF-8.)
2015-11-12 12:05:34 +01:00
key_code key;
Drop the ability to have a list of keys in the prefix in favour of two separate options, prefix and prefix2. This simplifies the code and gets rid the data options type which was only used for this one option. Also add a -2 flag to send-prefix to send the secondary prefix key, fixing a cause of minor irritation. People who want three prefix keys are out of luck :-).
2012-01-21 09:40:09 +01:00
Allow prefix and prefix2 to be set to None to disable (useful if you would rather bind the prefix in the root table).
2015-12-12 19:19:00 +01:00
key = key_string_lookup_string(value);
if (key == KEYC_UNKNOWN) {
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
cmdq_error(cmdq, "bad key: %s", value);
Drop the ability to have a list of keys in the prefix in favour of two separate options, prefix and prefix2. This simplifies the code and gets rid the data options type which was only used for this one option. Also add a -2 flag to send-prefix to send the secondary prefix key, fixing a cause of minor irritation. People who want three prefix keys are out of luck :-).
2012-01-21 09:40:09 +01:00
return (NULL);
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Drop the ability to have a list of keys in the prefix in favour of two separate options, prefix and prefix2. This simplifies the code and gets rid the data options type which was only used for this one option. Also add a -2 flag to send-prefix to send the secondary prefix key, fixing a cause of minor irritation. People who want three prefix keys are out of luck :-).
2012-01-21 09:40:09 +01:00
return (options_set_number(oo, oe->name, key));
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
/* Set a colour option. */
struct options_entry *
Use __unused rather than rolling our own.
2015-11-18 15:27:44 +01:00
cmd_set_option_colour(__unused struct cmd *self, struct cmd_q *cmdq,
Some more long lines.
2014-04-17 16:45:49 +02:00
const struct options_table_entry *oe, struct options *oo,
const char *value)
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
{
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
int colour;
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
if ((colour = colour_fromstring(value)) == -1) {
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
cmdq_error(cmdq, "bad colour: %s", value);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
return (NULL);
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
return (options_set_number(oo, oe->name, colour));
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
/* Set an attributes option. */
struct options_entry *
Use __unused rather than rolling our own.
2015-11-18 15:27:44 +01:00
cmd_set_option_attributes(__unused struct cmd *self, struct cmd_q *cmdq,
Some more long lines.
2014-04-17 16:45:49 +02:00
const struct options_table_entry *oe, struct options *oo,
const char *value)
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
{
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
int attr;
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
if ((attr = attributes_fromstring(value)) == -1) {
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
cmdq_error(cmdq, "bad attributes: %s", value);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
return (NULL);
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
return (options_set_number(oo, oe->name, attr));
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
/* Set a flag option. */
struct options_entry *
Use __unused rather than rolling our own.
2015-11-18 15:27:44 +01:00
cmd_set_option_flag(__unused struct cmd *self, struct cmd_q *cmdq,
Some more long lines.
2014-04-17 16:45:49 +02:00
const struct options_table_entry *oe, struct options *oo,
const char *value)
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
{
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
int flag;
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
if (value == NULL || *value == '\0')
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
flag = !options_get_number(oo, oe->name);
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
else {
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
if ((value[0] == '1' && value[1] == '\0') ||
strcasecmp(value, "on") == 0 ||
strcasecmp(value, "yes") == 0)
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
flag = 1;
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
else if ((value[0] == '0' && value[1] == '\0') ||
strcasecmp(value, "off") == 0 ||
strcasecmp(value, "no") == 0)
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
flag = 0;
else {
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
cmdq_error(cmdq, "bad value: %s", value);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
return (NULL);
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
return (options_set_number(oo, oe->name, flag));
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
/* Set a choice option. */
struct options_entry *
Use __unused rather than rolling our own.
2015-11-18 15:27:44 +01:00
cmd_set_option_choice(__unused struct cmd *self, struct cmd_q *cmdq,
Add a -o option to set-option to prevent setting an option already set, from Thiago Padilha.
2013-03-24 10:55:02 +01:00
const struct options_table_entry *oe, struct options *oo,
const char *value)
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
{
Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-04 01:42:46 +01:00
const char **choicep;
int n, choice = -1;
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
Allow choice options (multiple states) to be toggled between states 0 and 1.
2015-04-24 23:38:18 +02:00
if (value == NULL) {
choice = options_get_number(oo, oe->name);
if (choice < 2)
choice = !choice;
} else {
n = 0;
for (choicep = oe->choices; *choicep != NULL; choicep++) {
n++;
if (strncmp(*choicep, value, strlen(value)) != 0)
continue;
if (choice != -1) {
cmdq_error(cmdq, "ambiguous value: %s", value);
return (NULL);
}
choice = n - 1;
}
if (choice == -1) {
cmdq_error(cmdq, "unknown value: %s", value);
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
return (NULL);
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
}
Move the user-visible parts of all options (names, types, limit, default values) together into one set of tables in options-table.c. Also clean up and simplify cmd-set-options.c and move a common print function into option-table.c.
2011-01-01 17:51:21 +01:00
return (options_set_number(oo, oe->name, choice));
Eliminate duplicate code and ease the passage for server-wide options by adding a -w flag to set-option and show-options and making setw and showw aliases to set -w and show -w. Note: setw and showw are still there, but now aliases for set -w and show -w.
2009-12-03 18:44:02 +01:00
}
Allow replacing each of the many sets of separate foo-{fg,bg,attr} options with a single foo-style option. For example: set -g status-fg yellow set -g status-bg red set -g status-attr blink Becomes: set -g status-style fg=yellow,bg=red,blink The -a flag to set can be used to add to rather than replace a style. So: set -g status-bg red Becomes: set -ag status-style bg=red Currently this is fully backwards compatible (all *-{fg,bg,attr} options remain) but the plan is to deprecate them over time. From Tiago Cunha.
2014-01-29 00:07:09 +01:00
/* Set a style option. */
struct options_entry *
cmd_set_option_style(struct cmd *self, struct cmd_q *cmdq,
const struct options_table_entry *oe, struct options *oo,
const char *value)
{
struct args *args = self->args;
struct options_entry *o;
int append;
append = args_has(args, 'a');
if ((o = options_set_style(oo, oe->name, value, append)) == NULL) {
cmdq_error(cmdq, "bad style: %s", value);
return (NULL);
}
style_update_old(oo, oe->name, &o->style);
return (o);
}
Reference in New Issue Copy Permalink