1
0
mirror of https://github.com/irssi/irssi.git synced 2024-10-13 05:03:45 -04:00

/set hide_mirc_colors -> /set hide_colors, which also hides ANSI colors.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2776 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-05-12 00:51:07 +00:00 committed by cras
parent a26be5e37d
commit ed1eb46eb4
2 changed files with 9 additions and 9 deletions

View File

@ -161,7 +161,7 @@ void fe_common_core_init(void)
settings_add_bool("lookandfeel", "beep_when_away", TRUE); settings_add_bool("lookandfeel", "beep_when_away", TRUE);
settings_add_bool("lookandfeel", "hide_text_style", FALSE); settings_add_bool("lookandfeel", "hide_text_style", FALSE);
settings_add_bool("lookandfeel", "hide_mirc_colors", FALSE); settings_add_bool("lookandfeel", "hide_colors", FALSE);
settings_add_bool("lookandfeel", "hide_server_tags", FALSE); settings_add_bool("lookandfeel", "hide_server_tags", FALSE);
settings_add_bool("lookandfeel", "use_status_window", TRUE); settings_add_bool("lookandfeel", "use_status_window", TRUE);

View File

@ -38,7 +38,7 @@ static const char *format_fores = "kbgcrmyw";
static const char *format_boldfores = "KBGCRMYW"; static const char *format_boldfores = "KBGCRMYW";
static int signal_gui_print_text; static int signal_gui_print_text;
static int hide_text_style, hide_server_tags, hide_mirc_colors; static int hide_text_style, hide_server_tags, hide_colors;
static int timestamp_level; static int timestamp_level;
static int timestamp_timeout; static int timestamp_timeout;
@ -978,9 +978,9 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
case 3: case 3:
/* MIRC color */ /* MIRC color */
get_mirc_color((const char **) &ptr, get_mirc_color((const char **) &ptr,
hide_mirc_colors || hide_text_style ? NULL : &fgcolor, hide_colors ? NULL : &fgcolor,
hide_mirc_colors || hide_text_style ? NULL : &bgcolor); hide_colors ? NULL : &bgcolor);
if (!hide_mirc_colors && !hide_text_style) if (!hide_colors)
flags |= GUI_PRINT_FLAG_MIRC_COLOR; flags |= GUI_PRINT_FLAG_MIRC_COLOR;
break; break;
case 4: case 4:
@ -1077,9 +1077,9 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
/* ansi color code */ /* ansi color code */
ptr = (char *) ptr = (char *)
get_ansi_color(theme, ptr, get_ansi_color(theme, ptr,
hide_text_style ? NULL : &fgcolor, hide_colors ? NULL : &fgcolor,
hide_text_style ? NULL : &bgcolor, hide_colors ? NULL : &bgcolor,
hide_text_style ? NULL : &flags); hide_colors ? NULL : &flags);
break; break;
} }
@ -1100,7 +1100,7 @@ static void read_settings(void)
hide_server_tags = settings_get_bool("hide_server_tags"); hide_server_tags = settings_get_bool("hide_server_tags");
hide_text_style = settings_get_bool("hide_text_style"); hide_text_style = settings_get_bool("hide_text_style");
hide_mirc_colors = settings_get_bool("hide_mirc_colors"); hide_colors = hide_text_style || settings_get_bool("hide_colors");
} }
void formats_init(void) void formats_init(void)