devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Renamed args to /occupants default

Browse Source
This commit is contained in:
James Booth
2014-10-09 22:39:57 +01:00
parent ce7cb3f40f
commit 3615736762
6 changed files with 84 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/command/command.c
View File

@@ -89,6 +89,7 @@ static char * _join_autocomplete(char *input, int *size);
static char * _log_autocomplete(char *input, int *size);
static char * _form_autocomplete(char *input, int *size);
static char * _room_autocomplete(char *input, int *size);
static char * _occupants_autocomplete(char *input, int *size);
GHashTable *commands = NULL;
@@ -318,12 +319,13 @@ static struct cmd_t command_defs[] =
NULL } } },
{ "/occupants",
cmd_occupants, parse_args, 1, 1, NULL,
{ "/occupants show|hide", "Room configuration.",
{ "/occupants show|hide",
"--------------------",
"show - Show the occupants panel in chat rooms.",
"hide - Hide the occupants panel in chat rooms.",
cmd_occupants, parse_args, 1, 2, &cons_occupants_setting,
{ "/occupants show|hide|default [show|hide]", "Show or hide room occupants.",
{ "/occupants show|hide|default [show|hide]",
"----------------------------------------",
"show - Show the occupants panel in chat rooms.",
"hide - Hide the occupants panel in chat rooms.",
"default - Whether occupants are shown by default in new rooms, 'show' or 'hide'",
NULL } } },
{ "/form",
@@ -988,6 +990,7 @@ static Autocomplete room_cmd_ac;
static Autocomplete room_subject_ac;
static Autocomplete form_ac;
static Autocomplete occupants_ac;
static Autocomplete occupants_default_ac;
/*
* Initialise command autocompleter and history
@@ -1299,6 +1302,11 @@ cmd_init(void)
occupants_ac = autocomplete_new();
autocomplete_add(occupants_ac, "show");
autocomplete_add(occupants_ac, "hide");
autocomplete_add(occupants_ac, "default");
occupants_default_ac = autocomplete_new();
autocomplete_add(occupants_default_ac, "show");
autocomplete_add(occupants_default_ac, "hide");
cmd_history_init();
}
@@ -1349,6 +1357,7 @@ cmd_uninit(void)
autocomplete_free(room_subject_ac);
autocomplete_free(form_ac);
autocomplete_free(occupants_ac);
autocomplete_free(occupants_default_ac);
}
gboolean
@@ -1481,6 +1490,7 @@ cmd_reset_autocomplete()
autocomplete_reset(room_subject_ac);
autocomplete_reset(form_ac);
autocomplete_reset(occupants_ac);
autocomplete_reset(occupants_default_ac);
if (ui_current_win_type() == WIN_MUC_CONFIG) {
ProfWin *window = wins_get_current();
@@ -1738,8 +1748,8 @@ _cmd_complete_parameters(char *input, int *size)
}
}
gchar *cmds[] = { "/help", "/prefs", "/disco", "/close", "/wins", "/occupants" };
Autocomplete completers[] = { help_ac, prefs_ac, disco_ac, close_ac, wins_ac, occupants_ac };
gchar *cmds[] = { "/help", "/prefs", "/disco", "/close", "/wins" };
Autocomplete completers[] = { help_ac, prefs_ac, disco_ac, close_ac, wins_ac };
for (i = 0; i < ARRAY_SIZE(cmds); i++) {
result = autocomplete_param_with_ac(input, size, cmds[i], completers[i], TRUE);
@@ -1769,6 +1779,7 @@ _cmd_complete_parameters(char *input, int *size)
g_hash_table_insert(ac_funcs, "/join", _join_autocomplete);
g_hash_table_insert(ac_funcs, "/form", _form_autocomplete);
g_hash_table_insert(ac_funcs, "/room", _room_autocomplete);
g_hash_table_insert(ac_funcs, "/occupants", _occupants_autocomplete);
char parsed[*size+1];
i = 0;
@@ -2291,6 +2302,24 @@ _form_autocomplete(char *input, int *size)
return NULL;
}
static char *
_occupants_autocomplete(char *input, int *size)
{
char *found = NULL;
found = autocomplete_param_with_ac(input, size, "/occupants default", occupants_default_ac, TRUE);
if (found != NULL) {
return found;
}
found = autocomplete_param_with_ac(input, size, "/occupants", occupants_ac, TRUE);
if (found != NULL) {
return found;
}
return NULL;
}
static char *
_room_autocomplete(char *input, int *size)
{