From 51ae33cbe8a29c6502f16cd1bc57e5535e0b4e64 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Mon, 22 Oct 2012 15:55:43 +0200 Subject: Variable cleanup for the rest --- src/fe-gtk/fe-gtk.c | 12 ++-- src/fe-gtk/fkeys.c | 12 ++-- src/fe-gtk/maingui.c | 32 +++++----- src/fe-gtk/rawlog.c | 6 +- src/fe-gtk/search.c | 26 ++++---- src/fe-gtk/setup.c | 141 +++++++++++++++++++++--------------------- src/fe-gtk/sexy-spell-entry.c | 2 +- src/fe-gtk/textgui.c | 12 ++-- src/fe-gtk/urlgrab.c | 6 +- src/fe-gtk/xtext.c | 10 +-- 10 files changed, 128 insertions(+), 131 deletions(-) (limited to 'src/fe-gtk') diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index deca8947..12b636a7 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -334,12 +334,12 @@ create_input_style (GtkStyle *style) static int done_rc = FALSE; pango_font_description_free (style->font_desc); - style->font_desc = pango_font_description_from_string (prefs.font_normal); + style->font_desc = pango_font_description_from_string (prefs.hex_text_font); /* fall back */ if (pango_font_description_get_size (style->font_desc) == 0) { - snprintf (buf, sizeof (buf), _("Failed to open font:\n\n%s"), prefs.font_normal); + snprintf (buf, sizeof (buf), _("Failed to open font:\n\n%s"), prefs.hex_text_font); fe_message (buf, FE_MSG_ERROR); pango_font_description_free (style->font_desc); style->font_desc = pango_font_description_from_string ("sans 11"); @@ -367,7 +367,7 @@ fe_init (void) key_init (); pixmaps_init (); - channelwin_pix = pixmap_load_from_file (prefs.background); + channelwin_pix = pixmap_load_from_file (prefs.hex_text_background); input_style = create_input_style (gtk_style_new ()); } @@ -553,7 +553,7 @@ fe_set_topic (session *sess, char *topic, char *stripped_topic) { if (!sess->gui->is_tab || sess == current_tab) { - if (prefs.text_stripcolor_topic) + if (prefs.hex_text_stripcolor_topic) { gtk_entry_set_text (GTK_ENTRY (sess->gui->topic_entry), stripped_topic); } @@ -570,7 +570,7 @@ fe_set_topic (session *sess, char *topic, char *stripped_topic) free (sess->res->topic_text); } - if (prefs.text_stripcolor_topic) + if (prefs.hex_text_stripcolor_topic) { sess->res->topic_text = strdup (stripped_topic); } @@ -700,7 +700,7 @@ fe_progressbar_end (server *serv) void fe_print_text (struct session *sess, char *text, time_t stamp) { - PrintTextRaw (sess->res->buffer, (unsigned char *)text, prefs.indent_nicks, stamp); + PrintTextRaw (sess->res->buffer, (unsigned char *)text, prefs.hex_text_indent, stamp); if (!sess->new_data && sess != current_tab && sess->gui->is_tab && !sess->nick_said && stamp == 0) diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c index 29c88213..3018667d 100644 --- a/src/fe-gtk/fkeys.c +++ b/src/fe-gtk/fkeys.c @@ -510,11 +510,11 @@ key_dialog_delete (GtkWidget * button, GtkCList * list) static void key_print_text (GtkXText *xtext, char *text) { - unsigned int old = prefs.timestamp; - prefs.timestamp = 0; /* temporarily disable stamps */ + unsigned int old = prefs.hex_stamp_text; + prefs.hex_stamp_text = 0; /* temporarily disable stamps */ gtk_xtext_clear (GTK_XTEXT (xtext)->buffer, 0); PrintTextRaw (GTK_XTEXT (xtext)->buffer, text, 0, 0); - prefs.timestamp = old; + prefs.hex_stamp_text = old; } static void @@ -817,13 +817,13 @@ key_dialog_show () gtk_box_pack_end (GTK_BOX (vbox), hbox2, 0, 0, 1); wid = gtk_xtext_new (colors, 0); - gtk_xtext_set_tint (GTK_XTEXT (wid), prefs.tint_red, prefs.tint_green, prefs.tint_blue); + gtk_xtext_set_tint (GTK_XTEXT (wid), prefs.hex_text_tint_red, prefs.hex_text_tint_green, prefs.hex_text_tint_blue); gtk_xtext_set_background (GTK_XTEXT (wid), channelwin_pix, - prefs.transparent); + prefs.hex_text_transparent); gtk_widget_set_usize (wid, 0, 75); gtk_box_pack_start (GTK_BOX (hbox2), wid, 1, 1, 1); - gtk_xtext_set_font (GTK_XTEXT (wid), prefs.font_normal); + gtk_xtext_set_font (GTK_XTEXT (wid), prefs.hex_text_font); gtk_widget_show (wid); wid2 = gtk_vscrollbar_new (GTK_XTEXT (wid)->adj); diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index 50b94676..5b2e7795 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -1581,7 +1581,7 @@ mg_create_perchannelmenu (session *sess, GtkWidget *menu) submenu = menu_quick_sub (_("_Settings"), menu, NULL, XCMENU_MNEMONIC, -1); mg_perchan_menu_item (_("_Log to Disk"), submenu, &sess->text_logging, prefs.hex_irc_logging); - mg_perchan_menu_item (_("_Reload Scrollback"), submenu, &sess->text_scrollback, prefs.text_replay); + mg_perchan_menu_item (_("_Reload Scrollback"), submenu, &sess->text_scrollback, prefs.hex_text_replay); if (sess->type == SESS_CHANNEL) mg_perchan_menu_item (_("_Hide Join/Part Messages"), submenu, &sess->text_hidejoinpart, prefs.hex_irc_conf_mode); } @@ -1757,7 +1757,7 @@ mg_add_chan (session *sess) if (sess->res->buffer == NULL) { sess->res->buffer = gtk_xtext_buffer_new (GTK_XTEXT (sess->gui->xtext)); - gtk_xtext_set_time_stamp (sess->res->buffer, prefs.timestamp); + gtk_xtext_set_time_stamp (sess->res->buffer, prefs.hex_stamp_text); sess->res->user_model = userlist_create_model (); } } @@ -2337,14 +2337,14 @@ mg_update_xtext (GtkWidget *wid) GtkXText *xtext = GTK_XTEXT (wid); gtk_xtext_set_palette (xtext, colors); - gtk_xtext_set_max_lines (xtext, prefs.max_lines); - gtk_xtext_set_tint (xtext, prefs.tint_red, prefs.tint_green, prefs.tint_blue); - gtk_xtext_set_background (xtext, channelwin_pix, prefs.transparent); - gtk_xtext_set_wordwrap (xtext, prefs.wordwrap); - gtk_xtext_set_show_marker (xtext, prefs.show_marker); - gtk_xtext_set_show_separator (xtext, prefs.indent_nicks ? prefs.show_separator : 0); - gtk_xtext_set_indent (xtext, prefs.indent_nicks); - if (!gtk_xtext_set_font (xtext, prefs.font_normal)) + gtk_xtext_set_max_lines (xtext, prefs.hex_text_max_lines); + gtk_xtext_set_tint (xtext, prefs.hex_text_tint_red, prefs.hex_text_tint_green, prefs.hex_text_tint_blue); + gtk_xtext_set_background (xtext, channelwin_pix, prefs.hex_text_transparent); + gtk_xtext_set_wordwrap (xtext, prefs.hex_text_wordwrap); + gtk_xtext_set_show_marker (xtext, prefs.hex_text_show_marker); + gtk_xtext_set_show_separator (xtext, prefs.hex_text_indent ? prefs.hex_text_show_sep : 0); + gtk_xtext_set_indent (xtext, prefs.hex_text_indent); + if (!gtk_xtext_set_font (xtext, prefs.hex_text_font)) { fe_message ("Failed to open any font. I'm out of here!", FE_MSG_WAIT | FE_MSG_ERROR); exit (1); @@ -2364,7 +2364,7 @@ mg_xtext_error (int type) fe_message (_("Unable to set transparent background!\n\n" "You may be using a non-compliant window\n" "manager that is not currently supported.\n"), FE_MSG_WARN); - prefs.transparent = 0; + prefs.hex_text_transparent = 0; /* no others exist yet */ } } @@ -2397,11 +2397,11 @@ mg_create_textarea (session *sess, GtkWidget *box) gui->xtext = gtk_xtext_new (colors, TRUE); xtext = GTK_XTEXT (gui->xtext); - gtk_xtext_set_max_indent (xtext, prefs.max_auto_indent); - gtk_xtext_set_thin_separator (xtext, prefs.thin_separator); + gtk_xtext_set_max_indent (xtext, prefs.hex_text_max_indent); + gtk_xtext_set_thin_separator (xtext, prefs.hex_text_thin_sep); gtk_xtext_set_error_function (xtext, mg_xtext_error); gtk_xtext_set_urlcheck_function (xtext, mg_word_check); - gtk_xtext_set_max_lines (xtext, prefs.max_lines); + gtk_xtext_set_max_lines (xtext, prefs.hex_text_max_lines); gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (xtext)); mg_update_xtext (GTK_WIDGET (xtext)); @@ -3029,7 +3029,7 @@ mg_create_topwindow (session *sess) { sess->res->buffer = gtk_xtext_buffer_new (GTK_XTEXT (sess->gui->xtext)); gtk_xtext_buffer_show (GTK_XTEXT (sess->gui->xtext), sess->res->buffer, TRUE); - gtk_xtext_set_time_stamp (sess->res->buffer, prefs.timestamp); + gtk_xtext_set_time_stamp (sess->res->buffer, prefs.hex_stamp_text); sess->res->user_model = userlist_create_model (); } @@ -3169,7 +3169,7 @@ mg_apply_setup (void) while (list) { sess = list->data; - gtk_xtext_set_time_stamp (sess->res->buffer, prefs.timestamp); + gtk_xtext_set_time_stamp (sess->res->buffer, prefs.hex_stamp_text); ((xtext_buffer *)sess->res->buffer)->needs_recalc = TRUE; if (!sess->gui->is_tab || !done_main) mg_place_userlist_and_chanview (sess->gui); diff --git a/src/fe-gtk/rawlog.c b/src/fe-gtk/rawlog.c index 39dca988..60b359a0 100644 --- a/src/fe-gtk/rawlog.c +++ b/src/fe-gtk/rawlog.c @@ -108,12 +108,12 @@ open_rawlog (struct server *serv) gtk_widget_show (hbox); serv->gui->rawlog_textlist = gtk_xtext_new (colors, 0); - gtk_xtext_set_tint (GTK_XTEXT (serv->gui->rawlog_textlist), prefs.tint_red, prefs.tint_green, prefs.tint_blue); + gtk_xtext_set_tint (GTK_XTEXT (serv->gui->rawlog_textlist), prefs.hex_text_tint_red, prefs.hex_text_tint_green, prefs.hex_text_tint_blue); gtk_xtext_set_background (GTK_XTEXT (serv->gui->rawlog_textlist), - channelwin_pix, prefs.transparent); + channelwin_pix, prefs.hex_text_transparent); gtk_container_add (GTK_CONTAINER (hbox), serv->gui->rawlog_textlist); - gtk_xtext_set_font (GTK_XTEXT (serv->gui->rawlog_textlist), prefs.font_normal); + gtk_xtext_set_font (GTK_XTEXT (serv->gui->rawlog_textlist), prefs.hex_text_font); GTK_XTEXT (serv->gui->rawlog_textlist)->ignore_hidden = 1; gtk_widget_show (serv->gui->rawlog_textlist); diff --git a/src/fe-gtk/search.c b/src/fe-gtk/search.c index d45acf9f..f90b685d 100644 --- a/src/fe-gtk/search.c +++ b/src/fe-gtk/search.c @@ -51,11 +51,11 @@ search_search (session * sess, const gchar *text) textentry *last; GError *err = NULL; - flags = ((prefs.text_search_case_match == 1? case_match: 0) | - (prefs.text_search_backward == 1? backward: 0) | - (prefs.text_search_highlight_all == 1? highlight: 0) | - (prefs.text_search_follow == 1? follow: 0) | - (prefs.text_search_regexp == 1? regexp: 0)); + flags = ((prefs.hex_text_search_case_match == 1? case_match: 0) | + (prefs.hex_text_search_backward == 1? backward: 0) | + (prefs.hex_text_search_highlight_all == 1? highlight: 0) | + (prefs.hex_text_search_follow == 1? follow: 0) | + (prefs.hex_text_search_regexp == 1? regexp: 0)); if (!is_session (sess)) { fe_message (_("The window you opened this Search " @@ -130,25 +130,25 @@ search_key_cb (GtkWidget * window, GdkEventKey * key, gpointer userdata) static void search_caseign_cb (GtkToggleButton * but, session * sess) { - prefs.text_search_case_match = (but->active)? 1: 0; + prefs.hex_text_search_case_match = (but->active)? 1: 0; } static void search_dirbwd_cb (GtkToggleButton * but, session * sess) { - prefs.text_search_backward = (but->active)? 1: 0; + prefs.hex_text_search_backward = (but->active)? 1: 0; } static void search_regexp_cb (GtkToggleButton * but, session * sess) { - prefs.text_search_regexp = (but->active)? 1: 0; + prefs.hex_text_search_regexp = (but->active)? 1: 0; } static void search_highlight_cb (GtkToggleButton * but, session * sess) { - prefs.text_search_highlight_all = (but->active)? 1: 0; + prefs.hex_text_search_highlight_all = (but->active)? 1: 0; search_search (sess, NULL); } @@ -195,7 +195,7 @@ search_open (session * sess) /* Second line: X Match case */ wid = gtk_check_button_new_with_mnemonic (_("_Match case")); - GTK_TOGGLE_BUTTON (wid)->active = prefs.text_search_case_match; + GTK_TOGGLE_BUTTON (wid)->active = prefs.hex_text_search_case_match; g_signal_connect (G_OBJECT (wid), "toggled", G_CALLBACK (search_caseign_cb), sess); gtk_container_add (GTK_CONTAINER (vbox), wid); add_tip (wid, "Perform a case-sensitive search."); @@ -203,7 +203,7 @@ search_open (session * sess) /* Third line: X Search backwards */ wid = gtk_check_button_new_with_mnemonic (_("Search _backwards")); - GTK_TOGGLE_BUTTON (wid)->active = prefs.text_search_backward; + GTK_TOGGLE_BUTTON (wid)->active = prefs.hex_text_search_backward; g_signal_connect (G_OBJECT (wid), "toggled", G_CALLBACK (search_dirbwd_cb), sess); gtk_container_add (GTK_CONTAINER (vbox), wid); add_tip (wid, "Search from the newest text line to the oldest."); @@ -211,7 +211,7 @@ search_open (session * sess) /* Fourth line: X Highlight all */ wid = gtk_check_button_new_with_mnemonic (_("_Highlight all")); - GTK_TOGGLE_BUTTON (wid)->active = prefs.text_search_highlight_all; + GTK_TOGGLE_BUTTON (wid)->active = prefs.hex_text_search_highlight_all; g_signal_connect (G_OBJECT (wid), "toggled", G_CALLBACK (search_highlight_cb), sess); gtk_container_add (GTK_CONTAINER (vbox), wid); add_tip (wid, "Highlight all occurrences, and underline the current occurrence."); @@ -219,7 +219,7 @@ search_open (session * sess) /* Fifth line: X Regular expression */ wid = gtk_check_button_new_with_mnemonic (_("R_egular expression")); - GTK_TOGGLE_BUTTON (wid)->active = prefs.text_search_regexp; + GTK_TOGGLE_BUTTON (wid)->active = prefs.hex_text_search_regexp; g_signal_connect (G_OBJECT (wid), "toggled", G_CALLBACK (search_regexp_cb), sess); gtk_container_add (GTK_CONTAINER (vbox), wid); add_tip (wid, "Regard search string as a regular expression."); diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index 2598a3a3..c22a896d 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -162,9 +162,9 @@ static const setting appearance_settings[] = {ST_HEADER, N_("General"),0,0,0}, #ifdef WIN32 {ST_MENU, N_("Language:"), P_OFFINTNL(hex_gui_lang), 0, langsmenu, 0}, - {ST_EFONT, N_("Main font:"), P_OFFSETNL(font_main), 0, 0, sizeof prefs.font_main}, + {ST_EFONT, N_("Main font:"), P_OFFSETNL(hex_text_font_main), 0, 0, sizeof prefs.hex_text_font_main}, #else - {ST_EFONT, N_("Font:"), P_OFFSETNL(font_normal), 0, 0, sizeof prefs.font_normal}, + {ST_EFONT, N_("Font:"), P_OFFSETNL(font_normal), 0, 0, sizeof prefs.hex_text_font}, #endif {ST_HEADER, N_("Title Bar"),0,0,0}, @@ -172,30 +172,30 @@ static const setting appearance_settings[] = {ST_TOGGLR, N_("Show number of users"), P_OFFINTNL(hex_gui_win_ucount),0,0,0}, {ST_HEADER, N_("Text Box"),0,0,0}, - {ST_EFILE, N_("Background image:"), P_OFFSETNL(background), 0, 0, sizeof prefs.background}, - {ST_NUMBER, N_("Scrollback lines:"), P_OFFINTNL(max_lines),0,0,100000}, - {ST_TOGGLE, N_("Colored nick names"), P_OFFINTNL(colorednicks), + {ST_EFILE, N_("Background image:"), P_OFFSETNL(hex_text_background), 0, 0, sizeof prefs.hex_text_background}, + {ST_NUMBER, N_("Scrollback lines:"), P_OFFINTNL(hex_text_max_lines),0,0,100000}, + {ST_TOGGLE, N_("Colored nick names"), P_OFFINTNL(hex_text_color_nicks), N_("Give each person on IRC a different color"),0,0}, - {ST_TOGGLR, N_("Indent nick names"), P_OFFINTNL(indent_nicks), + {ST_TOGGLR, N_("Indent nick names"), P_OFFINTNL(hex_text_indent), N_("Make nick names right-justified"),0,0}, #if defined(USE_XLIB) || defined(WIN32) - {ST_TOGGLE, N_("Transparent background"), P_OFFINTNL(transparent),0,0,0}, - {ST_TOGGLR, N_("Show marker line"), P_OFFINTNL(show_marker), N_("Insert a red line after the last read text."),0,0}, + {ST_TOGGLE, N_("Transparent background"), P_OFFINTNL(hex_text_transparent),0,0,0}, + {ST_TOGGLR, N_("Show marker line"), P_OFFINTNL(hex_text_show_marker), N_("Insert a red line after the last read text."),0,0}, {ST_HEADER, N_("Transparency Settings"), 0,0,0}, - {ST_HSCALE, N_("Red:"), P_OFFINTNL(tint_red),0,0,0}, - {ST_HSCALE, N_("Green:"), P_OFFINTNL(tint_green),0,0,0}, - {ST_HSCALE, N_("Blue:"), P_OFFINTNL(tint_blue),0,0,0}, + {ST_HSCALE, N_("Red:"), P_OFFINTNL(hex_text_tint_red),0,0,0}, + {ST_HSCALE, N_("Green:"), P_OFFINTNL(hex_text_tint_green),0,0,0}, + {ST_HSCALE, N_("Blue:"), P_OFFINTNL(hex_text_tint_blue),0,0,0}, #else - {ST_TOGGLE, N_("Show marker line"), P_OFFINTNL(show_marker), N_("Insert a red line after the last read text."),0,0}, + {ST_TOGGLE, N_("Show marker line"), P_OFFINTNL(hex_text_show_marker), N_("Insert a red line after the last read text."),0,0}, #endif {ST_HEADER, N_("Time Stamps"),0,0,0}, - {ST_TOGGLE, N_("Enable time stamps"), P_OFFINTNL(timestamp),0,0,2}, - {ST_ENTRY, N_("Time stamp format:"), P_OFFSETNL(stamp_format), + {ST_TOGGLE, N_("Enable time stamps"), P_OFFINTNL(hex_stamp_text),0,0,2}, + {ST_ENTRY, N_("Time stamp format:"), P_OFFSETNL(hex_stamp_text_format), #ifdef WIN32 - N_("See the strftime MSDN article for details."),0,sizeof prefs.stamp_format}, + N_("See the strftime MSDN article for details."),0,sizeof prefs.hex_stamp_text_format}, #else - N_("See the strftime manpage for details."),0,sizeof prefs.stamp_format}, + N_("See the strftime manpage for details."),0,sizeof prefs.hex_stamp_text_format}, #endif {ST_END, 0, 0, 0, 0, 0} @@ -215,7 +215,7 @@ static const setting inputbox_settings[] = {ST_TOGGLE, N_("Show nick box"), P_OFFINTNL(hex_gui_input_nick),0,0,0}, #if defined(USE_GTKSPELL) || defined(USE_LIBSEXY) {ST_TOGGLE, N_("Spell checking"), P_OFFINTNL(hex_gui_input_spell),0,0,0}, - {ST_ENTRY, N_("Dictionaries to use:"), P_OFFSETNL(spell_langs),0,0,sizeof prefs.spell_langs}, + {ST_ENTRY, N_("Dictionaries to use:"), P_OFFSETNL(hex_text_spell_langs),0,0,sizeof prefs.hex_text_spell_langs}, #ifdef WIN32 {ST_LABEL, N_("Use language codes (as in \"share\\myspell\\dicts\").\nSeparate multiple entries with commas.")}, #else @@ -354,9 +354,9 @@ static const setting tabs_settings[] = static const setting color_settings[] = { - {ST_TOGGLE, N_("Messages"), P_OFFINTNL(text_stripcolor_msg), 0, 0, 0}, - {ST_TOGGLE, N_("Scrollback"), P_OFFINTNL(text_stripcolor_replay), 0, 0, 0}, - {ST_TOGGLE, N_("Topic"), P_OFFINTNL(text_stripcolor_topic), 0, 0, 0}, + {ST_TOGGLE, N_("Messages"), P_OFFINTNL(hex_text_stripcolor_msg), 0, 0, 0}, + {ST_TOGGLE, N_("Scrollback"), P_OFFINTNL(hex_text_stripcolor_replay), 0, 0, 0}, + {ST_TOGGLE, N_("Topic"), P_OFFINTNL(hex_text_stripcolor_topic), 0, 0, 0}, {ST_END, 0, 0, 0, 0, 0} }; @@ -486,25 +486,25 @@ static const setting advanced_settings[] = { {ST_HEADER, N_("Advanced Settings"),0,0,0}, #ifdef WIN32 - {ST_ENTRY, N_("Alternative fonts:"), P_OFFSETNL(font_alternative), "Separate multiple entries with commas without spaces before or after.", 0, sizeof prefs.font_alternative}, + {ST_ENTRY, N_("Alternative fonts:"), P_OFFSETNL(hex_text_font_alternative), "Separate multiple entries with commas without spaces before or after.", 0, sizeof prefs.hex_text_font_alternative}, #endif - {ST_NUMBER, N_("Auto reconnect delay:"), P_OFFINTNL(recon_delay), 0, 0, 9999}, + {ST_NUMBER, N_("Auto reconnect delay:"), P_OFFINTNL(hex_net_reconnect_delay), 0, 0, 9999}, {ST_TOGGLE, N_("Display MODEs in raw form"), P_OFFINTNL(hex_irc_raw_modes), 0, 0, 0}, - {ST_TOGGLE, N_("Whois on notify"), P_OFFINTNL(whois_on_notifyonline), N_("Sends a /WHOIS when a user comes online in your notify list"), 0, 0}, + {ST_TOGGLE, N_("Whois on notify"), P_OFFINTNL(hex_notify_whois_online), N_("Sends a /WHOIS when a user comes online in your notify list"), 0, 0}, {ST_TOGGLE, N_("Hide join and part messages"), P_OFFINTNL(hex_irc_conf_mode), N_("Hide channel join/part messages by default"), 0, 0}, {ST_HEADER, N_("Auto Open DCC Windows"),0,0,0}, {ST_TOGGLE, N_("Send window"), P_OFFINTNL(hex_gui_autoopen_send), 0, 0, 0}, {ST_TOGGLE, N_("Receive window"), P_OFFINTNL(hex_gui_autoopen_recv), 0, 0, 0}, {ST_TOGGLE, N_("Chat window"), P_OFFINTNL(hex_gui_autoopen_chat), 0, 0, 0}, {ST_HEADER, N_("Auto Copy Behavior"),0,0,0}, - {ST_TOGGLE, N_("Automatically copy selected text"), P_OFFINTNL(autocopy_text), + {ST_TOGGLE, N_("Automatically copy selected text"), P_OFFINTNL(hex_text_autocopy_text), N_("Copy selected text to clipboard when left mouse button is released. " "Otherwise, CONTROL-SHIFT-C will copy the " "selected text to the clipboard."), 0, 0}, - {ST_TOGGLE, N_("Automatically include time stamps"), P_OFFINTNL(autocopy_stamp), + {ST_TOGGLE, N_("Automatically include time stamps"), P_OFFINTNL(hex_text_autocopy_stamp), N_("Automatically include time stamps in copied lines of text. Otherwise, " "include time stamps if the SHIFT key is held down while selecting."), 0, 0}, - {ST_TOGGLE, N_("Automatically include color information"), P_OFFINTNL(autocopy_color), + {ST_TOGGLE, N_("Automatically include color information"), P_OFFINTNL(hex_text_autocopy_color), N_("Automatically include color information in copied lines of text. " "Otherwise, include color information if the CONTROL key is held down " "while selecting."), 0, 0}, @@ -516,10 +516,10 @@ static const setting advanced_settings[] = static const setting advanced_settings_oneinstance[] = { {ST_HEADER, N_("Advanced Settings"),0,0,0}, - {ST_ENTRY, N_("Alternative fonts:"), P_OFFSETNL(font_alternative), "Separate multiple entries with commas without spaces before or after.", 0, sizeof prefs.font_alternative}, - {ST_NUMBER, N_("Auto reconnect delay:"), P_OFFINTNL(recon_delay), 0, 0, 9999}, + {ST_ENTRY, N_("Alternative fonts:"), P_OFFSETNL(hex_text_font_alternative), "Separate multiple entries with commas without spaces before or after.", 0, sizeof prefs.hex_text_font_alternative}, + {ST_NUMBER, N_("Auto reconnect delay:"), P_OFFINTNL(hex_net_reconnect_delay), 0, 0, 9999}, {ST_TOGGLE, N_("Display MODEs in raw form"), P_OFFINTNL(hex_irc_raw_modes), 0, 0, 0}, - {ST_TOGGLE, N_("Whois on notify"), P_OFFINTNL(whois_on_notifyonline), N_("Sends a /WHOIS when a user comes online in your notify list"), 0, 0}, + {ST_TOGGLE, N_("Whois on notify"), P_OFFINTNL(hex_notify_whois_online), N_("Sends a /WHOIS when a user comes online in your notify list"), 0, 0}, {ST_TOGGLE, N_("Hide join and part messages"), P_OFFINTNL(hex_irc_conf_mode), N_("Hide channel join/part messages by default"), 0, 0}, {ST_TOGGLE, N_("Allow only one instance of HexChat to run"), P_OFFINTNL(hex_gui_single), 0, 0, 0}, {ST_HEADER, N_("Auto Open DCC Windows"),0,0,0}, @@ -527,14 +527,14 @@ static const setting advanced_settings_oneinstance[] = {ST_TOGGLE, N_("Receive window"), P_OFFINTNL(hex_gui_autoopen_recv), 0, 0, 0}, {ST_TOGGLE, N_("Chat window"), P_OFFINTNL(hex_gui_autoopen_chat), 0, 0, 0}, {ST_HEADER, N_("Auto Copy Behavior"),0,0,0}, - {ST_TOGGLE, N_("Automatically copy selected text"), P_OFFINTNL(autocopy_text), + {ST_TOGGLE, N_("Automatically copy selected text"), P_OFFINTNL(hex_text_autocopy_text), N_("Copy selected text to clipboard when left mouse button is released. " "Otherwise, CONTROL-SHIFT-C will copy the " "selected text to the clipboard."), 0, 0}, - {ST_TOGGLE, N_("Automatically include time stamps"), P_OFFINTNL(autocopy_stamp), + {ST_TOGGLE, N_("Automatically include time stamps"), P_OFFINTNL(hex_text_autocopy_stamp), N_("Automatically include time stamps in copied lines of text. Otherwise, " "include time stamps if the SHIFT key is held down while selecting."), 0, 0}, - {ST_TOGGLE, N_("Automatically include color information"), P_OFFINTNL(autocopy_color), + {ST_TOGGLE, N_("Automatically include color information"), P_OFFINTNL(hex_text_autocopy_color), N_("Automatically include color information in copied lines of text. " "Otherwise, include color information if the CONTROL key is held down " "while selecting."), 0, 0}, @@ -546,17 +546,14 @@ static const setting advanced_settings_oneinstance[] = static const setting logging_settings[] = { {ST_HEADER, N_("Logging"),0,0,0}, - {ST_TOGGLE, N_("Display scrollback from previous session"), P_OFFINTNL(text_replay), 0, 0, 0}, -#if 0 /* Now it's done under Colors */ - {ST_TOGGLE, N_("Strip colors when displaying scrollback"), P_OFFINTNL(text_stripcolor_replay), 0, 0, 0}, -#endif + {ST_TOGGLE, N_("Display scrollback from previous session"), P_OFFINTNL(hex_text_replay), 0, 0, 0}, {ST_TOGGLE, N_("Enable logging of conversations to disk"), P_OFFINTNL(hex_irc_logging), 0, 0, 2}, {ST_ENTRY, N_("Log filename:"), P_OFFSETNL(hex_irc_logmask), 0, 0, sizeof prefs.hex_irc_logmask}, {ST_LABEL, N_("%s=Server %c=Channel %n=Network.")}, {ST_HEADER, N_("Time Stamps"),0,0,0}, - {ST_TOGGLE, N_("Insert timestamps in logs"), P_OFFINTNL(timestamp_logs), 0, 0, 2}, - {ST_ENTRY, N_("Log timestamp format:"), P_OFFSETNL(timestamp_log_format), 0, 0, sizeof prefs.timestamp_log_format}, + {ST_TOGGLE, N_("Insert timestamps in logs"), P_OFFINTNL(hex_stamp_log), 0, 0, 2}, + {ST_ENTRY, N_("Log timestamp format:"), P_OFFSETNL(hex_stamp_log_format), 0, 0, sizeof prefs.hex_stamp_log_format}, #ifdef WIN32 {ST_LABEL, N_("See the strftime MSDN article for details.")}, #else @@ -564,9 +561,9 @@ static const setting logging_settings[] = #endif {ST_HEADER, N_("URLs"),0,0,0}, - {ST_TOGGLE, N_("Enable logging of URLs to disk"), P_OFFINTNL(url_logging), 0, 0, 0}, - {ST_TOGGLE, N_("Enable URL grabber"), P_OFFINTNL(url_grabber), 0, 0, 2}, - {ST_NUMBER, N_("Maximum number of URLs to grab:"), P_OFFINTNL(url_grabber_limit), 0, 0, 9999}, + {ST_TOGGLE, N_("Enable logging of URLs to disk"), P_OFFINTNL(hex_url_logging), 0, 0, 0}, + {ST_TOGGLE, N_("Enable URL grabber"), P_OFFINTNL(hex_url_grabber), 0, 0, 2}, + {ST_NUMBER, N_("Maximum number of URLs to grab:"), P_OFFINTNL(hex_url_grabber_limit), 0, 0, 9999}, {ST_END, 0, 0, 0, 0, 0} }; @@ -598,23 +595,23 @@ static const char *const proxyuse[] = static const setting network_settings[] = { {ST_HEADER, N_("Your Address"), 0, 0, 0, 0}, - {ST_ENTRY, N_("Bind to:"), P_OFFSETNL(hostname), 0, 0, sizeof prefs.hostname}, + {ST_ENTRY, N_("Bind to:"), P_OFFSETNL(hex_net_bind_host), 0, 0, sizeof prefs.hex_net_bind_host}, {ST_LABEL, N_("Only useful for computers with multiple addresses.")}, {ST_HEADER, N_("Proxy Server"), 0, 0, 0, 0}, - {ST_ENTRY, N_("Hostname:"), P_OFFSETNL(proxy_host), 0, 0, sizeof prefs.proxy_host}, - {ST_NUMBER, N_("Port:"), P_OFFINTNL(proxy_port), 0, 0, 65535}, - {ST_MENU, N_("Type:"), P_OFFINTNL(proxy_type), 0, proxytypes, 0}, - {ST_MENU, N_("Use proxy for:"), P_OFFINTNL(proxy_use), 0, proxyuse, 0}, + {ST_ENTRY, N_("Hostname:"), P_OFFSETNL(hex_net_proxy_host), 0, 0, sizeof prefs.hex_net_proxy_host}, + {ST_NUMBER, N_("Port:"), P_OFFINTNL(hex_net_proxy_port), 0, 0, 65535}, + {ST_MENU, N_("Type:"), P_OFFINTNL(hex_net_proxy_type), 0, proxytypes, 0}, + {ST_MENU, N_("Use proxy for:"), P_OFFINTNL(hex_net_proxy_use), 0, proxyuse, 0}, {ST_HEADER, N_("Proxy Authentication"), 0, 0, 0, 0}, #ifdef USE_MSPROXY - {ST_TOGGLE, N_("Use Authentication (MS Proxy, HTTP or Socks5 only)"), P_OFFINTNL(proxy_auth), 0, 0, 0}, + {ST_TOGGLE, N_("Use Authentication (MS Proxy, HTTP or Socks5 only)"), P_OFFINTNL(hex_net_proxy_auth), 0, 0, 0}, #else - {ST_TOGGLE, N_("Use Authentication (HTTP or Socks5 only)"), P_OFFINTNL(proxy_auth), 0, 0, 0}, + {ST_TOGGLE, N_("Use Authentication (HTTP or Socks5 only)"), P_OFFINTNL(hex_net_proxy_auth), 0, 0, 0}, #endif - {ST_ENTRY, N_("Username:"), P_OFFSETNL(proxy_user), 0, 0, sizeof prefs.proxy_user}, - {ST_ENTRY, N_("Password:"), P_OFFSETNL(proxy_pass), 0, GINT_TO_POINTER(1), sizeof prefs.proxy_pass}, + {ST_ENTRY, N_("Username:"), P_OFFSETNL(hex_net_proxy_user), 0, 0, sizeof prefs.hex_net_proxy_user}, + {ST_ENTRY, N_("Password:"), P_OFFSETNL(hex_net_proxy_pass), 0, GINT_TO_POINTER(1), sizeof prefs.hex_net_proxy_pass}, {ST_END, 0, 0, 0, 0, 0} }; @@ -826,9 +823,9 @@ setup_create_spin (GtkWidget *table, int row, const setting *set) static gint setup_apply_tint (int *tag) { - prefs.tint_red = setup_prefs.tint_red; - prefs.tint_green = setup_prefs.tint_green; - prefs.tint_blue = setup_prefs.tint_blue; + prefs.hex_text_tint_red = setup_prefs.hex_text_tint_red; + prefs.hex_text_tint_green = setup_prefs.hex_text_tint_green; + prefs.hex_text_tint_blue = setup_prefs.hex_text_tint_blue; mg_update_xtext (current_sess->gui->xtext); *tag = 0; return 0; @@ -1171,15 +1168,15 @@ setup_create_entry (GtkWidget *table, int row, const setting *set) g_signal_connect (G_OBJECT (wid), "changed", G_CALLBACK (setup_entry_cb), (gpointer)set); - if (set->offset == P_OFFSETNL(proxy_user)) + if (set->offset == P_OFFSETNL(hex_net_proxy_user)) proxy_user = wid; - if (set->offset == P_OFFSETNL(proxy_pass)) + if (set->offset == P_OFFSETNL(hex_net_proxy_pass)) proxy_pass = wid; /* only http and Socks5 can auth */ - if ( (set->offset == P_OFFSETNL(proxy_pass) || - set->offset == P_OFFSETNL(proxy_user)) && - (setup_prefs.proxy_type != 4 && setup_prefs.proxy_type != 3 && setup_prefs.proxy_type != 5) ) + if ( (set->offset == P_OFFSETNL(hex_net_proxy_pass) || + set->offset == P_OFFSETNL(hex_net_proxy_user)) && + (setup_prefs.hex_net_proxy_type != 4 && setup_prefs.hex_net_proxy_type != 3 && setup_prefs.hex_net_proxy_type != 5) ) gtk_widget_set_sensitive (wid, FALSE); if (set->type == ST_ENTRY) @@ -1535,8 +1532,8 @@ extern char *sound_files[]; static void setup_snd_apply (void) { - strcpy (setup_prefs.sounddir, GTK_ENTRY (snddir_entry)->text); - strcpy (setup_prefs.soundcmd, GTK_ENTRY (sndprog_entry)->text); + strcpy (setup_prefs.hex_sound_dir, GTK_ENTRY (snddir_entry)->text); + strcpy (setup_prefs.hex_sound_command, GTK_ENTRY (sndprog_entry)->text); } static void @@ -1632,7 +1629,7 @@ setup_autotoggle_cb (GtkToggleButton *but, GtkToggleButton *ext) { if (but->active) { - setup_prefs.soundcmd[0] = 0; + setup_prefs.hex_sound_command[0] = 0; gtk_entry_set_text (GTK_ENTRY (sndprog_entry), ""); gtk_widget_set_sensitive (sndprog_entry, FALSE); } else @@ -1742,10 +1739,10 @@ setup_create_sound_page (void) gtk_misc_set_alignment (GTK_MISC (label3), 0, 0.5); sndprog_entry = gtk_entry_new (); - if (setup_prefs.soundcmd[0] == 0) + if (setup_prefs.hex_sound_command[0] == 0) gtk_widget_set_sensitive (sndprog_entry, FALSE); else - gtk_entry_set_text (GTK_ENTRY (sndprog_entry), setup_prefs.soundcmd); + gtk_entry_set_text (GTK_ENTRY (sndprog_entry), setup_prefs.hex_sound_command); gtk_widget_show (sndprog_entry); gtk_table_attach (GTK_TABLE (table2), sndprog_entry, 1, 3, 2, 3, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -1773,7 +1770,7 @@ setup_create_sound_page (void) radio_group); radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_auto)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_auto), setup_prefs.soundcmd[0] == 0); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_auto), setup_prefs.hex_sound_command[0] == 0); label4 = gtk_label_new_with_mnemonic (_("Sound files _directory:")); gtk_widget_show (label4); @@ -1783,7 +1780,7 @@ setup_create_sound_page (void) gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5); snddir_entry = entry3 = gtk_entry_new (); - gtk_entry_set_text (GTK_ENTRY (entry3), setup_prefs.sounddir); + gtk_entry_set_text (GTK_ENTRY (entry3), setup_prefs.hex_sound_dir); gtk_widget_show (entry3); gtk_table_attach (GTK_TABLE (table2), entry3, 1, 3, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -2144,7 +2141,7 @@ setup_apply_real (int new_pix, int do_ulist, int do_layout) { if (channelwin_pix) g_object_unref (channelwin_pix); - channelwin_pix = pixmap_load_from_file (prefs.background); + channelwin_pix = pixmap_load_from_file (prefs.hex_text_background); } input_style = create_input_style (input_style); @@ -2195,7 +2192,7 @@ setup_apply (struct hexchatprefs *pr) int do_ulist = FALSE; int do_layout = FALSE; - if (strcmp (pr->background, prefs.background) != 0) + if (strcmp (pr->hex_text_background, prefs.hex_text_background) != 0) new_pix = TRUE; #define DIFF(a) (pr->a != prefs.a) @@ -2247,14 +2244,14 @@ setup_apply (struct hexchatprefs *pr) memcpy (&prefs, pr, sizeof (prefs)); #ifdef WIN32 - /* merge font_main and font_alternative into font_normal */ - old_desc = pango_font_description_from_string (prefs.font_main); - sprintf (buffer, "%s,%s", pango_font_description_get_family (old_desc), prefs.font_alternative); + /* merge hex_font_main and hex_font_alternative into hex_font_normal */ + old_desc = pango_font_description_from_string (prefs.hex_text_font_main); + sprintf (buffer, "%s,%s", pango_font_description_get_family (old_desc), prefs.hex_text_font_alternative); new_desc = pango_font_description_from_string (buffer); pango_font_description_set_weight (new_desc, pango_font_description_get_weight (old_desc)); pango_font_description_set_style (new_desc, pango_font_description_get_style (old_desc)); pango_font_description_set_size (new_desc, pango_font_description_get_size (old_desc)); - sprintf (prefs.font_normal, "%s", pango_font_description_to_string (new_desc)); + sprintf (prefs.hex_text_font, "%s", pango_font_description_to_string (new_desc)); /* FIXME this is not required after pango_font_description_from_string() g_free (old_desc); @@ -2264,7 +2261,7 @@ setup_apply (struct hexchatprefs *pr) /* workaround for strftime differences between POSIX and MSVC */ time (&rawtime); - if (!strftime (buffer, sizeof (buffer), prefs.stamp_format, localtime (&rawtime)) || !strftime (buffer, sizeof (buffer), prefs.timestamp_log_format, localtime (&rawtime))) + if (!strftime (buffer, sizeof (buffer), prefs.hex_stamp_text_format, localtime (&rawtime)) || !strftime (buffer, sizeof (buffer), prefs.hex_stamp_log_format, localtime (&rawtime))) { fe_message (_("Invalid time stamp format! See the strftime MSDN article for details."), FE_MSG_ERROR); } diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c index 02f6b615..22404855 100644 --- a/src/fe-gtk/sexy-spell-entry.c +++ b/src/fe-gtk/sexy-spell-entry.c @@ -994,7 +994,7 @@ sexy_spell_entry_activate_default_languages(SexySpellEntry *entry) for (i = enchant_langs; i; i = g_slist_next (i)) { - if (strstr (prefs.spell_langs, i->data) != NULL) + if (strstr (prefs.hex_text_spell_langs, i->data) != NULL) { sexy_spell_entry_activate_language_internal (entry, i->data, NULL); } diff --git a/src/fe-gtk/textgui.c b/src/fe-gtk/textgui.c index 85d09c5c..851ad392 100644 --- a/src/fe-gtk/textgui.c +++ b/src/fe-gtk/textgui.c @@ -69,7 +69,7 @@ enum int xtext_get_stamp_str (time_t tim, char **ret) { - return get_stamp_str (prefs.stamp_format, tim, ret); + return get_stamp_str (prefs.hex_stamp_text_format, tim, ret); } static void @@ -83,7 +83,7 @@ PrintTextLine (xtext_buffer *xtbuf, unsigned char *text, int len, int indent, ti if (!indent) { - if (prefs.timestamp) + if (prefs.hex_stamp_text) { int stamp_size; char *stamp; @@ -91,7 +91,7 @@ PrintTextLine (xtext_buffer *xtbuf, unsigned char *text, int len, int indent, ti if (timet == 0) timet = time (0); - stamp_size = get_stamp_str (prefs.stamp_format, timet, &stamp); + stamp_size = get_stamp_str (prefs.hex_stamp_text_format, timet, &stamp); new_text = malloc (len + stamp_size + 1); memcpy (new_text, stamp, stamp_size); g_free (stamp); @@ -393,9 +393,9 @@ pevent_dialog_show () G_CALLBACK (pevent_dialog_select), store); pevent_dialog_twid = gtk_xtext_new (colors, 0); - gtk_xtext_set_tint (GTK_XTEXT (pevent_dialog_twid), prefs.tint_red, prefs.tint_green, prefs.tint_blue); + gtk_xtext_set_tint (GTK_XTEXT (pevent_dialog_twid), prefs.hex_text_tint_red, prefs.hex_text_tint_green, prefs.hex_text_tint_blue); gtk_xtext_set_background (GTK_XTEXT (pevent_dialog_twid), - channelwin_pix, prefs.transparent); + channelwin_pix, prefs.hex_text_transparent); pevent_dialog_entry = gtk_entry_new_with_max_length (255); g_signal_connect (G_OBJECT (pevent_dialog_entry), "activate", @@ -409,7 +409,7 @@ pevent_dialog_show () gtk_widget_set_usize (pevent_dialog_twid, 150, 20); gtk_container_add (GTK_CONTAINER (tbox), pevent_dialog_twid); - gtk_xtext_set_font (GTK_XTEXT (pevent_dialog_twid), prefs.font_normal); + gtk_xtext_set_font (GTK_XTEXT (pevent_dialog_twid), prefs.hex_text_font); wid = gtk_vscrollbar_new (GTK_XTEXT (pevent_dialog_twid)->adj); gtk_box_pack_start (GTK_BOX (tbox), wid, FALSE, FALSE, 0); diff --git a/src/fe-gtk/urlgrab.c b/src/fe-gtk/urlgrab.c index 1cd46d9e..a5bb4e0a 100644 --- a/src/fe-gtk/urlgrab.c +++ b/src/fe-gtk/urlgrab.c @@ -167,10 +167,10 @@ fe_url_add (const char *urltext) -1); /* remove any overflow */ - if (prefs.url_grabber_limit > 0) + if (prefs.hex_url_grabber_limit > 0) { valid = gtk_tree_model_iter_nth_child ( - GTK_TREE_MODEL (store), &iter, NULL, prefs.url_grabber_limit); + GTK_TREE_MODEL (store), &iter, NULL, prefs.hex_url_grabber_limit); while (valid) valid = gtk_list_store_remove (store, &iter); } @@ -217,7 +217,7 @@ url_opengui () gtk_widget_show (urlgrabberwindow); - if (prefs.url_grabber) + if (prefs.hex_url_grabber) tree_foreach (url_tree, (tree_traverse_func *)populate_cb, NULL); else { diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c index 63abcaca..e45d47f0 100644 --- a/src/fe-gtk/xtext.c +++ b/src/fe-gtk/xtext.c @@ -2006,7 +2006,7 @@ gtk_xtext_check_mark_stamp (GtkXText *xtext, GdkModifierType mask) { gboolean redraw = FALSE; - if (mask & STATE_SHIFT || prefs.autocopy_stamp) + if (mask & STATE_SHIFT || prefs.hex_text_autocopy_stamp) { if (!xtext->mark_stamp) { @@ -2256,9 +2256,9 @@ gtk_xtext_button_release (GtkWidget * widget, GdkEventButton * event) if (xtext->buffer->last_ent_start) { xtext->color_paste = FALSE; - if (event->state & STATE_CTRL || prefs.autocopy_color) + if (event->state & STATE_CTRL || prefs.hex_text_autocopy_color) xtext->color_paste = TRUE; - if (prefs.autocopy_text) + if (prefs.hex_text_autocopy_text) { gtk_xtext_set_clip_owner (GTK_WIDGET (xtext), event); } @@ -2326,7 +2326,7 @@ gtk_xtext_button_press (GtkWidget * widget, GdkEventButton * event) ent->mark_end = offset + len; gtk_xtext_selection_render (xtext, ent, offset, ent, offset + len); xtext->word_or_line_select = TRUE; - if (prefs.autocopy_text) + if (prefs.hex_text_autocopy_text) { gtk_xtext_set_clip_owner (GTK_WIDGET (xtext), event); } @@ -2345,7 +2345,7 @@ gtk_xtext_button_press (GtkWidget * widget, GdkEventButton * event) ent->mark_end = ent->str_len; gtk_xtext_selection_render (xtext, ent, 0, ent, ent->str_len); xtext->word_or_line_select = TRUE; - if (prefs.autocopy_text) + if (prefs.hex_text_autocopy_text) { gtk_xtext_set_clip_owner (GTK_WIDGET (xtext), event); } -- cgit 1.4.1