Variable cleanup for input_*

6 files changed, 25 insertions, 25 deletions

diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c
index b98236c4..deca8947 100644
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -587,7 +587,7 @@ fe_set_hilight (struct session *sess)
 	if (sess->gui->is_tab)
 		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 */
 }
 
diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c
index 0e24e24f..29c88213 100644
--- a/src/fe-gtk/fkeys.c
+++ b/src/fe-gtk/fkeys.c
@@ -1481,7 +1481,7 @@ key_action_tab_comp (GtkWidget *t, GdkEventKey *entry, char *d1, char *d2,
 			break;
 	}
 
-	if (ent_start == 0 && text[0] == prefs.cmdchar[0])
+	if (ent_start == 0 && text[0] == prefs.hex_input_command_char[0])
 	{
 		ent_start++;
 		is_cmd = 1;
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index 7b0bfcbb..325224e5 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -1593,14 +1593,14 @@ mg_create_alertmenu (session *sess, GtkWidget *menu)
 
 	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 */
 	{
-		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
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c
index fef2698e..27d78e31 100644
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -170,7 +170,7 @@ fe_tray_set_balloon (const char *title, const char *text)
 	g_free ((char *)notify_title);
 	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);
 
 	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 */
 	submenu = mg_submenu (menu, _("_Blink on"));
-	blink_item (&prefs.input_tray_chans, submenu, _("Channel Message"));
-	blink_item (&prefs.input_tray_priv, submenu, _("Private Message"));
-	blink_item (&prefs.input_tray_hilight, submenu, _("Highlighted Message"));
+	blink_item (&prefs.hex_input_tray_chans, submenu, _("Channel Message"));
+	blink_item (&prefs.hex_input_tray_priv, submenu, _("Private Message"));
+	blink_item (&prefs.hex_input_tray_hilight, submenu, _("Highlighted Message"));
 	/*blink_item (BIT_FILEOFFER, submenu, _("File Offer"));*/
 
 	submenu = mg_submenu (menu, _("_Change status"));
@@ -578,7 +578,7 @@ tray_hilight_cb (char *word[], void *userdata)
 	/*if (tray_status == TS_HIGHLIGHT)
 		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);
 
@@ -592,7 +592,7 @@ tray_hilight_cb (char *word[], void *userdata)
 								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)"),
 								 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)
 		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);
 
@@ -617,7 +617,7 @@ tray_message_cb (char *word[], void *userdata)
 			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)"),
 								 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_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)"),
 								 from, network);
 }
@@ -657,7 +657,7 @@ tray_priv_cb (char *word[], void *userdata)
 	/*if (tray_status == TS_HIGHLIGHT)
 		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]);
 
 	return XCHAT_EAT_NONE;
@@ -669,7 +669,7 @@ tray_invited_cb (char *word[], void *userdata)
 	/*if (tray_status == TS_HIGHLIGHT)
 		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");
 
 	return XCHAT_EAT_NONE;
@@ -687,7 +687,7 @@ tray_dcc_cb (char *word[], void *userdata)
 	if (!network)
 		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);
 
@@ -700,7 +700,7 @@ tray_dcc_cb (char *word[], void *userdata)
 								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)"),
 								word[1], network);
 
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index b7c94412..89ed7088 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -231,8 +231,8 @@ static const setting inputbox_settings[] =
 
 #if 0	/* obsolete */
 	{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 %C, %B as Color, Bold etc"), P_OFFINTNL(perc_color),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(hex_input_perc_color),0,0,0},
 #endif
 
 	{ST_END, 0, 0, 0, 0, 0}
@@ -401,22 +401,22 @@ static const setting filexfer_settings[] =
 
 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] =
 {
-	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] =
 {
-	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] =
 {
-	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[] =
diff --git a/src/fe-gtk/textgui.c b/src/fe-gtk/textgui.c
index fbee6590..85d09c5c 100644
--- a/src/fe-gtk/textgui.c
+++ b/src/fe-gtk/textgui.c
@@ -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 */
 			{
 				beep_done = TRUE;
-				if (!prefs.filterbeep)
+				if (!prefs.hex_input_filter_beep)
 					gdk_beep ();
 			}
 		default: