aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-07-07 18:04:15 -04:00
Code

Added quote param to autocomplete searches

Browse Source
This commit is contained in:
James Booth 2014-07-09 20:15:20 +01:00
parent 88180568e0
commit 0c9851106b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/autocomplete.c
View File

@ -34,7 +34,7 @@ struct autocomplete_t {
gchar *search_str;
};
static gchar * _search_from(Autocomplete ac, GSList *curr);
static gchar * _search_from(Autocomplete ac, GSList *curr, gboolean quote);
Autocomplete
autocomplete_new(void)
@ -166,18 +166,18 @@ autocomplete_complete(Autocomplete ac, gchar *search_str)
FREE_SET_NULL(ac->search_str);
}
ac->search_str = strdup(search_str);
found = _search_from(ac, ac->items);
found = _search_from(ac, ac->items, TRUE);
return found;
// subsequent search attempt
} else {
// search from here+1 tp end
found = _search_from(ac, g_slist_next(ac->last_found));
found = _search_from(ac, g_slist_next(ac->last_found), TRUE);
if (found != NULL)
return found;
// search from beginning
found = _search_from(ac, ac->items);
found = _search_from(ac, ac->items, TRUE);
if (found != NULL)
return found;
@ -292,7 +292,7 @@ autocomplete_param_no_with_func(char *input, int *size, char *command,
}
static gchar *
_search_from(Autocomplete ac, GSList *curr)
_search_from(Autocomplete ac, GSList *curr, gboolean quote)
{
while(curr) {
@ -303,7 +303,7 @@ _search_from(Autocomplete ac, GSList *curr)
ac->last_found = curr;
// if contains space, quote before returning
if (g_strrstr(curr->data, " ")) {
if (quote && g_strrstr(curr->data, " ")) {
GString *quoted = g_string_new("\"");
g_string_append(quoted, curr->data);
g_string_append(quoted, "\"");
@ -323,4 +323,4 @@ _search_from(Autocomplete ac, GSList *curr)
}
return NULL;
}
}