foxiepaws
/
weechat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix completion with non-latin nicks (bug #18993)

v2.8-utf8proc
Sebastien Helleu 2009-05-09 13:03:44 +02:00
parent 2c60a46670
commit 8a783825de
3 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,7 +1,7 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2009-04-28
ChangeLog - 2009-05-09
Version 0.2.7 (under dev!):
@ -48,6 +48,7 @@ Version 0.2.7 (under dev!):
scroll with page_up and page_down keys (task #8702)
* gui: add number of lines remaining after last line displayed in "-MORE-"
indicator (task #6702)
* gui: fix completion with non-latin nicks (bug #18993)
* gui: fix display bug with some weird UTF-8 chars (bug #19687)
* gui: fix bug with wide chars in input (bug #16356)
* gui: fix bug when switching window, scrollback is now preserved

4
src/core/wee-string.c
View File

@ -182,7 +182,7 @@ string_strcmp_ignore_chars (const char *string1, const char *string2,
while (string1 && string1[0] && string2 && string2[0])
{
/* skip digits */
/* skip ignored chars */
while (string1 && string1[0] && strchr (chars_ignored, string1[0]))
{
string1 = utf8_next_char (string1);
@ -209,7 +209,7 @@ string_strcmp_ignore_chars (const char *string1, const char *string2,
string1 = utf8_next_char (string1);
string2 = utf8_next_char (string2);
/* skip digits */
/* skip ignored chars */
while (string1 && string1[0] && strchr (chars_ignored, string1[0]))
{
string1 = utf8_next_char (string1);

56
src/gui/gui-completion.c
View File

@ -229,43 +229,58 @@ gui_completion_search_command (const char *command)
}
/*
* gui_completion_is_only_alphanum: return 1 if there is only alpha/num chars
* in a string
* gui_completion_nick_has_ignored_chars: return 1 if nick has one or more
* ignored chars for nick comparison
*/
int
gui_completion_is_only_alphanum (const char *string)
gui_completion_nick_has_ignored_chars (const char *string)
{
int char_size;
char utf_char[16];
while (string[0])
{
if (strchr (CONFIG_STRING(config_completion_nick_ignore_chars),
string[0]))
return 0;
string++;
char_size = utf8_char_size (string);
memcpy (utf_char, string, char_size);
utf_char[char_size] = '\0';
if (strstr (CONFIG_STRING(config_completion_nick_ignore_chars),
utf_char))
return 1;
string += char_size;
}
return 1;
return 0;
}
/*
* gui_completion_strdup_alphanum: duplicate alpha/num chars in a string
* gui_completion_nick_strdup_ignore_chars: duplicate a nick and ignore some
* chars
*/
char *
gui_completion_strdup_alphanum (const char *string)
gui_completion_nick_strdup_ignore_chars (const char *string)
{
char *result, *pos;
int char_size;
char *result, *pos, utf_char[16];
result = malloc (strlen (string) + 1);
pos = result;
while (string[0])
{
if (!strchr (CONFIG_STRING(config_completion_nick_ignore_chars),
string[0]))
char_size = utf8_char_size (string);
memcpy (utf_char, string, char_size);
utf_char[char_size] = '\0';
if (!strstr (CONFIG_STRING(config_completion_nick_ignore_chars),
utf_char))
{
pos[0] = string[0];
pos++;
memcpy (pos, utf_char, char_size);
pos += char_size;
}
string++;
string += char_size;
}
pos[0] = '\0';
return result;
@ -285,13 +300,14 @@ gui_completion_nickncmp (const char *base_word, const char *nick, int max)
if (!CONFIG_STRING(config_completion_nick_ignore_chars)
|| !CONFIG_STRING(config_completion_nick_ignore_chars)[0]
|| !base_word || !nick || !base_word[0] || !nick[0]
|| (!gui_completion_is_only_alphanum (base_word)))
|| gui_completion_nick_has_ignored_chars (base_word))
return string_strncasecmp (base_word, nick, max);
base_word2 = gui_completion_strdup_alphanum (base_word);
nick2 = gui_completion_strdup_alphanum (nick);
base_word2 = gui_completion_nick_strdup_ignore_chars (base_word);
nick2 = gui_completion_nick_strdup_ignore_chars (nick);
return_cmp = string_strncasecmp (base_word2, nick2, strlen (base_word2));
return_cmp = string_strncasecmp (base_word2, nick2,
utf8_strlen (base_word2));
free (base_word2);
free (nick2);