jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

SET print_active_channel - if you have multiple channels in same window,

Browse Source 
should we always print the channel for each message (<nick:#channel>) or
only when the channel isn't active.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@513 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-07-23 01:39:08 +00:00 committed by cras
parent a31ac88d7d
commit 1a816b15f5
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/fe-common/irc/fe-common-irc.c
View File

@ -107,6 +107,7 @@ void fe_common_irc_init(void)
settings_add_bool("lookandfeel", "beep_when_away", TRUE); settings_add_bool("lookandfeel", "beep_when_away", TRUE);
settings_add_bool("lookandfeel", "show_away_once", TRUE); settings_add_bool("lookandfeel", "show_away_once", TRUE);
settings_add_bool("lookandfeel", "show_quit_once", FALSE); settings_add_bool("lookandfeel", "show_quit_once", FALSE);
settings_add_bool("lookandfeel", "print_active_channel", FALSE);
theme_register(fecommon_irc_formats); theme_register(fecommon_irc_formats);

9
src/fe-common/irc/fe-events.c
View File

@ -59,8 +59,8 @@ static void print_channel_msg(IRC_SERVER_REC *server, const char *msg,
{ {
CHANNEL_REC *chanrec; CHANNEL_REC *chanrec;
NICK_REC *nickrec; NICK_REC *nickrec;
int for_me;
const char *nickmode; const char *nickmode;
int for_me, print_channel;
char *color; char *color;
chanrec = channel_find(server, target); chanrec = channel_find(server, target);
@ -71,7 +71,12 @@ static void print_channel_msg(IRC_SERVER_REC *server, const char *msg,
nickmode = (!settings_get_bool("show_nickmode") || nickrec == NULL) ? "" : nickmode = (!settings_get_bool("show_nickmode") || nickrec == NULL) ? "" :
(nickrec->op ? "@" : nickrec->voice ? "+" : " "); (nickrec->op ? "@" : nickrec->voice ? "+" : " ");
if (window_item_is_active((WI_ITEM_REC *) chanrec)) { print_channel = !window_item_is_active((WI_ITEM_REC *) chanrec);
if (!print_channel && settings_get_bool("print_active_channel") &&
window_item_window((WI_ITEM_REC *) chanrec)->items->next != NULL)
print_channel = TRUE;
if (!print_channel) {
/* message to active channel in window */ /* message to active channel in window */
if (color != NULL) { if (color != NULL) {
/* highlighted nick */ /* highlighted nick */

11
src/fe-common/irc/fe-irc-commands.c
View File

@ -98,7 +98,7 @@ static void cmd_msg(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
const char *nickmode; const char *nickmode;
char *target, *msg, *freestr, *newtarget; char *target, *msg, *freestr, *newtarget;
void *free_arg; void *free_arg;
int free_ret; int free_ret, print_channel;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
@ -148,7 +148,14 @@ static void cmd_msg(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
nickrec->op ? "@" : nickrec->voice ? "+" : " "; nickrec->op ? "@" : nickrec->voice ? "+" : " ";
window = channel == NULL ? NULL : window_item_window((WI_ITEM_REC *) channel); window = channel == NULL ? NULL : window_item_window((WI_ITEM_REC *) channel);
if (window != NULL && window->active == (WI_ITEM_REC *) channel)
print_channel = window == NULL ||
window->active != (WI_ITEM_REC *) channel;
if (!print_channel && settings_get_bool("print_active_channel") &&
window != NULL && g_slist_length(window->items) > 1)
print_channel = TRUE;
if (!print_channel)
{ {
printformat(server, target, MSGLEVEL_PUBLIC | MSGLEVEL_NOHILIGHT, printformat(server, target, MSGLEVEL_PUBLIC | MSGLEVEL_NOHILIGHT,
IRCTXT_OWN_MSG, server->nick, msg, nickmode); IRCTXT_OWN_MSG, server->nick, msg, nickmode);