1
0
mirror of https://github.com/irssi/irssi.git synced 2024-07-07 02:54:19 -04:00

update_cmd_color() updated colors wrong.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1962 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-11-03 13:28:06 +00:00 committed by cras
parent 6e24ac82ed
commit 655e111007

View File

@ -110,9 +110,10 @@ static void update_cmd_color(unsigned char cmd, int *color)
if (cmd & LINE_COLOR_BG) { if (cmd & LINE_COLOR_BG) {
/* set background color */ /* set background color */
*color &= BGATTR; *color &= BGATTR;
if ((cmd & LINE_COLOR_DEFAULT) == 0) if ((cmd & LINE_COLOR_DEFAULT) == 0) {
*color &= 0x70;
*color |= (cmd & 0x0f) << 4; *color |= (cmd & 0x0f) << 4;
else { } else {
*color |= ATTR_RESETBG; *color |= ATTR_RESETBG;
if (cmd & LINE_COLOR_BLINK) if (cmd & LINE_COLOR_BLINK)
*color |= ATTR_BLINK; *color |= ATTR_BLINK;
@ -120,9 +121,10 @@ static void update_cmd_color(unsigned char cmd, int *color)
} else { } else {
/* set foreground color */ /* set foreground color */
*color &= FGATTR; *color &= FGATTR;
if ((cmd & LINE_COLOR_DEFAULT) == 0) if ((cmd & LINE_COLOR_DEFAULT) == 0) {
*color &= 0x0f;
*color |= cmd & 0x0f; *color |= cmd & 0x0f;
else { } else {
*color |= ATTR_RESETFG; *color |= ATTR_RESETFG;
if (cmd & LINE_COLOR_BOLD) if (cmd & LINE_COLOR_BOLD)
*color |= ATTR_BOLD; *color |= ATTR_BOLD;