mirror of
https://github.com/irssi/irssi.git
synced 2024-09-01 04:14:16 -04:00
/SET -default changes setting to it's default value.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2844 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
964ff29779
commit
82a6407634
@ -66,7 +66,7 @@ static void set_boolean(const char *key, const char *value)
|
|||||||
printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_NOT_TOGGLE);
|
printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_NOT_TOGGLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* SYNTAX: SET [-clear] [<key> [<value>]] */
|
/* SYNTAX: SET [-clear | -default] [<key> [<value>]] */
|
||||||
static void cmd_set(char *data)
|
static void cmd_set(char *data)
|
||||||
{
|
{
|
||||||
GHashTable *optlist;
|
GHashTable *optlist;
|
||||||
@ -74,13 +74,14 @@ static void cmd_set(char *data)
|
|||||||
const char *last_section;
|
const char *last_section;
|
||||||
char *key, *value;
|
char *key, *value;
|
||||||
void *free_arg;
|
void *free_arg;
|
||||||
int found, clear;
|
int found, clear, set_default;
|
||||||
|
|
||||||
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
|
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS,
|
||||||
"set", &optlist, &key, &value))
|
"set", &optlist, &key, &value))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
clear = g_hash_table_lookup(optlist, "clear") != NULL;
|
clear = g_hash_table_lookup(optlist, "clear") != NULL;
|
||||||
|
set_default = g_hash_table_lookup(optlist, "default") != NULL;
|
||||||
|
|
||||||
last_section = ""; found = 0;
|
last_section = ""; found = 0;
|
||||||
sets = settings_get_sorted();
|
sets = settings_get_sorted();
|
||||||
@ -98,20 +99,26 @@ static void cmd_set(char *data)
|
|||||||
last_section = rec->section;
|
last_section = rec->section;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (clear || *value != '\0') {
|
if (clear || set_default || *value != '\0') {
|
||||||
/* change the setting */
|
/* change the setting */
|
||||||
switch (rec->type) {
|
switch (rec->type) {
|
||||||
case SETTING_TYPE_BOOLEAN:
|
case SETTING_TYPE_BOOLEAN:
|
||||||
if (clear)
|
if (clear)
|
||||||
settings_set_bool(key, FALSE);
|
settings_set_bool(key, FALSE);
|
||||||
else
|
else if (set_default)
|
||||||
|
settings_set_bool(key, GPOINTER_TO_INT(rec->def));
|
||||||
|
else
|
||||||
set_boolean(key, value);
|
set_boolean(key, value);
|
||||||
break;
|
break;
|
||||||
case SETTING_TYPE_INT:
|
case SETTING_TYPE_INT:
|
||||||
settings_set_int(key, clear ? 0 : atoi(value));
|
settings_set_int(key, clear ? 0 :
|
||||||
|
set_default ? GPOINTER_TO_INT(rec->def) :
|
||||||
|
atoi(value));
|
||||||
break;
|
break;
|
||||||
case SETTING_TYPE_STRING:
|
case SETTING_TYPE_STRING:
|
||||||
settings_set_str(key, clear ? "" : value);
|
settings_set_str(key, clear ? "" :
|
||||||
|
set_default ? rec->def :
|
||||||
|
value);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
signal_emit("setup changed", 0);
|
signal_emit("setup changed", 0);
|
||||||
@ -334,7 +341,7 @@ void fe_settings_init(void)
|
|||||||
command_bind("unalias", NULL, (SIGNAL_FUNC) cmd_unalias);
|
command_bind("unalias", NULL, (SIGNAL_FUNC) cmd_unalias);
|
||||||
command_bind("reload", NULL, (SIGNAL_FUNC) cmd_reload);
|
command_bind("reload", NULL, (SIGNAL_FUNC) cmd_reload);
|
||||||
command_bind("save", NULL, (SIGNAL_FUNC) cmd_save);
|
command_bind("save", NULL, (SIGNAL_FUNC) cmd_save);
|
||||||
command_set_options("set", "clear");
|
command_set_options("set", "clear default");
|
||||||
|
|
||||||
signal_add("settings errors", (SIGNAL_FUNC) sig_settings_errors);
|
signal_add("settings errors", (SIGNAL_FUNC) sig_settings_errors);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user