SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Variable cleanup for input_*

This commit is contained in:
Berke Viktor 2012-10-22 14:18:20 +02:00
parent bf27d43052
commit 5c49b45a6d
12 changed files with 85 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/common/cfgfiles.c
View File

@ -500,27 +500,25 @@ const struct prefs vars[] =
{"gui_win_ucount", P_OFFINT (hex_gui_win_ucount), TYPE_BOOL}, {"gui_win_ucount", P_OFFINT (hex_gui_win_ucount), TYPE_BOOL},
{"gui_win_width", P_OFFINT (hex_gui_win_width), TYPE_INT}, {"gui_win_width", P_OFFINT (hex_gui_win_width), TYPE_INT},
#ifdef WIN32 {"identd", P_OFFINT (hex_identd), TYPE_BOOL},
{"identd", P_OFFINT (identd), TYPE_BOOL},
#endif
{"input_balloon_chans", P_OFFINT (input_balloon_chans), TYPE_BOOL}, {"input_balloon_chans", P_OFFINT (hex_input_balloon_chans), TYPE_BOOL},
{"input_balloon_hilight", P_OFFINT (input_balloon_hilight), TYPE_BOOL}, {"input_balloon_hilight", P_OFFINT (hex_input_balloon_hilight), TYPE_BOOL},
{"input_balloon_priv", P_OFFINT (input_balloon_priv), TYPE_BOOL}, {"input_balloon_priv", P_OFFINT (hex_input_balloon_priv), TYPE_BOOL},
{"input_balloon_time", P_OFFINT (input_balloon_time), TYPE_INT}, {"input_balloon_time", P_OFFINT (hex_input_balloon_time), TYPE_INT},
{"input_beep_chans", P_OFFINT (input_beep_chans), TYPE_BOOL}, {"input_beep_chans", P_OFFINT (hex_input_beep_chans), TYPE_BOOL},
{"input_beep_hilight", P_OFFINT (input_beep_hilight), TYPE_BOOL}, {"input_beep_hilight", P_OFFINT (hex_input_beep_hilight), TYPE_BOOL},
{"input_beep_priv", P_OFFINT (input_beep_priv), TYPE_BOOL}, {"input_beep_priv", P_OFFINT (hex_input_beep_priv), TYPE_BOOL},
{"input_command_char", P_OFFSET (cmdchar), TYPE_STR}, {"input_command_char", P_OFFSET (hex_input_command_char), TYPE_STR},
{"input_filter_beep", P_OFFINT (filterbeep), TYPE_BOOL}, {"input_filter_beep", P_OFFINT (hex_input_filter_beep), TYPE_BOOL},
{"input_flash_chans", P_OFFINT (input_flash_chans), TYPE_BOOL}, {"input_flash_chans", P_OFFINT (hex_input_flash_chans), TYPE_BOOL},
{"input_flash_hilight", P_OFFINT (input_flash_hilight), TYPE_BOOL}, {"input_flash_hilight", P_OFFINT (hex_input_flash_hilight), TYPE_BOOL},
{"input_flash_priv", P_OFFINT (input_flash_priv), TYPE_BOOL}, {"input_flash_priv", P_OFFINT (hex_input_flash_priv), TYPE_BOOL},
{"input_perc_ascii", P_OFFINT (perc_ascii), TYPE_BOOL}, {"input_perc_ascii", P_OFFINT (hex_input_perc_ascii), TYPE_BOOL},
{"input_perc_color", P_OFFINT (perc_color), TYPE_BOOL}, {"input_perc_color", P_OFFINT (hex_input_perc_color), TYPE_BOOL},
{"input_tray_chans", P_OFFINT (input_tray_chans), TYPE_BOOL}, {"input_tray_chans", P_OFFINT (hex_input_tray_chans), TYPE_BOOL},
{"input_tray_hilight", P_OFFINT (input_tray_hilight), TYPE_BOOL}, {"input_tray_hilight", P_OFFINT (hex_input_tray_hilight), TYPE_BOOL},
{"input_tray_priv", P_OFFINT (input_tray_priv), TYPE_BOOL}, {"input_tray_priv", P_OFFINT (hex_input_tray_priv), TYPE_BOOL},
{"irc_auto_rejoin", P_OFFINT (autorejoin), TYPE_BOOL}, {"irc_auto_rejoin", P_OFFINT (autorejoin), TYPE_BOOL},
{"irc_ban_type", P_OFFINT (bantype), TYPE_INT}, {"irc_ban_type", P_OFFINT (bantype), TYPE_INT},
@ -670,7 +668,7 @@ load_config (void)
prefs.hex_away_show_once = 1; prefs.hex_away_show_once = 1;
prefs.indent_nicks = 1; prefs.indent_nicks = 1;
prefs.thin_separator = 1; prefs.thin_separator = 1;
prefs.identd = 1; prefs.hex_identd = 1;
#ifndef WIN32 #ifndef WIN32
prefs.hex_dcc_fast_send = 1; prefs.hex_dcc_fast_send = 1;
#endif #endif
@ -738,9 +736,9 @@ load_config (void)
prefs.hex_gui_ulist_pos = 3; prefs.hex_gui_ulist_pos = 3;
prefs.hex_gui_win_save = 1; prefs.hex_gui_win_save = 1;
prefs.bantype = 2; prefs.bantype = 2;
prefs.input_balloon_time = 20; prefs.hex_input_balloon_time = 20;
prefs.input_flash_priv = prefs.input_flash_hilight = 1; prefs.hex_input_flash_priv = prefs.hex_input_flash_hilight = 1;
prefs.input_tray_priv = prefs.input_tray_hilight = 1; prefs.hex_input_tray_priv = prefs.hex_input_tray_hilight = 1;
prefs.hex_dcc_auto_recv = 2; /* browse mode */ prefs.hex_dcc_auto_recv = 2; /* browse mode */
prefs.url_grabber = 1; prefs.url_grabber = 1;
prefs.url_grabber_limit = 100; /* 0 means unlimited */ prefs.url_grabber_limit = 100; /* 0 means unlimited */
@ -751,7 +749,7 @@ load_config (void)
strcpy (prefs.timestamp_log_format, "%b %d %H:%M:%S "); strcpy (prefs.timestamp_log_format, "%b %d %H:%M:%S ");
strcpy (prefs.logmask, "%n-%c.log"); strcpy (prefs.logmask, "%n-%c.log");
strcpy (prefs.hex_completion_suffix, ","); strcpy (prefs.hex_completion_suffix, ",");
strcpy (prefs.cmdchar, "/"); strcpy (prefs.hex_input_command_char, "/");
strcpy (prefs.nick1, username); strcpy (prefs.nick1, username);
strcpy (prefs.nick2, username); strcpy (prefs.nick2, username);
strcat (prefs.nick2, "_"); strcat (prefs.nick2, "_");

18
src/common/outbound.c
View File

@ -2482,7 +2482,7 @@ load_perform_file (session *sess, char *file)
continue; continue;
if (nl) if (nl)
*nl = 0; *nl = 0;
if (tbuf[0] == prefs.cmdchar[0]) if (tbuf[0] == prefs.hex_input_command_char[0])
handle_command (sess, tbuf + 1, TRUE); handle_command (sess, tbuf + 1, TRUE);
else else
handle_command (sess, tbuf, TRUE); handle_command (sess, tbuf, TRUE);
@ -4123,7 +4123,7 @@ user_command (session * sess, char *tbuf, char *cmd, char *word[],
handle_command (sess, tbuf, TRUE); handle_command (sess, tbuf, TRUE);
} }
/* handle text entered without a CMDchar prefix */ /* handle text entered without a hex_input_command_char prefix */
static void static void
handle_say (session *sess, char *text, int check_spch) handle_say (session *sess, char *text, int check_spch)
@ -4151,8 +4151,8 @@ handle_say (session *sess, char *text, int check_spch)
if (len + NICKLEN >= newcmdlen) if (len + NICKLEN >= newcmdlen)
newcmd = malloc (newcmdlen = len + NICKLEN + 1); newcmd = malloc (newcmdlen = len + NICKLEN + 1);
if (check_spch && prefs.perc_color) if (check_spch && prefs.hex_input_perc_color)
check_special_chars (text, prefs.perc_ascii); check_special_chars (text, prefs.hex_input_perc_ascii);
/* Python relies on this */ /* Python relies on this */
word[PDIWORDS] = NULL; word[PDIWORDS] = NULL;
@ -4306,8 +4306,8 @@ handle_command (session *sess, char *cmd, int check_spch)
if (int_cmd && !int_cmd->handle_quotes) if (int_cmd && !int_cmd->handle_quotes)
process_data_init (pdibuf, cmd, word, word_eol, FALSE, FALSE); process_data_init (pdibuf, cmd, word, word_eol, FALSE, FALSE);
if (check_spch && prefs.perc_color) if (check_spch && prefs.hex_input_perc_color)
check_special_chars (cmd, prefs.perc_ascii); check_special_chars (cmd, prefs.hex_input_perc_ascii);
if (plugin_emit_command (sess, word[1], word, word_eol)) if (plugin_emit_command (sess, word[1], word, word_eol))
goto xit; goto xit;
@ -4388,20 +4388,20 @@ handle_user_input (session *sess, char *text, int history, int nocommand)
history_add (&sess->history, text); history_add (&sess->history, text);
/* is it NOT a command, just text? */ /* is it NOT a command, just text? */
if (nocommand || text[0] != prefs.cmdchar[0]) if (nocommand || text[0] != prefs.hex_input_command_char[0])
{ {
handle_say (sess, text, TRUE); handle_say (sess, text, TRUE);
return 1; return 1;
} }
/* check for // */ /* check for // */
if (text[0] == prefs.cmdchar[0] && text[1] == prefs.cmdchar[0]) if (text[0] == prefs.hex_input_command_char[0] && text[1] == prefs.hex_input_command_char[0])
{ {
handle_say (sess, text + 1, TRUE); handle_say (sess, text + 1, TRUE);
return 1; return 1;
} }
if (prefs.cmdchar[0] == '/') if (prefs.hex_input_command_char[0] == '/')
{ {
int i; int i;
const char *unix_dirs [] = { const char *unix_dirs [] = {

2
src/common/server.c
View File

@ -967,7 +967,7 @@ server_read_child (GIOChannel *source, GIOCondition condition, server *serv)
waitline2 (source, outbuf, sizeof outbuf); waitline2 (source, outbuf, sizeof outbuf);
EMIT_SIGNAL (XP_TE_CONNECT, sess, host, ip, outbuf, NULL, 0); EMIT_SIGNAL (XP_TE_CONNECT, sess, host, ip, outbuf, NULL, 0);
#ifdef WIN32 #ifdef WIN32
if (prefs.identd) if (prefs.hex_identd)
{ {
if (serv->network && ((ircnet *)serv->network)->user) if (serv->network && ((ircnet *)serv->network)->user)
{ {

12
src/common/text.c
View File

@ -2203,9 +2203,9 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d)
case XP_TE_DPRIVMSG: case XP_TE_DPRIVMSG:
case XP_TE_PRIVACTION: case XP_TE_PRIVACTION:
case XP_TE_DPRIVACTION: case XP_TE_DPRIVACTION:
if (chanopt_is_set_a (prefs.input_beep_priv, sess->alert_beep) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) if (chanopt_is_set_a (prefs.hex_input_beep_priv, sess->alert_beep) && (!prefs.hex_away_omit_alerts || !sess->server->is_away))
sound_beep (sess); sound_beep (sess);
if (chanopt_is_set_a (prefs.input_flash_priv, sess->alert_taskbar) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) if (chanopt_is_set_a (prefs.hex_input_flash_priv, sess->alert_taskbar) && (!prefs.hex_away_omit_alerts || !sess->server->is_away))
fe_flash_window (sess); fe_flash_window (sess);
/* why is this one different? because of plugin-tray.c's hooks! ugly */ /* why is this one different? because of plugin-tray.c's hooks! ugly */
if (sess->alert_tray == SET_ON) if (sess->alert_tray == SET_ON)
@ -2215,9 +2215,9 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d)
/* ===Highlighted message=== */ /* ===Highlighted message=== */
case XP_TE_HCHANACTION: case XP_TE_HCHANACTION:
case XP_TE_HCHANMSG: case XP_TE_HCHANMSG:
if (chanopt_is_set_a (prefs.input_beep_hilight, sess->alert_beep) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) if (chanopt_is_set_a (prefs.hex_input_beep_hilight, sess->alert_beep) && (!prefs.hex_away_omit_alerts || !sess->server->is_away))
sound_beep (sess); sound_beep (sess);
if (chanopt_is_set_a (prefs.input_flash_hilight, sess->alert_taskbar) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) if (chanopt_is_set_a (prefs.hex_input_flash_hilight, sess->alert_taskbar) && (!prefs.hex_away_omit_alerts || !sess->server->is_away))
fe_flash_window (sess); fe_flash_window (sess);
if (sess->alert_tray == SET_ON) if (sess->alert_tray == SET_ON)
fe_tray_set_icon (FE_ICON_MESSAGE); fe_tray_set_icon (FE_ICON_MESSAGE);
@ -2226,9 +2226,9 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d)
/* ===Channel message=== */ /* ===Channel message=== */
case XP_TE_CHANACTION: case XP_TE_CHANACTION:
case XP_TE_CHANMSG: case XP_TE_CHANMSG:
if (chanopt_is_set_a (prefs.input_beep_chans, sess->alert_beep) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) if (chanopt_is_set_a (prefs.hex_input_beep_chans, sess->alert_beep) && (!prefs.hex_away_omit_alerts || !sess->server->is_away))
sound_beep (sess); sound_beep (sess);
if (chanopt_is_set_a (prefs.input_flash_chans, sess->alert_taskbar) && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) if (chanopt_is_set_a (prefs.hex_input_flash_chans, sess->alert_taskbar) && (!prefs.hex_away_omit_alerts || !sess->server->is_away))
fe_flash_window (sess); fe_flash_window (sess);
if (sess->alert_tray == SET_ON) if (sess->alert_tray == SET_ON)
fe_tray_set_icon (FE_ICON_MESSAGE); fe_tray_set_icon (FE_ICON_MESSAGE);

41
src/common/xchat.h
View File

@ -113,6 +113,7 @@ struct hexchatprefs
char hex_dcc_ip[DOMAINLEN + 1]; char hex_dcc_ip[DOMAINLEN + 1];
char hex_dnsprogram[72]; char hex_dnsprogram[72];
char hex_gui_ulist_doubleclick[256]; char hex_gui_ulist_doubleclick[256];
char hex_input_command_char[4];
int hex_away_size_max; int hex_away_size_max;
int hex_away_timeout; int hex_away_timeout;
@ -160,6 +161,7 @@ struct hexchatprefs
int hex_gui_win_state; int hex_gui_win_state;
int hex_gui_win_top; int hex_gui_win_top;
int hex_gui_win_width; int hex_gui_win_width;
int hex_input_balloon_time;
unsigned int hex_away_auto_unmark; unsigned int hex_away_auto_unmark;
unsigned int hex_away_omit_alerts; unsigned int hex_away_omit_alerts;
@ -210,6 +212,23 @@ struct hexchatprefs
unsigned int hex_gui_win_save; unsigned int hex_gui_win_save;
unsigned int hex_gui_win_swap; unsigned int hex_gui_win_swap;
unsigned int hex_gui_win_ucount; unsigned int hex_gui_win_ucount;
unsigned int hex_identd;
unsigned int hex_input_balloon_chans;
unsigned int hex_input_balloon_hilight;
unsigned int hex_input_balloon_priv;
unsigned int hex_input_beep_chans;
unsigned int hex_input_beep_hilight;
unsigned int hex_input_beep_priv;
unsigned int hex_input_filter_beep;
unsigned int hex_input_flash_chans;
unsigned int hex_input_flash_hilight;
unsigned int hex_input_flash_priv;
unsigned int hex_input_perc_ascii;
unsigned int hex_input_perc_color;
unsigned int hex_input_tray_chans;
unsigned int hex_input_tray_hilight;
unsigned int hex_input_tray_priv;
/* these are the legacy variables */ /* these are the legacy variables */
@ -231,7 +250,6 @@ struct hexchatprefs
char irc_no_hilight[300]; char irc_no_hilight[300];
char irc_nick_hilight[300]; char irc_nick_hilight[300];
char hostname[127]; char hostname[127];
char cmdchar[4];
char logmask[256]; char logmask[256];
char stamp_format[64]; char stamp_format[64];
char timestamp_log_format[64]; char timestamp_log_format[64];
@ -258,8 +276,6 @@ struct hexchatprefs
guint32 local_ip; guint32 local_ip;
guint32 dcc_ip; guint32 dcc_ip;
unsigned int perc_color;
unsigned int perc_ascii;
unsigned int autoreconnect; unsigned int autoreconnect;
unsigned int autoreconnectonfail; unsigned int autoreconnectonfail;
unsigned int invisible; unsigned int invisible;
@ -276,24 +292,6 @@ struct hexchatprefs
unsigned int text_stripcolor_replay; unsigned int text_stripcolor_replay;
unsigned int text_stripcolor_topic; unsigned int text_stripcolor_topic;
unsigned int timestamp; unsigned int timestamp;
unsigned int filterbeep;
unsigned int input_balloon_chans;
unsigned int input_balloon_hilight;
unsigned int input_balloon_priv;
unsigned int input_balloon_time;
unsigned int input_beep_chans;
unsigned int input_beep_hilight;
unsigned int input_beep_priv;
unsigned int input_flash_chans;
unsigned int input_flash_hilight;
unsigned int input_flash_priv;
unsigned int input_tray_chans;
unsigned int input_tray_hilight;
unsigned int input_tray_priv;
unsigned int irc_join_delay; unsigned int irc_join_delay;
unsigned int logging; unsigned int logging;
@ -317,7 +315,6 @@ struct hexchatprefs
unsigned int wait_on_exit; unsigned int wait_on_exit;
unsigned int confmode; unsigned int confmode;
unsigned int utf8_locale; unsigned int utf8_locale;
unsigned int identd;
unsigned int url_grabber; unsigned int url_grabber;
unsigned int url_grabber_limit; unsigned int url_grabber_limit;

2
src/fe-gtk/fe-gtk.c
View File

@ -587,7 +587,7 @@ fe_set_hilight (struct session *sess)
if (sess->gui->is_tab) if (sess->gui->is_tab)
fe_set_tab_color (sess, 3); /* set tab to blue */ fe_set_tab_color (sess, 3); /* set tab to blue */
if (prefs.input_flash_hilight && (!prefs.hex_away_omit_alerts || !sess->server->is_away)) if (prefs.hex_input_flash_hilight && (!prefs.hex_away_omit_alerts || !sess->server->is_away))
fe_flash_window (sess); /* taskbar flash */ fe_flash_window (sess); /* taskbar flash */
} }

2
src/fe-gtk/fkeys.c
View File

@ -1481,7 +1481,7 @@ key_action_tab_comp (GtkWidget *t, GdkEventKey *entry, char *d1, char *d2,
break; break;
} }
if (ent_start == 0 && text[0] == prefs.cmdchar[0]) if (ent_start == 0 && text[0] == prefs.hex_input_command_char[0])
{ {
ent_start++; ent_start++;
is_cmd = 1; is_cmd = 1;

6
src/fe-gtk/maingui.c
View File

@ -1593,14 +1593,14 @@ mg_create_alertmenu (session *sess, GtkWidget *menu)
submenu = menu_quick_sub (_("_Extra Alerts"), menu, NULL, XCMENU_MNEMONIC, -1); submenu = menu_quick_sub (_("_Extra Alerts"), menu, NULL, XCMENU_MNEMONIC, -1);
mg_perchan_menu_item (_("Beep on _Message"), submenu, &sess->alert_beep, prefs.input_beep_chans); mg_perchan_menu_item (_("Beep on _Message"), submenu, &sess->alert_beep, prefs.hex_input_beep_chans);
if (!hextray_mode ()) /*disable this context menu item when HexTray is loaded */ if (!hextray_mode ()) /*disable this context menu item when HexTray is loaded */
{ {
mg_perchan_menu_item (_("Blink Tray _Icon"), submenu, &sess->alert_tray, prefs.input_tray_chans); mg_perchan_menu_item (_("Blink Tray _Icon"), submenu, &sess->alert_tray, prefs.hex_input_tray_chans);
} }
mg_perchan_menu_item (_("Blink Task _Bar"), submenu, &sess->alert_taskbar, prefs.input_flash_chans); mg_perchan_menu_item (_("Blink Task _Bar"), submenu, &sess->alert_taskbar, prefs.hex_input_flash_chans);
} }
static void static void

26
src/fe-gtk/plugin-tray.c
View File

@ -170,7 +170,7 @@ fe_tray_set_balloon (const char *title, const char *text)
g_free ((char *)notify_title); g_free ((char *)notify_title);
g_free ((char *)notify_text); g_free ((char *)notify_text);
notify_notification_set_timeout (notification, prefs.input_balloon_time*1000); notify_notification_set_timeout (notification, prefs.hex_input_balloon_time*1000);
notify_notification_show (notification, NULL); notify_notification_show (notification, NULL);
g_object_unref (notification); g_object_unref (notification);
@ -520,9 +520,9 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
#ifndef WIN32 /* somehow this is broken on win32 */ #ifndef WIN32 /* somehow this is broken on win32 */
submenu = mg_submenu (menu, _("_Blink on")); submenu = mg_submenu (menu, _("_Blink on"));
blink_item (&prefs.input_tray_chans, submenu, _("Channel Message")); blink_item (&prefs.hex_input_tray_chans, submenu, _("Channel Message"));
blink_item (&prefs.input_tray_priv, submenu, _("Private Message")); blink_item (&prefs.hex_input_tray_priv, submenu, _("Private Message"));
blink_item (&prefs.input_tray_hilight, submenu, _("Highlighted Message")); blink_item (&prefs.hex_input_tray_hilight, submenu, _("Highlighted Message"));
/*blink_item (BIT_FILEOFFER, submenu, _("File Offer"));*/ /*blink_item (BIT_FILEOFFER, submenu, _("File Offer"));*/
submenu = mg_submenu (menu, _("_Change status")); submenu = mg_submenu (menu, _("_Change status"));
@ -578,7 +578,7 @@ tray_hilight_cb (char *word[], void *userdata)
/*if (tray_status == TS_HIGHLIGHT) /*if (tray_status == TS_HIGHLIGHT)
return XCHAT_EAT_NONE;*/ return XCHAT_EAT_NONE;*/
if (prefs.input_tray_hilight && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)) if (prefs.hex_input_tray_hilight && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
{ {
tray_set_flash (ICON_HILIGHT); tray_set_flash (ICON_HILIGHT);
@ -592,7 +592,7 @@ tray_hilight_cb (char *word[], void *userdata)
tray_hilight_count, word[1], xchat_get_info (ph, "channel")); tray_hilight_count, word[1], xchat_get_info (ph, "channel"));
} }
if (prefs.input_balloon_hilight && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)) if (prefs.hex_input_balloon_hilight && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
tray_set_balloonf (word[2], _(DISPLAY_NAME": Highlighted message from: %s (%s)"), tray_set_balloonf (word[2], _(DISPLAY_NAME": Highlighted message from: %s (%s)"),
word[1], xchat_get_info (ph, "channel")); word[1], xchat_get_info (ph, "channel"));
@ -605,7 +605,7 @@ tray_message_cb (char *word[], void *userdata)
if (/*tray_status == TS_MESSAGE ||*/ tray_status == TS_HIGHLIGHT) if (/*tray_status == TS_MESSAGE ||*/ tray_status == TS_HIGHLIGHT)
return XCHAT_EAT_NONE; return XCHAT_EAT_NONE;
if (prefs.input_tray_chans && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)) if (prefs.hex_input_tray_chans && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
{ {
tray_set_flash (ICON_MSG); tray_set_flash (ICON_MSG);
@ -617,7 +617,7 @@ tray_message_cb (char *word[], void *userdata)
tray_set_tipf (_(DISPLAY_NAME": %u new public messages."), tray_pub_count); tray_set_tipf (_(DISPLAY_NAME": %u new public messages."), tray_pub_count);
} }
if (prefs.input_balloon_chans && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)) if (prefs.hex_input_balloon_chans && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
tray_set_balloonf (word[2], _(DISPLAY_NAME": New public message from: %s (%s)"), tray_set_balloonf (word[2], _(DISPLAY_NAME": New public message from: %s (%s)"),
word[1], xchat_get_info (ph, "channel")); word[1], xchat_get_info (ph, "channel"));
@ -646,7 +646,7 @@ tray_priv (char *from, char *text)
tray_set_tipf (_(DISPLAY_NAME": %u private messages, latest from: %s (%s)"), tray_set_tipf (_(DISPLAY_NAME": %u private messages, latest from: %s (%s)"),
tray_priv_count, from, network); tray_priv_count, from, network);
if (prefs.input_balloon_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)) if (prefs.hex_input_balloon_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
tray_set_balloonf (text, _(DISPLAY_NAME": Private message from: %s (%s)"), tray_set_balloonf (text, _(DISPLAY_NAME": Private message from: %s (%s)"),
from, network); from, network);
} }
@ -657,7 +657,7 @@ tray_priv_cb (char *word[], void *userdata)
/*if (tray_status == TS_HIGHLIGHT) /*if (tray_status == TS_HIGHLIGHT)
return XCHAT_EAT_NONE;*/ return XCHAT_EAT_NONE;*/
if (prefs.input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)) if (prefs.hex_input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
tray_priv (word[1], word[2]); tray_priv (word[1], word[2]);
return XCHAT_EAT_NONE; return XCHAT_EAT_NONE;
@ -669,7 +669,7 @@ tray_invited_cb (char *word[], void *userdata)
/*if (tray_status == TS_HIGHLIGHT) /*if (tray_status == TS_HIGHLIGHT)
return XCHAT_EAT_NONE;*/ return XCHAT_EAT_NONE;*/
if (prefs.input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)) if (prefs.hex_input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
tray_priv (word[2], "Invited"); tray_priv (word[2], "Invited");
return XCHAT_EAT_NONE; return XCHAT_EAT_NONE;
@ -687,7 +687,7 @@ tray_dcc_cb (char *word[], void *userdata)
if (!network) if (!network)
network = xchat_get_info (ph, "server"); network = xchat_get_info (ph, "server");
if (prefs.input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)) if (prefs.hex_input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
{ {
tray_set_flash (ICON_FILE); tray_set_flash (ICON_FILE);
@ -700,7 +700,7 @@ tray_dcc_cb (char *word[], void *userdata)
tray_file_count, word[1], network); tray_file_count, word[1], network);
} }
if (prefs.input_balloon_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)) if (prefs.hex_input_balloon_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
tray_set_balloonf ("", _(DISPLAY_NAME": File offer from: %s (%s)"), tray_set_balloonf ("", _(DISPLAY_NAME": File offer from: %s (%s)"),
word[1], network); word[1], network);

12
src/fe-gtk/setup.c
View File

@ -231,8 +231,8 @@ static const setting inputbox_settings[] =
#if 0 /* obsolete */ #if 0 /* obsolete */
{ST_HEADER, N_("Input Box Codes"),0,0,0}, {ST_HEADER, N_("Input Box Codes"),0,0,0},
{ST_TOGGLE, N_("Interpret %nnn as an ASCII value"), P_OFFINTNL(perc_ascii),0,0,0}, {ST_TOGGLE, N_("Interpret %nnn as an ASCII value"), P_OFFINTNL(hex_input_perc_ascii),0,0,0},
{ST_TOGGLE, N_("Interpret %C, %B as Color, Bold etc"), P_OFFINTNL(perc_color),0,0,0}, {ST_TOGGLE, N_("Interpret %C, %B as Color, Bold etc"), P_OFFINTNL(hex_input_perc_color),0,0,0},
#endif #endif
{ST_END, 0, 0, 0, 0, 0} {ST_END, 0, 0, 0, 0, 0}
@ -401,22 +401,22 @@ static const setting filexfer_settings[] =
static const int balloonlist[3] = static const int balloonlist[3] =
{ {
P_OFFINTNL(input_balloon_chans), P_OFFINTNL(input_balloon_priv), P_OFFINTNL(input_balloon_hilight) P_OFFINTNL(hex_input_balloon_chans), P_OFFINTNL(hex_input_balloon_priv), P_OFFINTNL(hex_input_balloon_hilight)
}; };
static const int trayblinklist[3] = static const int trayblinklist[3] =
{ {
P_OFFINTNL(input_tray_chans), P_OFFINTNL(input_tray_priv), P_OFFINTNL(input_tray_hilight) P_OFFINTNL(hex_input_tray_chans), P_OFFINTNL(hex_input_tray_priv), P_OFFINTNL(hex_input_tray_hilight)
}; };
static const int taskbarlist[3] = static const int taskbarlist[3] =
{ {
P_OFFINTNL(input_flash_chans), P_OFFINTNL(input_flash_priv), P_OFFINTNL(input_flash_hilight) P_OFFINTNL(hex_input_flash_chans), P_OFFINTNL(hex_input_flash_priv), P_OFFINTNL(hex_input_flash_hilight)
}; };
static const int beeplist[3] = static const int beeplist[3] =
{ {
P_OFFINTNL(input_beep_chans), P_OFFINTNL(input_beep_priv), P_OFFINTNL(input_beep_hilight) P_OFFINTNL(hex_input_beep_chans), P_OFFINTNL(hex_input_beep_priv), P_OFFINTNL(hex_input_beep_hilight)
}; };
static const setting alert_settings[] = static const setting alert_settings[] =

2
src/fe-gtk/textgui.c
View File

@ -141,7 +141,7 @@ PrintTextRaw (void *xtbuf, unsigned char *text, int indent, time_t stamp)
if (!beep_done) /* beeps may be slow, so only do 1 per line */ if (!beep_done) /* beeps may be slow, so only do 1 per line */
{ {
beep_done = TRUE; beep_done = TRUE;
if (!prefs.filterbeep) if (!prefs.hex_input_filter_beep)
gdk_beep (); gdk_beep ();
} }
default: default:

4
src/fe-text/fe-text.c
View File

@ -270,7 +270,7 @@ fe_print_text (struct session *sess, char *text, time_t stamp)
j = strlen (newtext); j = strlen (newtext);
break; break;
case '\007': case '\007':
if (!prefs.filterbeep) if (!prefs.hex_input_filter_beep)
{ {
newtext[j] = text[i]; newtext[j] = text[i];
j++; j++;
@ -371,7 +371,7 @@ fe_print_text (struct session *sess, char *text, time_t stamp)
case '\017': /* reset all */ case '\017': /* reset all */
break; break;
case '\007': case '\007':
if (!prefs.filterbeep) if (!prefs.hex_input_filter_beep)
{ {
newtext[j] = text[i]; newtext[j] = text[i];
j++; j++;