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

Added /otr autocompleter and updated help

Browse Source
This commit is contained in:
James Booth
2014-01-12 00:10:16 +00:00
parent 494aaadba4
commit 43deea7c05
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/command/command.c
View File

@@ -570,12 +570,14 @@ static struct cmd_t command_defs[] =
{ "/otr", { "/otr",
cmd_otr, parse_args, 1, 2, NULL, cmd_otr, parse_args, 1, 2, NULL,
{ "/otr gen|myfp|start", "Off The Record encryption commands.", { "/otr gen|myfp|theirfp|start|end", "Off The Record encryption commands.",
{ "/otr gen|myfp|start", { "/otr gen|myfp|theirfp|start|end",
"-------------------", "-------------------------------",
"gen - Generate your private key.", "gen - Generate your private key.",
"myfp - Show your fingerprint.", "myfp - Show your fingerprint.",
"theirfp - Show contacts fingerprint.",
"start - Start an OTR session with the current recipient.", "start - Start an OTR session with the current recipient.",
"end - End the current OTR session,",
NULL } } }, NULL } } },
{ "/outtype", { "/outtype",
@@ -828,6 +830,7 @@ static Autocomplete wins_ac;
static Autocomplete roster_ac; static Autocomplete roster_ac;
static Autocomplete group_ac; static Autocomplete group_ac;
static Autocomplete bookmark_ac; static Autocomplete bookmark_ac;
static Autocomplete otr_ac;
/* /*
* Initialise command autocompleter and history * Initialise command autocompleter and history
@@ -980,6 +983,13 @@ cmd_init(void)
autocomplete_add(bookmark_ac, "list"); autocomplete_add(bookmark_ac, "list");
autocomplete_add(bookmark_ac, "remove"); autocomplete_add(bookmark_ac, "remove");
otr_ac = autocomplete_new();
autocomplete_add(otr_ac, "gen");
autocomplete_add(otr_ac, "start");
autocomplete_add(otr_ac, "end");
autocomplete_add(otr_ac, "myfp");
autocomplete_add(otr_ac, "theirfp");
cmd_history_init(); cmd_history_init();
} }
@@ -1010,6 +1020,7 @@ cmd_uninit(void)
autocomplete_free(roster_ac); autocomplete_free(roster_ac);
autocomplete_free(group_ac); autocomplete_free(group_ac);
autocomplete_free(bookmark_ac); autocomplete_free(bookmark_ac);
autocomplete_free(otr_ac);
} }
// Command autocompletion functions // Command autocompletion functions
@@ -1083,6 +1094,7 @@ cmd_reset_autocomplete()
autocomplete_reset(roster_ac); autocomplete_reset(roster_ac);
autocomplete_reset(group_ac); autocomplete_reset(group_ac);
autocomplete_reset(bookmark_ac); autocomplete_reset(bookmark_ac);
autocomplete_reset(otr_ac);
bookmark_autocomplete_reset(); bookmark_autocomplete_reset();
} }
@@ -1307,8 +1319,8 @@ _cmd_complete_parameters(char *input, int *size)
return; return;
} }
gchar *cmds[] = { "/help", "/prefs", "/log", "/disco", "/close", "/wins" }; gchar *cmds[] = { "/help", "/prefs", "/log", "/disco", "/close", "/wins", "/otr" };
Autocomplete completers[] = { help_ac, prefs_ac, log_ac, disco_ac, close_ac, wins_ac }; Autocomplete completers[] = { help_ac, prefs_ac, log_ac, disco_ac, close_ac, wins_ac, otr_ac };
for (i = 0; i < ARRAY_SIZE(cmds); i++) { for (i = 0; i < ARRAY_SIZE(cmds); i++) {
result = autocomplete_param_with_ac(input, size, cmds[i], completers[i]); result = autocomplete_param_with_ac(input, size, cmds[i], completers[i]);