aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Settings completion works with /TOGGLE also, it completes only boolean

Browse Source 
settings. /SET completion works now even if '/' isn't in command chars.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@377 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-06-25 22:14:09 +00:00 committed by cras
parent 892afcb9e6
commit 97bf5f5b39
1 changed files with 57 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/fe-common/core/completion.c
View File

@ -269,6 +269,27 @@ static GList *completion_get_settings(const char *key)
return complist; return complist;
} }
static GList *completion_get_bool_settings(const char *key)
{
GList *complist;
GSList *tmp, *sets;
int len;
sets = settings_get_sorted();
len = strlen(key);
complist = NULL;
for (tmp = sets; tmp != NULL; tmp = tmp->next) {
SETTINGS_REC *rec = tmp->data;
if (rec->type == SETTING_TYPE_BOOLEAN &&
g_strncasecmp(rec->key, key, len) == 0)
complist = g_list_insert_sorted(complist, g_strdup(rec->key), (GCompareFunc) g_istr_cmp);
}
g_slist_free(sets);
return complist;
}
static GList *completion_get_commands(const char *cmd, char cmdchar) static GList *completion_get_commands(const char *cmd, char cmdchar)
{ {
GList *complist; GList *complist;
@ -378,14 +399,6 @@ static void sig_complete_word(GList **list, WINDOW_REC *window,
return; return;
} }
/* /SET variable name completion */
if (g_strcasecmp(linestart, "/SET") == 0) {
*list = completion_get_settings(word);
if (*list != NULL) signal_stop();
return;
}
/* command completion? */ /* command completion? */
cmdchars = settings_get_str("cmdchars"); cmdchars = settings_get_str("cmdchars");
if (strchr(cmdchars, *word) && *linestart == '\0') { if (strchr(cmdchars, *word) && *linestart == '\0') {
@ -423,6 +436,38 @@ static void sig_complete_word(GList **list, WINDOW_REC *window,
} }
} }
static void sig_complete_set(GList **list, WINDOW_REC *window,
const char *word, const char *line, int *want_space)
{
g_return_if_fail(list != NULL);
g_return_if_fail(word != NULL);
g_return_if_fail(line != NULL);
if (*line != '\0') return;
*list = completion_get_settings(word);
if (*list != NULL) {
*want_space = FALSE;
signal_stop();
}
}
static void sig_complete_toggle(GList **list, WINDOW_REC *window,
const char *word, const char *line, int *want_space)
{
g_return_if_fail(list != NULL);
g_return_if_fail(word != NULL);
g_return_if_fail(line != NULL);
if (*line != '\0') return;
*list = completion_get_bool_settings(word);
if (*list != NULL) {
*want_space = FALSE;
signal_stop();
}
}
/* first argument of command is file name - complete it */ /* first argument of command is file name - complete it */
static void sig_complete_filename(GList **list, WINDOW_REC *window, static void sig_complete_filename(GList **list, WINDOW_REC *window,
const char *word, const char *line, int *want_space) const char *word, const char *line, int *want_space)
@ -446,6 +491,8 @@ void completion_init(void)
last_linestart = NULL; last_linestart = NULL;
signal_add("complete word", (SIGNAL_FUNC) sig_complete_word); signal_add("complete word", (SIGNAL_FUNC) sig_complete_word);
signal_add("complete command set", (SIGNAL_FUNC) sig_complete_set);
signal_add("complete command toggle", (SIGNAL_FUNC) sig_complete_toggle);
signal_add("complete command cat", (SIGNAL_FUNC) sig_complete_filename); signal_add("complete command cat", (SIGNAL_FUNC) sig_complete_filename);
signal_add("complete command run", (SIGNAL_FUNC) sig_complete_filename); signal_add("complete command run", (SIGNAL_FUNC) sig_complete_filename);
signal_add("complete command save", (SIGNAL_FUNC) sig_complete_filename); signal_add("complete command save", (SIGNAL_FUNC) sig_complete_filename);
@ -459,6 +506,8 @@ void completion_deinit(void)
free_completions(); free_completions();
signal_remove("complete word", (SIGNAL_FUNC) sig_complete_word); signal_remove("complete word", (SIGNAL_FUNC) sig_complete_word);
signal_remove("complete command set", (SIGNAL_FUNC) sig_complete_set);
signal_remove("complete command toggle", (SIGNAL_FUNC) sig_complete_toggle);
signal_remove("complete command cat", (SIGNAL_FUNC) sig_complete_filename); signal_remove("complete command cat", (SIGNAL_FUNC) sig_complete_filename);
signal_remove("complete command run", (SIGNAL_FUNC) sig_complete_filename); signal_remove("complete command run", (SIGNAL_FUNC) sig_complete_filename);
signal_remove("complete command save", (SIGNAL_FUNC) sig_complete_filename); signal_remove("complete command save", (SIGNAL_FUNC) sig_complete_filename);