keep track of address in text_dest for hilight purposes

This commit is contained in:
ailin-nemui 2015-12-28 00:07:42 +01:00
commit 7cc85b9427
4 changed files with 10 additions and 14 deletions

View file

@ -175,7 +175,6 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
int for_me, print_channel, level;
char *nickmode, *color, *freemsg = NULL;
HILIGHT_REC *hilight;
int match_beg = 0, match_end = 0;
/* NOTE: this may return NULL if some channel is just closed with
/WINDOW CLOSE and server still sends the few last messages */
@ -188,8 +187,8 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
nick_match_msg(chanrec, msg, server->nick) :
nick_match_msg_everywhere(chanrec, msg, server->nick);
hilight = for_me ? NULL :
hilight_match(server, target, nick, address, MSGLEVEL_PUBLIC, msg, &match_beg, &match_end);
color = (hilight == NULL || !hilight->nick) ? NULL : hilight_get_color(hilight);
hilight_match_nick(server, target, nick, address, MSGLEVEL_PUBLIC, msg);
color = (hilight == NULL) ? NULL : hilight_get_color(hilight);
print_channel = chanrec == NULL ||
!window_item_is_active((WI_ITEM_REC *) chanrec);
@ -217,9 +216,8 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
TEXT_DEST_REC dest;
format_create_dest(&dest, server, target, level, NULL);
dest.hilight = hilight;
dest.match_beg = match_beg;
dest.match_end = match_end;
dest.address = address;
dest.nick = nick;
if (color != NULL) {
/* highlighted nick */
hilight_update_text_dest(&dest,hilight);