mirror of
https://github.com/tmux/tmux.git
synced 2024-12-12 17:38:48 +00:00
Add a -a flag to set-option and set-window-option to append to an existing
string value, useful for terminal-overrides.
This commit is contained in:
parent
a0647f1616
commit
12ef3ceda1
@ -31,8 +31,8 @@ int cmd_set_option_exec(struct cmd *, struct cmd_ctx *);
|
||||
|
||||
const struct cmd_entry cmd_set_option_entry = {
|
||||
"set-option", "set",
|
||||
CMD_OPTION_SESSION_USAGE,
|
||||
0, CMD_CHFLAG('g')|CMD_CHFLAG('u'),
|
||||
"[-agu] " CMD_OPTION_SESSION_USAGE,
|
||||
0, CMD_CHFLAG('a')|CMD_CHFLAG('g')|CMD_CHFLAG('u'),
|
||||
NULL,
|
||||
cmd_option_parse,
|
||||
cmd_set_option_exec,
|
||||
@ -144,7 +144,8 @@ cmd_set_option_exec(struct cmd *self, struct cmd_ctx *ctx)
|
||||
} else {
|
||||
switch (entry->type) {
|
||||
case SET_OPTION_STRING:
|
||||
set_option_string(ctx, oo, entry, data->value);
|
||||
set_option_string(ctx, oo, entry,
|
||||
data->value, data->chflags & CMD_CHFLAG('a'));
|
||||
break;
|
||||
case SET_OPTION_NUMBER:
|
||||
set_option_number(ctx, oo, entry, data->value);
|
||||
|
@ -31,8 +31,8 @@ int cmd_set_window_option_exec(struct cmd *, struct cmd_ctx *);
|
||||
|
||||
const struct cmd_entry cmd_set_window_option_entry = {
|
||||
"set-window-option", "setw",
|
||||
CMD_OPTION_WINDOW_USAGE,
|
||||
0, CMD_CHFLAG('g')|CMD_CHFLAG('u'),
|
||||
"[-agu] " CMD_OPTION_WINDOW_USAGE,
|
||||
0, CMD_CHFLAG('a')|CMD_CHFLAG('g')|CMD_CHFLAG('u'),
|
||||
NULL,
|
||||
cmd_option_parse,
|
||||
cmd_set_window_option_exec,
|
||||
@ -134,7 +134,8 @@ cmd_set_window_option_exec(struct cmd *self, struct cmd_ctx *ctx)
|
||||
} else {
|
||||
switch (entry->type) {
|
||||
case SET_OPTION_STRING:
|
||||
set_option_string(ctx, oo, entry, data->value);
|
||||
set_option_string(ctx, oo, entry,
|
||||
data->value, data->chflags & CMD_CHFLAG('a'));
|
||||
break;
|
||||
case SET_OPTION_NUMBER:
|
||||
set_option_number(ctx, oo, entry, data->value);
|
||||
|
@ -25,15 +25,26 @@
|
||||
|
||||
void
|
||||
set_option_string(struct cmd_ctx *ctx, struct options *oo,
|
||||
const struct set_option_entry *entry, char *value)
|
||||
const struct set_option_entry *entry, char *value, int append)
|
||||
{
|
||||
char *oldvalue, *newvalue;
|
||||
|
||||
if (value == NULL) {
|
||||
ctx->error(ctx, "empty value");
|
||||
return;
|
||||
}
|
||||
|
||||
options_set_string(oo, entry->name, "%s", value);
|
||||
ctx->info(ctx, "set option: %s -> %s", entry->name, value);
|
||||
if (append) {
|
||||
oldvalue = options_get_string(oo, entry->name);
|
||||
xasprintf(&newvalue, "%s%s", oldvalue, value);
|
||||
} else
|
||||
newvalue = value;
|
||||
|
||||
options_set_string(oo, entry->name, "%s", newvalue);
|
||||
ctx->info(ctx, "set option: %s -> %s", entry->name, newvalue);
|
||||
|
||||
if (newvalue != value)
|
||||
xfree(newvalue);
|
||||
}
|
||||
|
||||
void
|
||||
|
10
tmux.1
10
tmux.1
@ -1021,12 +1021,17 @@ command.
|
||||
Commands which set options are as follows:
|
||||
.Bl -tag -width Ds
|
||||
.It Xo Ic set-option
|
||||
.Op Fl gu
|
||||
.Op Fl agu
|
||||
.Op Fl t Ar target-session
|
||||
.Ar option Ar value
|
||||
.Xc
|
||||
.D1 (alias: Ic set )
|
||||
Set a session option.
|
||||
With
|
||||
.Fl a ,
|
||||
and if the option expects a string,
|
||||
.Ar value
|
||||
is appended to the existing setting.
|
||||
If
|
||||
.Fl g
|
||||
is specified, the global session option is set.
|
||||
@ -1310,13 +1315,14 @@ for which the
|
||||
window option is enabled.
|
||||
.El
|
||||
.It Xo Ic set-window-option
|
||||
.Op Fl gu
|
||||
.Op Fl agu
|
||||
.Op Fl t Ar target-window
|
||||
.Ar option Ar value
|
||||
.Xc
|
||||
.D1 (alias: Ic setw )
|
||||
Set a window option.
|
||||
The
|
||||
.Fl a ,
|
||||
.Fl g
|
||||
and
|
||||
.Fl u
|
||||
|
10
tmux.h
10
tmux.h
@ -1172,7 +1172,7 @@ int tty_keys_next(struct tty *, int *, u_char *);
|
||||
|
||||
/* options-cmd.c */
|
||||
void set_option_string(struct cmd_ctx *,
|
||||
struct options *, const struct set_option_entry *, char *);
|
||||
struct options *, const struct set_option_entry *, char *, int);
|
||||
void set_option_number(struct cmd_ctx *,
|
||||
struct options *, const struct set_option_entry *, char *);
|
||||
void set_option_key(struct cmd_ctx *,
|
||||
@ -1326,10 +1326,10 @@ void cmd_buffer_init(struct cmd *, int);
|
||||
int cmd_buffer_parse(struct cmd *, int, char **, char **);
|
||||
void cmd_buffer_free(struct cmd *);
|
||||
size_t cmd_buffer_print(struct cmd *, char *, size_t);
|
||||
#define CMD_OPTION_PANE_USAGE "[-gu] [-t target-pane] option [value]"
|
||||
#define CMD_OPTION_WINDOW_USAGE "[-gu] [-t target-window] option [value]"
|
||||
#define CMD_OPTION_SESSION_USAGE "[-gu] [-t target-session] option [value]"
|
||||
#define CMD_OPTION_CLIENT_USAGE "[-gu] [-t target-client] option [value]"
|
||||
#define CMD_OPTION_PANE_USAGE "[-t target-pane] option [value]"
|
||||
#define CMD_OPTION_WINDOW_USAGE "[-t target-window] option [value]"
|
||||
#define CMD_OPTION_SESSION_USAGE "[-t target-session] option [value]"
|
||||
#define CMD_OPTION_CLIENT_USAGE "[-t target-client] option [value]"
|
||||
void cmd_option_init(struct cmd *, int);
|
||||
int cmd_option_parse(struct cmd *, int, char **, char **);
|
||||
void cmd_option_free(struct cmd *);
|
||||
|
Loading…
Reference in New Issue
Block a user