diff options
Diffstat (limited to 'src/fe-common')
-rw-r--r-- | src/fe-common/core/fe-common-core.c | 1 | ||||
-rw-r--r-- | src/fe-common/core/formats.c | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index 51f476bb..32855340 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -161,6 +161,7 @@ void fe_common_core_init(void) settings_add_bool("lookandfeel", "beep_when_away", TRUE); settings_add_bool("lookandfeel", "hide_text_style", FALSE); + settings_add_bool("lookandfeel", "hide_mirc_colors", FALSE); settings_add_bool("lookandfeel", "hide_server_tags", FALSE); settings_add_bool("lookandfeel", "use_status_window", TRUE); diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index 9ff57056..de263057 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -37,7 +37,7 @@ static const char *format_fores = "kbgcrmyw"; static const char *format_boldfores = "KBGCRMYW"; static int signal_gui_print_text; -static int hide_text_style, hide_server_tags; +static int hide_text_style, hide_server_tags, hide_mirc_colors; static int timestamps, msgs_timestamps; static int timestamp_timeout; @@ -940,9 +940,9 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text) case 3: /* MIRC color */ get_mirc_color((const char **) &ptr, - hide_text_style ? NULL : &fgcolor, - hide_text_style ? NULL : &bgcolor); - if (!hide_text_style) + hide_mirc_colors || hide_text_style ? NULL : &fgcolor, + hide_mirc_colors || hide_text_style ? NULL : &bgcolor); + if (!hide_mirc_colors || !hide_text_style) flags |= GUI_PRINT_FLAG_MIRC_COLOR; break; case 4: @@ -1051,6 +1051,7 @@ static void read_settings(void) timestamps = settings_get_bool("timestamps"); timestamp_timeout = settings_get_int("timestamp_timeout"); msgs_timestamps = settings_get_bool("msgs_timestamps"); + hide_mirc_colors = settings_get_bool("hide_mirc_colors"); } void formats_init(void) |