mirror of
https://github.com/irssi/irssi.git
synced 2024-09-08 04:26:01 -04:00
Applied patch from fs#275 to make /hilight -mask -line work properly
This commit is contained in:
parent
fc3c0a8420
commit
deb6ca1b1a
@ -175,6 +175,7 @@ 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 */
|
||||
@ -187,8 +188,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_nick(server, target, nick, address, MSGLEVEL_PUBLIC, msg);
|
||||
color = (hilight == NULL) ? NULL : hilight_get_color(hilight);
|
||||
hilight_match(server, target, nick, address, MSGLEVEL_PUBLIC, msg, &match_beg, &match_end);
|
||||
color = (hilight == NULL || !hilight->nick) ? NULL : hilight_get_color(hilight);
|
||||
|
||||
print_channel = chanrec == NULL ||
|
||||
!window_item_is_active((WI_ITEM_REC *) chanrec);
|
||||
@ -214,10 +215,13 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
|
||||
if (printnick == NULL)
|
||||
printnick = nick;
|
||||
|
||||
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;
|
||||
if (color != NULL) {
|
||||
/* highlighted nick */
|
||||
TEXT_DEST_REC dest;
|
||||
format_create_dest(&dest, server, target, level, NULL);
|
||||
hilight_update_text_dest(&dest,hilight);
|
||||
if (!print_channel) /* message to active channel in window */
|
||||
printformat_dest(&dest, TXT_PUBMSG_HILIGHT, color,
|
||||
@ -228,11 +232,11 @@ static void sig_message_public(SERVER_REC *server, const char *msg,
|
||||
nickmode);
|
||||
} else {
|
||||
if (!print_channel)
|
||||
printformat(server, target, level,
|
||||
printformat_dest(&dest,
|
||||
for_me ? TXT_PUBMSG_ME : TXT_PUBMSG,
|
||||
printnick, msg, nickmode);
|
||||
else
|
||||
printformat(server, target, level,
|
||||
printformat_dest(&dest,
|
||||
for_me ? TXT_PUBMSG_ME_CHANNEL :
|
||||
TXT_PUBMSG_CHANNEL,
|
||||
printnick, target, msg, nickmode);
|
||||
|
@ -416,6 +416,8 @@ void format_create_dest_tag(TEXT_DEST_REC *dest, void *server,
|
||||
dest->server_tag = server != NULL ? SERVER(server)->tag : server_tag;
|
||||
dest->target = target;
|
||||
dest->level = level;
|
||||
dest->match_beg = 0;
|
||||
dest->match_end = 0;
|
||||
dest->window = window != NULL ? window :
|
||||
window_find_closest(server, target, level);
|
||||
}
|
||||
|
@ -45,6 +45,9 @@ struct _FORMAT_REC {
|
||||
#define PRINT_FLAG_SET_SERVERTAG 0x0010
|
||||
#define PRINT_FLAG_UNSET_SERVERTAG 0x0020
|
||||
|
||||
// FIXME: sould use better
|
||||
typedef struct _HILIGHT_REC HILIGHT_REC;
|
||||
|
||||
typedef struct _TEXT_DEST_REC {
|
||||
WINDOW_REC *window;
|
||||
SERVER_REC *server;
|
||||
@ -52,6 +55,9 @@ typedef struct _TEXT_DEST_REC {
|
||||
const char *target;
|
||||
int level;
|
||||
|
||||
HILIGHT_REC *hilight;
|
||||
int match_beg;
|
||||
int match_end;
|
||||
int hilight_priority;
|
||||
char *hilight_color;
|
||||
int flags;
|
||||
|
@ -325,11 +325,10 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text,
|
||||
if (dest->level & MSGLEVEL_NOHILIGHT)
|
||||
return;
|
||||
|
||||
hilight_start = hilight_end = 0;
|
||||
hilight = hilight_match(dest->server, dest->target,
|
||||
NULL, NULL, dest->level, stripped,
|
||||
&hilight_start,
|
||||
&hilight_end);
|
||||
hilight_start = dest->match_beg;
|
||||
hilight_end = dest->match_end;
|
||||
hilight = dest->hilight;
|
||||
|
||||
if (hilight == NULL)
|
||||
return;
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
#include "formats.h"
|
||||
|
||||
typedef struct _HILIGHT_REC HILIGHT_REC;
|
||||
//typedef struct _HILIGHT_REC HILIGHT_REC;
|
||||
|
||||
struct _HILIGHT_REC {
|
||||
char *text;
|
||||
|
Loading…
Reference in New Issue
Block a user