From 655e1110071b38a55e07083c80c481a73810c49d Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sat, 3 Nov 2001 13:28:06 +0000 Subject: [PATCH] update_cmd_color() updated colors wrong. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1962 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/fe-text/textbuffer-view.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c index c231de4a..6f144168 100644 --- a/src/fe-text/textbuffer-view.c +++ b/src/fe-text/textbuffer-view.c @@ -110,9 +110,10 @@ static void update_cmd_color(unsigned char cmd, int *color) if (cmd & LINE_COLOR_BG) { /* set background color */ *color &= BGATTR; - if ((cmd & LINE_COLOR_DEFAULT) == 0) + if ((cmd & LINE_COLOR_DEFAULT) == 0) { + *color &= 0x70; *color |= (cmd & 0x0f) << 4; - else { + } else { *color |= ATTR_RESETBG; if (cmd & LINE_COLOR_BLINK) *color |= ATTR_BLINK; @@ -120,9 +121,10 @@ static void update_cmd_color(unsigned char cmd, int *color) } else { /* set foreground color */ *color &= FGATTR; - if ((cmd & LINE_COLOR_DEFAULT) == 0) + if ((cmd & LINE_COLOR_DEFAULT) == 0) { + *color &= 0x0f; *color |= cmd & 0x0f; - else { + } else { *color |= ATTR_RESETFG; if (cmd & LINE_COLOR_BOLD) *color |= ATTR_BOLD;