aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

FS#155 hilight -tag

Browse Source
This commit is contained in:
Manuel Leiner 2014-01-11 15:38:25 +01:00 committed by Ailin Nemui
parent fc00b9e6f0
commit 669add63e8
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fe-common/core/hilight-text.c
View File

@ -78,6 +78,7 @@ static void hilight_add_config(HILIGHT_REC *rec)
if (rec->nickmask) iconfig_node_set_bool(node, "mask", TRUE);
if (rec->fullword) iconfig_node_set_bool(node, "fullword", TRUE);
if (rec->regexp) iconfig_node_set_bool(node, "regexp", TRUE);
if (rec->tag) iconfig_node_set_str(node,"tag",rec->tag);
if (rec->channels != NULL && *rec->channels != NULL) {
node = config_node_section(node, "channels", NODE_TYPE_LIST);
@ -267,6 +268,7 @@ HILIGHT_REC *hilight_match(SERVER_REC *server, const char *channel,
if (!rec->nickmask && hilight_match_level(rec, level) &&
hilight_match_channel(rec, channel) &&
(rec->tag == NULL || (server != NULL && rec->tag != NULL && server->tag !=NULL && strcmp(rec->tag,server->tag) == 0)) &&
hilight_match_text(rec, str, match_beg, match_end))
return rec;
}
@ -465,7 +467,7 @@ static void read_hilight_config(void)
rec->nickmask = config_node_get_bool(node, "mask", FALSE);
rec->fullword = config_node_get_bool(node, "fullword", FALSE);
rec->regexp = config_node_get_bool(node, "regexp", FALSE);
rec->tag = config_node_get_str(node,"tag",NULL);
hilight_init_rec(rec);
node = config_node_section(node, "channels", -1);
@ -498,6 +500,8 @@ static void hilight_print(int index, HILIGHT_REC *rec)
if (rec->priority != 0)
g_string_append_printf(options, "-priority %d ", rec->priority);
if (rec->tag != NULL)
g_string_append_printf(options, "-tag %s ", rec->tag);
if (rec->color != NULL)
g_string_append_printf(options, "-color %s ", rec->color);
if (rec->act_color != NULL)
@ -541,7 +545,7 @@ static void cmd_hilight(const char *data)
{
GHashTable *optlist;
HILIGHT_REC *rec;
char *colorarg, *actcolorarg, *levelarg, *priorityarg, *chanarg, *text;
char *colorarg, *actcolorarg, *levelarg, *priorityarg, *chanarg, *text, *tagarg=NULL;
char **channels;
void *free_arg;
@ -561,6 +565,7 @@ static void cmd_hilight(const char *data)
priorityarg = g_hash_table_lookup(optlist, "priority");
colorarg = g_hash_table_lookup(optlist, "color");
actcolorarg = g_hash_table_lookup(optlist, "actcolor");
tagarg = g_hash_table_lookup(optlist,"tag");
if (*text == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@ -612,6 +617,11 @@ static void cmd_hilight(const char *data)
if (*actcolorarg != '\0')
rec->act_color = g_strdup(actcolorarg);
}
if (tagarg != NULL) {
g_free_and_null(rec->tag);
if (*tagarg != '\0')
rec->tag = g_strdup(tagarg);
}
hilight_create(rec);
@ -702,7 +712,7 @@ void hilight_text_init(void)
command_bind("hilight", NULL, (SIGNAL_FUNC) cmd_hilight);
command_bind("dehilight", NULL, (SIGNAL_FUNC) cmd_dehilight);
command_set_options("hilight", "-color -actcolor -level -priority -channels nick word line mask full regexp");
command_set_options("hilight", "-color -actcolor -level -priority -tag -channels nick word line mask full regexp");
}
void hilight_text_deinit(void)

1
src/fe-common/core/hilight-text.h
View File

@ -29,6 +29,7 @@ struct _HILIGHT_REC {
unsigned int regexp_compiled:1; /* should always be TRUE, unless regexp is invalid */
regex_t preg;
#endif
char *tag;
};
extern GSList *hilights;