mirror of
https://github.com/irssi/irssi.git
synced 2026-08-10 04:13:32 +02:00
Highlighting updates. -word renamed to -full. Added new -word option
meaning to highlight only the found word in line. Removed -nonick option but added -line which means pretty much the same. -actcolor specifies what color to show in activity list, default is the same as -color. Also uses the nick cache to match nickmasks faster. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1139 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
1bfa0e1ee3
commit
391a7e5710
6 changed files with 438 additions and 159 deletions
|
|
@ -33,7 +33,7 @@
|
|||
#include "formats.h"
|
||||
|
||||
static char **hide_targets;
|
||||
static int hilight_levels, msg_levels;
|
||||
static int hide_level, msg_level, hilight_level;
|
||||
|
||||
static void window_activity(WINDOW_REC *window,
|
||||
int data_level, int hilight_color)
|
||||
|
|
@ -76,14 +76,15 @@ static void sig_hilight_text(TEXT_DEST_REC *dest, const char *msg)
|
|||
WI_ITEM_REC *item;
|
||||
int data_level;
|
||||
|
||||
if (dest->window == active_win ||
|
||||
(dest->level & (MSGLEVEL_NEVER|MSGLEVEL_NO_ACT)))
|
||||
if (dest->window == active_win || (dest->level & hide_level))
|
||||
return;
|
||||
|
||||
data_level = (dest->level & hilight_levels) ?
|
||||
DATA_LEVEL_HILIGHT+dest->hilight_priority :
|
||||
((dest->level & msg_levels) ?
|
||||
DATA_LEVEL_MSG : DATA_LEVEL_TEXT);
|
||||
if (dest->level & hilight_level)
|
||||
data_level = DATA_LEVEL_HILIGHT+dest->hilight_priority;
|
||||
else {
|
||||
data_level = (dest->level & msg_level) ?
|
||||
DATA_LEVEL_MSG : DATA_LEVEL_TEXT;
|
||||
}
|
||||
|
||||
if (hide_target_activity(data_level, dest->target))
|
||||
return;
|
||||
|
|
@ -122,16 +123,19 @@ static void read_settings(void)
|
|||
hide_targets = *targets == '\0' ? NULL :
|
||||
g_strsplit(targets, " ", -1);
|
||||
|
||||
msg_levels = level2bits(settings_get_str("activity_msg_levels"));
|
||||
hilight_levels = MSGLEVEL_HILIGHT |
|
||||
level2bits(settings_get_str("activity_hilight_levels"));
|
||||
hide_level = MSGLEVEL_NEVER | MSGLEVEL_NO_ACT |
|
||||
level2bits(settings_get_str("activity_hide_level"));
|
||||
msg_level = level2bits(settings_get_str("activity_msg_level"));
|
||||
hilight_level = MSGLEVEL_HILIGHT |
|
||||
level2bits(settings_get_str("activity_hilight_level"));
|
||||
}
|
||||
|
||||
void window_activity_init(void)
|
||||
{
|
||||
settings_add_str("lookandfeel", "activity_hide_targets", "");
|
||||
settings_add_str("lookandfeel", "activity_msg_levels", "PUBLIC");
|
||||
settings_add_str("lookandfeel", "activity_hilight_levels", "MSGS DCCMSGS");
|
||||
settings_add_str("lookandfeel", "activity_hide_level", "");
|
||||
settings_add_str("lookandfeel", "activity_msg_level", "PUBLIC");
|
||||
settings_add_str("lookandfeel", "activity_hilight_level", "MSGS DCCMSGS");
|
||||
|
||||
read_settings();
|
||||
signal_add("print text", (SIGNAL_FUNC) sig_hilight_text);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue