PsychoticNinja/irssi
1
0
Fork 1
mirror of https://github.com/irssi/irssi.git synced 2025-04-25 20:41:23 -05:00
Code Issues Projects Releases Wiki Activity

Merge f3f995635baea704be7ab8f1027b5870905ac1a5 into ee4471a1184b7a17e11146a87c2b18caaf11e49c

Browse Source
This commit is contained in:
John R. Dennison 2024-12-17 14:54:46 +08:00 committed by GitHub
commit 2af7eb2430
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,7 @@ static void hilight_add_config(HILIGHT_REC *rec)
if (rec->regexp) iconfig_node_set_bool(node, "regexp", TRUE); if (rec->regexp) iconfig_node_set_bool(node, "regexp", TRUE);
if (rec->case_sensitive) iconfig_node_set_bool(node, "matchcase", TRUE); if (rec->case_sensitive) iconfig_node_set_bool(node, "matchcase", TRUE);
if (rec->servertag) iconfig_node_set_str(node, "servertag", rec->servertag); if (rec->servertag) iconfig_node_set_str(node, "servertag", rec->servertag);
if (rec->comment) iconfig_node_set_str(node, "comment", rec->comment);
if (rec->channels != NULL && *rec->channels != NULL) { if (rec->channels != NULL && *rec->channels != NULL) {
node = iconfig_node_section(node, "channels", NODE_TYPE_LIST); node = iconfig_node_section(node, "channels", NODE_TYPE_LIST);
@ -107,6 +108,7 @@ static void hilight_destroy(HILIGHT_REC *rec)
g_free_not_null(rec->color); g_free_not_null(rec->color);
g_free_not_null(rec->act_color); g_free_not_null(rec->act_color);
g_free_not_null(rec->servertag); g_free_not_null(rec->servertag);
g_free_not_null(rec->comment);
g_free(rec->text); g_free(rec->text);
g_free(rec); g_free(rec);
} }
@ -506,7 +508,7 @@ static void read_hilight_config(void)
CONFIG_NODE *node; CONFIG_NODE *node;
HILIGHT_REC *rec; HILIGHT_REC *rec;
GSList *tmp; GSList *tmp;
char *text, *color, *servertag; char *text, *color, *servertag, *comment;
hilights_destroy_all(); hilights_destroy_all();
@ -552,6 +554,9 @@ static void read_hilight_config(void)
servertag = config_node_get_str(node, "servertag", NULL); servertag = config_node_get_str(node, "servertag", NULL);
rec->servertag = servertag == NULL || *servertag == '\0' ? NULL : rec->servertag = servertag == NULL || *servertag == '\0' ? NULL :
g_strdup(servertag); g_strdup(servertag);
comment = config_node_get_str(node, "comment", NULL);
rec->comment = comment == NULL || *comment == '\0' ? NULL :
g_strdup(comment);
hilight_init_rec(rec); hilight_init_rec(rec);
node = iconfig_node_section(node, "channels", -1); node = iconfig_node_section(node, "channels", -1);
@ -589,6 +594,8 @@ static void hilight_print(int index, HILIGHT_REC *rec)
g_string_append_printf(options, "-priority %d ", rec->priority); g_string_append_printf(options, "-priority %d ", rec->priority);
if (rec->servertag != NULL) if (rec->servertag != NULL)
g_string_append_printf(options, "-network %s ", rec->servertag); g_string_append_printf(options, "-network %s ", rec->servertag);
if (rec->comment != NULL)
g_string_append_printf(options, "-comment %s ", rec->comment);
if (rec->color != NULL) if (rec->color != NULL)
g_string_append_printf(options, "-color %s ", rec->color); g_string_append_printf(options, "-color %s ", rec->color);
if (rec->act_color != NULL) if (rec->act_color != NULL)
@ -627,12 +634,12 @@ static void cmd_hilight_show(void)
/* SYNTAX: HILIGHT [-nick | -word | -line] [-mask | -full | -matchcase | -regexp] /* SYNTAX: HILIGHT [-nick | -word | -line] [-mask | -full | -matchcase | -regexp]
[-color <color>] [-actcolor <color>] [-level <level>] [-color <color>] [-actcolor <color>] [-level <level>]
[-network <network>] [-channels <channels>] <text> */ [-network <network>] [-channels <channels>] [-comment <comment> <text> */
static void cmd_hilight(const char *data) static void cmd_hilight(const char *data)
{ {
GHashTable *optlist; GHashTable *optlist;
HILIGHT_REC *rec; HILIGHT_REC *rec;
char *colorarg, *actcolorarg, *levelarg, *priorityarg, *chanarg, *text, *servertag; char *colorarg, *actcolorarg, *levelarg, *priorityarg, *chanarg, *text, *servertag, *comment;
char **channels; char **channels;
void *free_arg; void *free_arg;
@ -653,6 +660,7 @@ static void cmd_hilight(const char *data)
colorarg = g_hash_table_lookup(optlist, "color"); colorarg = g_hash_table_lookup(optlist, "color");
actcolorarg = g_hash_table_lookup(optlist, "actcolor"); actcolorarg = g_hash_table_lookup(optlist, "actcolor");
servertag = g_hash_table_lookup(optlist, "network"); servertag = g_hash_table_lookup(optlist, "network");
comment = g_hash_table_lookup(optlist, "comment");
if (*text == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*text == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@ -710,6 +718,11 @@ static void cmd_hilight(const char *data)
if (*servertag != '\0') if (*servertag != '\0')
rec->servertag = g_strdup(servertag); rec->servertag = g_strdup(servertag);
} }
if (comment != NULL) {
g_free_and_null(rec->comment);
if (*comment != '\0')
rec->comment = g_strdup(comment);
}
hilight_create(rec); hilight_create(rec);
@ -803,7 +816,7 @@ void hilight_text_init(void)
command_bind("hilight", NULL, (SIGNAL_FUNC) cmd_hilight); command_bind("hilight", NULL, (SIGNAL_FUNC) cmd_hilight);
command_bind("dehilight", NULL, (SIGNAL_FUNC) cmd_dehilight); command_bind("dehilight", NULL, (SIGNAL_FUNC) cmd_dehilight);
command_set_options("hilight", "-color -actcolor -level -priority -network -channels nick word line mask full regexp matchcase"); command_set_options("hilight", "-color -actcolor -level -priority -network -channels -comment nick word line mask full regexp matchcase");
} }
void hilight_text_deinit(void) void hilight_text_deinit(void)

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

@ -23,6 +23,7 @@ struct _HILIGHT_REC {
unsigned int case_sensitive:1;/* `text' must match case */ unsigned int case_sensitive:1;/* `text' must match case */
Regex *preg; Regex *preg;
char *servertag; char *servertag;
char *comment;
}; };
extern GSList *hilights; extern GSList *hilights;