zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-11 21:00:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Improved nick_match_msg() - it shouldn't give wrong matches as easily

Browse source 
anymore. Also supports multiple targets in one line (nick1,nick2: hello)


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@996 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-12-17 01:20:21 +00:00 • committed by cras
commit 6e19541f46
6 changed files with 82 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/fe-common/core/chat-completion.c
View file

@ -148,7 +148,7 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
channel = channel_find(server, target);
if (channel != NULL) {
list = nick_match_msg(server, msg, server->nick) ?
list = nick_match_msg(channel, msg, server->nick) ?
&channel->lastownmsgs :
&channel->lastmsgs;
last_msg_add(list, nick);

4
src/fe-common/core/fe-messages.c
View file

@ -63,7 +63,9 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
char *color;
chanrec = channel_find(server, target);
for_me = nick_match_msg(server, msg, server->nick);
g_return_if_fail(chanrec != NULL);
for_me = nick_match_msg(chanrec, msg, server->nick);
color = for_me ? NULL :
hilight_find_nick(target, nick, address, MSGLEVEL_PUBLIC, msg);

10
src/fe-common/core/window-activity.c
View file

@ -145,8 +145,7 @@ static void sig_message(SERVER_REC *server, const char *msg,
/* hilight */
if (item != NULL) item->last_color = hilight_last_nick_color();
level = (item != NULL && item->last_color > 0) ||
(level & hilight_level) ||
nick_match_msg(SERVER(server), msg, server->nick) ?
(level & hilight_level) ?
NEWDATA_HILIGHT : NEWDATA_MSG;
if (item != NULL && item->new_data < level) {
item->new_data = level;
@ -169,7 +168,12 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
const char *nick, const char *addr,
const char *target)
{
sig_message(server, msg, nick, addr, target, MSGLEVEL_PUBLIC);
int level = MSGLEVEL_PUBLIC;
if (nick_match_msg(channel_find(server, target), msg, server->nick))
level |= MSGLEVEL_HILIGHT;
sig_message(server, msg, nick, addr, target, level);
}
static void sig_message_private(SERVER_REC *server, const char *msg,