aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Complete no arg for /connect properties

Browse Source
This commit is contained in:
James Booth 2016-06-01 00:04:35 +01:00
parent 3215418296
commit 28cc04ca7d
1 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/command/cmd_ac.c
View File

@ -1527,7 +1527,6 @@ _blocked_autocomplete(ProfWin *window, const char *const input)
return NULL; return NULL;
} }
static char* static char*
_bookmark_autocomplete(ProfWin *window, const char *const input) _bookmark_autocomplete(ProfWin *window, const char *const input)
{ {
@ -2468,23 +2467,14 @@ _connect_autocomplete(ProfWin *window, const char *const input)
char *found = NULL; char *found = NULL;
gboolean result = FALSE; gboolean result = FALSE;
gchar **args = parse_args(input, 2, 6, &result); gchar **args = parse_args(input, 1, 7, &result);
if ((strncmp(input, "/connect", 8) == 0) && (result == TRUE)) { if (result) {
gboolean space_at_end = g_str_has_suffix(input, " ");
GString *beginning = g_string_new("/connect"); GString *beginning = g_string_new("/connect");
g_string_append(beginning, args[0]); int num_args = g_strv_length(args);
if (args[1] && args[2]) { if ((num_args == 1 && space_at_end) || (num_args == 2 && !space_at_end)) {
g_string_append(beginning, " "); g_string_append_printf(beginning, " %s", args[0]);
g_string_append(beginning, args[1]);
g_string_append(beginning, " ");
g_string_append(beginning, args[2]);
if (args[3] && args[4]) {
g_string_append(beginning, " ");
g_string_append(beginning, args[3]);
g_string_append(beginning, " ");
g_string_append(beginning, args[4]);
}
}
found = autocomplete_param_with_ac(input, beginning->str, connect_property_ac, TRUE); found = autocomplete_param_with_ac(input, beginning->str, connect_property_ac, TRUE);
g_string_free(beginning, TRUE); g_string_free(beginning, TRUE);
if (found) { if (found) {
@ -2492,44 +2482,53 @@ _connect_autocomplete(ProfWin *window, const char *const input)
return found; return found;
} }
} }
if ((num_args == 2 && space_at_end && (g_strcmp0(args[1], "tls") == 0))
g_strfreev(args); || (num_args == 3 && (g_strcmp0(args[1], "tls") == 0) && !space_at_end)) {
g_string_append_printf(beginning, " %s %s", args[0], args[1]);
result = FALSE;
args = parse_args(input, 2, 7, &result);
if ((strncmp(input, "/connect", 8) == 0) && (result == TRUE)) {
GString *beginning = g_string_new("/connect ");
g_string_append(beginning, args[0]);
int curr = 0;
if (args[1]) {
g_string_append(beginning, " ");
g_string_append(beginning, args[1]);
curr = 1;
if (args[2] && args[3]) {
g_string_append(beginning, " ");
g_string_append(beginning, args[2]);
g_string_append(beginning, " ");
g_string_append(beginning, args[3]);
curr = 3;
if (args[4] && args[5]) {
g_string_append(beginning, " ");
g_string_append(beginning, args[4]);
g_string_append(beginning, " ");
g_string_append(beginning, args[5]);
curr = 5;
}
}
}
if (curr != 0 && (g_strcmp0(args[curr], "tls") == 0)) {
found = autocomplete_param_with_ac(input, beginning->str, tls_property_ac, TRUE); found = autocomplete_param_with_ac(input, beginning->str, tls_property_ac, TRUE);
g_string_free(beginning, TRUE); g_string_free(beginning, TRUE);
if (found) { if (found) {
g_strfreev(args); g_strfreev(args);
return found; return found;
} }
} else { }
if ((num_args == 3 && space_at_end) || (num_args == 4 && !space_at_end)) {
g_string_append_printf(beginning, " %s %s %s", args[0], args[1], args[2]);
found = autocomplete_param_with_ac(input, beginning->str, connect_property_ac, TRUE);
g_string_free(beginning, TRUE); g_string_free(beginning, TRUE);
if (found) {
g_strfreev(args);
return found;
}
}
if ((num_args == 4 && space_at_end && (g_strcmp0(args[3], "tls") == 0))
|| (num_args == 5 && (g_strcmp0(args[3], "tls") == 0) && !space_at_end)) {
g_string_append_printf(beginning, " %s %s %s %s", args[0], args[1], args[2], args[3]);
found = autocomplete_param_with_ac(input, beginning->str, tls_property_ac, TRUE);
g_string_free(beginning, TRUE);
if (found) {
g_strfreev(args);
return found;
}
}
if ((num_args == 5 && space_at_end) || (num_args == 6 && !space_at_end)) {
g_string_append_printf(beginning, " %s %s %s %s %s", args[0], args[1], args[2], args[3], args[4]);
found = autocomplete_param_with_ac(input, beginning->str, connect_property_ac, TRUE);
g_string_free(beginning, TRUE);
if (found) {
g_strfreev(args);
return found;
}
}
if ((num_args == 6 && space_at_end && (g_strcmp0(args[5], "tls") == 0))
|| (num_args == 7 && (g_strcmp0(args[5], "tls") == 0) && !space_at_end)) {
g_string_append_printf(beginning, " %s %s %s %s %s %s", args[0], args[1], args[2], args[3], args[4], args[5]);
found = autocomplete_param_with_ac(input, beginning->str, tls_property_ac, TRUE);
g_string_free(beginning, TRUE);
if (found) {
g_strfreev(args);
return found;
}
} }
} }