1 files changed, 64 insertions, 21 deletions

diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index d3e018ad..1f00feaf 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -38,11 +38,18 @@
 #include "chat-completion.h"
 #include "window-items.h"
 
+enum {
+	COMPLETE_MCASE_NEVER = 0,
+	COMPLETE_MCASE_ALWAYS,
+	COMPLETE_MCASE_AUTO,
+};
+
 static int keep_privates_count, keep_publics_count;
 static int completion_lowercase;
-static const char *completion_char, *cmdchars;
+static char *completion_char, *cmdchars;
 static GSList *global_lastmsgs;
-static int completion_auto, completion_strict;
+static int completion_auto, completion_strict, completion_empty_line;
+static int completion_match_case;
 
 #define SERVER_LAST_MSG_ADD(server, nick) \
 	last_msg_add(&((MODULE_SERVER_REC *) MODULE_DATA(server))->lastmsgs, \
@@ -52,6 +59,18 @@ static int completion_auto, completion_strict;
 	last_msg_add(&((MODULE_CHANNEL_REC *) MODULE_DATA(channel))->lastmsgs, \
 		     nick, own, keep_publics_count)
 
+static gboolean contains_uppercase(const char *s1)
+{
+	const char *ch;
+
+	for (ch = s1; *ch != '\0'; ch++) {
+		if (g_ascii_isupper(*ch))
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
 static LAST_MSG_REC *last_msg_find(GSList *list, const char *nick)
 {
 	while (list != NULL) {
@@ -336,7 +355,8 @@ GList *completion_msg(SERVER_REC *win_server,
 }
 
 static void complete_from_nicklist(GList **outlist, CHANNEL_REC *channel,
-				   const char *nick, const char *suffix)
+				   const char *nick, const char *suffix,
+				   const int match_case)
 {
         MODULE_CHANNEL_REC *mchannel;
 	GSList *tmp;
@@ -352,8 +372,10 @@ static void complete_from_nicklist(GList **outlist, CHANNEL_REC *channel,
 	for (tmp = mchannel->lastmsgs; tmp != NULL; tmp = tmp->next) {
 		LAST_MSG_REC *rec = tmp->data;
 
-		if (g_ascii_strncasecmp(rec->nick, nick, len) == 0 &&
-		    glist_find_icase_string(*outlist, rec->nick) == NULL) {
+		if ((match_case? strncmp(rec->nick, nick, len)
+		     : g_ascii_strncasecmp(rec->nick, nick, len)) == 0 &&
+		    (match_case? glist_find_string(*outlist, rec->nick)
+		     : glist_find_icase_string(*outlist, rec->nick)) == NULL) {
 			str = g_strconcat(rec->nick, suffix, NULL);
 			if (completion_lowercase) ascii_strdown(str);
 			if (rec->own)
@@ -368,7 +390,8 @@ static void complete_from_nicklist(GList **outlist, CHANNEL_REC *channel,
 
 static GList *completion_nicks_nonstrict(CHANNEL_REC *channel,
 					 const char *nick,
-					 const char *suffix)
+					 const char *suffix,
+					 const int match_case)
 {
 	GSList *nicks, *tmp;
 	GList *list;
@@ -404,7 +427,8 @@ static GList *completion_nicks_nonstrict(CHANNEL_REC *channel,
                 *out = '\0';
 
 		/* add to list if 'cleaned' nick matches */
-		if (g_ascii_strncasecmp(str, nick, len) == 0) {
+		if ((match_case? strncmp(str, nick, len)
+		     : g_ascii_strncasecmp(str, nick, len)) == 0) {
 			tnick = g_strconcat(rec->nick, suffix, NULL);
 			if (completion_lowercase)
 				ascii_strdown(tnick);
@@ -428,7 +452,7 @@ static GList *completion_channel_nicks(CHANNEL_REC *channel, const char *nick,
 	GSList *nicks, *tmp;
 	GList *list;
 	char *str;
-	int len;
+	int len, match_case;
 
 	g_return_val_if_fail(channel != NULL, NULL);
 	g_return_val_if_fail(nick != NULL, NULL);
@@ -437,9 +461,12 @@ static GList *completion_channel_nicks(CHANNEL_REC *channel, const char *nick,
 	if (suffix != NULL && *suffix == '\0')
 		suffix = NULL;
 
+	match_case = completion_match_case == COMPLETE_MCASE_ALWAYS ||
+		(completion_match_case == COMPLETE_MCASE_AUTO && contains_uppercase(nick));
+
 	/* put first the nicks who have recently said something */
 	list = NULL;
-	complete_from_nicklist(&list, channel, nick, suffix);
+	complete_from_nicklist(&list, channel, nick, suffix, match_case);
 
 	/* and add the rest of the nicks too */
 	len = strlen(nick);
@@ -447,7 +474,8 @@ static GList *completion_channel_nicks(CHANNEL_REC *channel, const char *nick,
 	for (tmp = nicks; tmp != NULL; tmp = tmp->next) {
 		NICK_REC *rec = tmp->data;
 
-		if (g_ascii_strncasecmp(rec->nick, nick, len) == 0 &&
+		if ((match_case? strncmp(rec->nick, nick, len)
+		     : g_ascii_strncasecmp(rec->nick, nick, len)) == 0 &&
 		    rec != channel->ownnick) {
 			str = g_strconcat(rec->nick, suffix, NULL);
 			if (completion_lowercase)
@@ -463,7 +491,7 @@ static GList *completion_channel_nicks(CHANNEL_REC *channel, const char *nick,
 	/* remove non alphanum chars from nick and search again in case
 	   list is still NULL ("foo<tab>" would match "_foo_" f.e.) */
 	if (!completion_strict)
-		list = g_list_concat(list, completion_nicks_nonstrict(channel, nick, suffix));
+		list = g_list_concat(list, completion_nicks_nonstrict(channel, nick, suffix, match_case));
 	return list;
 }
 
@@ -574,7 +602,7 @@ GList *completion_get_aliases(const char *word)
 
 		list = g_list_append(list, g_strdup(node->key));
 	}
-	
+
 	return list;
 }
 
@@ -641,6 +669,8 @@ static void sig_complete_word(GList **list, WINDOW_REC *window,
 		return;
 
 	if (*linestart == '\0' && *word == '\0') {
+		if (!completion_empty_line)
+			return;
 		/* pressed TAB at the start of line - add /MSG */
                 prefix = g_strdup_printf("%cmsg", *cmdchars);
 		*list = completion_msg(server, NULL, "", prefix);
@@ -781,7 +811,7 @@ GList *completion_get_servers(const char *word)
 	for (tmp = setupservers; tmp != NULL; tmp = tmp->next) {
 		SERVER_SETUP_REC *rec = tmp->data;
 
-		if (g_ascii_strncasecmp(rec->address, word, len) == 0) 
+		if (g_ascii_strncasecmp(rec->address, word, len) == 0)
 			list = g_list_append(list, g_strdup(rec->address));
 	}
 
@@ -814,12 +844,12 @@ GList *completion_get_targets(const char *word)
 
 		list = g_list_append(list, g_strdup(node->key));
 	}
-	
+
 	return list;
 }
 
 static void sig_complete_connect(GList **list, WINDOW_REC *window,
-				 const char *word, const char *line, 
+				 const char *word, const char *line,
 				 int *want_space)
 {
 	g_return_if_fail(list != NULL);
@@ -895,7 +925,7 @@ static void sig_complete_alias(GList **list, WINDOW_REC *window,
 				int *want_space)
 {
 	const char *definition;
-	
+
 	g_return_if_fail(list != NULL);
 	g_return_if_fail(word != NULL);
 	g_return_if_fail(line != NULL);
@@ -905,7 +935,7 @@ static void sig_complete_alias(GList **list, WINDOW_REC *window,
 			*list = g_list_append(NULL, g_strdup(definition));
 			signal_stop();
 		}
-	} else {	
+	} else {
 		*list = completion_get_aliases(word);
 		if (*list != NULL) signal_stop();
 	}
@@ -965,7 +995,7 @@ static void sig_complete_target(GList **list, WINDOW_REC *window,
 				int *want_space)
 {
 	const char *definition;
-	
+
 	g_return_if_fail(list != NULL);
 	g_return_if_fail(word != NULL);
 	g_return_if_fail(line != NULL);
@@ -975,7 +1005,7 @@ static void sig_complete_target(GList **list, WINDOW_REC *window,
 			*list = g_list_append(NULL, g_strdup(definition));
 			signal_stop();
 		}
-	} else {	
+	} else {
 		*list = completion_get_targets(word);
 		if (*list != NULL) signal_stop();
 	}
@@ -1126,10 +1156,18 @@ static void read_settings(void)
 	keep_privates_count = settings_get_int("completion_keep_privates");
 	keep_publics_count = settings_get_int("completion_keep_publics");
 	completion_lowercase = settings_get_bool("completion_nicks_lowercase");
-	completion_char = settings_get_str("completion_char");
-	cmdchars = settings_get_str("cmdchars");
+
 	completion_auto = settings_get_bool("completion_auto");
 	completion_strict = settings_get_bool("completion_strict");
+	completion_empty_line = settings_get_bool("completion_empty_line");
+
+	completion_match_case = settings_get_choice("completion_nicks_match_case");
+
+	g_free_not_null(completion_char);
+	completion_char = g_strdup(settings_get_str("completion_char"));
+
+	g_free_not_null(cmdchars);
+	cmdchars = g_strdup(settings_get_str("cmdchars"));
 
 	if (*completion_char == '\0') {
                 /* this would break.. */
@@ -1145,6 +1183,8 @@ void chat_completion_init(void)
 	settings_add_int("completion", "completion_keep_privates", 10);
 	settings_add_bool("completion", "completion_nicks_lowercase", FALSE);
 	settings_add_bool("completion", "completion_strict", FALSE);
+	settings_add_bool("completion", "completion_empty_line", TRUE);
+	settings_add_choice("completion", "completion_nicks_match_case", COMPLETE_MCASE_AUTO, "never;always;auto");
 
 	settings_add_bool("lookandfeel", "expand_escapes", FALSE);
 
@@ -1220,4 +1260,7 @@ void chat_completion_deinit(void)
 	signal_remove("server disconnected", (SIGNAL_FUNC) sig_server_disconnected);
 	signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
 	signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
+
+	g_free_not_null(completion_char);
+	g_free_not_null(cmdchars);
 }