Merge pull request #711 from ailin-nemui/24bit-reset

do not reset true colour bit on colour reset
(cherry picked from commit 2d0a9b4ca30ab09ccf5a84d267a824e2a2059d70)
This commit is contained in:
ailin-nemui 2017-05-30 13:14:10 +02:00 committed by Ailin Nemui
parent 18df0934b5
commit 712e02960a

View File

@ -114,7 +114,6 @@ 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 &= FGATTR; *color &= FGATTR;
*color &= ~ATTR_FGCOLOR24;
if ((cmd & LINE_COLOR_DEFAULT) == 0) if ((cmd & LINE_COLOR_DEFAULT) == 0)
*color |= (cmd & 0x0f) << BG_SHIFT; *color |= (cmd & 0x0f) << BG_SHIFT;
else { else {
@ -123,7 +122,6 @@ static void update_cmd_color(unsigned char cmd, int *color)
} else { } else {
/* set foreground color */ /* set foreground color */
*color &= BGATTR; *color &= BGATTR;
*color &= ~ATTR_BGCOLOR24;
if ((cmd & LINE_COLOR_DEFAULT) == 0) if ((cmd & LINE_COLOR_DEFAULT) == 0)
*color |= cmd & 0x0f; *color |= cmd & 0x0f;
else { else {