#define ishighalnum(c) ((unsigned char) (c) >= 128 || i_isalnum(c))
-static GHashTable *printnicks;
+GHashTable *printnicks;
/* convert _underlined_ and *bold* words (and phrases) to use real
underlining or bolding */
if (nickrec == NULL && chanrec != NULL)
nickrec = nicklist_find(chanrec, nick);
- for_me = nick_match_msg(chanrec, msg, server->nick);
+ for_me = !settings_get_bool("hilight_nick_matches") ? FALSE :
+ nick_match_msg(chanrec, msg, server->nick);
color = for_me ? NULL :
hilight_match_nick(server, target, nick, address, MSGLEVEL_PUBLIC, msg);
g_free_not_null(freemsg);
}
-static void print_own_channel_message(SERVER_REC *server, CHANNEL_REC *channel,
- const char *target, const char *msg)
+static void sig_message_own_public(SERVER_REC *server, const char *msg,
+ const char *target)
{
WINDOW_REC *window;
+ CHANNEL_REC *channel;
const char *nickmode;
char *freemsg = NULL;
int print_channel;
+ channel = channel_find(server, target);
+ if (channel != NULL)
+ target = channel->visible_name;
+
nickmode = channel_get_nickmode(channel, server->nick);
window = channel == NULL ? NULL :
g_free_not_null(freemsg);
}
-static void sig_message_own_public(SERVER_REC *server, const char *msg,
- const char *target)
-{
- CHANNEL_REC *channel;
-
- g_return_if_fail(server != NULL);
- g_return_if_fail(msg != NULL);
-
- channel = channel_find(server, target);
- print_own_channel_message(server, channel, target, msg);
-}
-
static void sig_message_own_private(SERVER_REC *server, const char *msg,
const char *target, const char *origtarget)
{
if (!nicklist_find(rec, nick))
continue;
- if (ignore_check(server, nick, address, rec->name,
+ if (ignore_check(server, nick, address, rec->visible_name,
reason, MSGLEVEL_QUITS)) {
count++;
continue;
if (print_channel == NULL ||
active_win->active == (WI_ITEM_REC *) rec)
- print_channel = rec->name;
+ print_channel = rec->visible_name;
if (once)
- g_string_sprintfa(chans, "%s,", rec->name);
+ g_string_sprintfa(chans, "%s,", rec->visible_name);
else {
window = window_item_window((WI_ITEM_REC *) rec);
if (g_slist_find(windows, window) == NULL) {
windows = g_slist_append(windows, window);
- printformat(server, rec->name, MSGLEVEL_QUITS,
+ printformat(server, rec->visible_name,
+ MSGLEVEL_QUITS,
TXT_QUIT, nick, address, reason,
- rec->name);
+ rec->visible_name);
}
}
count++;
const char *address, const char *reason)
{
printformat(server, channel, MSGLEVEL_KICKS,
- TXT_KICK, nick, channel, kicker, reason);
+ TXT_KICK, nick, channel, kicker, reason, address);
}
static void print_nick_change_channel(SERVER_REC *server, const char *channel,
printformat(server, channel, level,
ownnick ? TXT_YOUR_NICK_CHANGED : TXT_NICK_CHANGED,
- oldnick, newnick, channel);
+ oldnick, newnick, channel, address);
}
static void print_nick_change(SERVER_REC *server, const char *newnick,
continue;
windows = g_slist_append(windows, window);
- print_nick_change_channel(server, channel->name, newnick,
- oldnick, address, ownnick);
+ print_nick_change_channel(server, channel->visible_name,
+ newnick, oldnick, address, ownnick);
msgprint = TRUE;
}
if (!msgprint && ownnick) {
printformat(server, NULL, MSGLEVEL_NICKS,
- TXT_YOUR_NICK_CHANGED, oldnick, newnick, "");
+ TXT_YOUR_NICK_CHANGED, oldnick, newnick, "",
+ address);
}
}
print_nick_change(server, newnick, oldnick, address, TRUE);
else {
printformat(server, NULL, MSGLEVEL_NICKS,
- TXT_YOUR_NICK_CHANGED, oldnick, newnick, "");
+ TXT_YOUR_NICK_CHANGED, oldnick, newnick, "",
+ address);
}
}
str = show_lowascii(channel);
printformat(server, NULL, MSGLEVEL_INVITES,
- TXT_INVITE, nick, str);
+ TXT_INVITE, nick, str, address);
g_free(str);
}
{
printformat(server, channel, MSGLEVEL_TOPICS,
*topic != '\0' ? TXT_NEW_TOPIC : TXT_TOPIC_UNSET,
- nick, channel, topic);
+ nick, channel, topic, address);
}
static int printnick_exists(NICK_REC *first, NICK_REC *ignore,
printnicks = g_hash_table_new((GHashFunc) g_direct_hash,
(GCompareFunc) g_direct_equal);
+ settings_add_bool("lookandfeel", "hilight_nick_matches", TRUE);
settings_add_bool("lookandfeel", "emphasis", TRUE);
settings_add_bool("lookandfeel", "emphasis_replace", FALSE);
settings_add_bool("lookandfeel", "emphasis_multiword", FALSE);