claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add the mda_colors enum and use it instead of magic numbers in the colour fixup code

Browse Source
This commit is contained in:
starfrost013
2025-06-16 23:47:15 +01:00
parent b732ece04d
commit 07b418d470
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/include/86box/vid_mda.h
View File

@@ -66,6 +66,26 @@ typedef enum mda_mode_flags_e
MDA_MODE_BLINK = 1 << 5,
} mda_mode_flags;
typedef enum mda_colors_e
{
MDA_COLOR_BLACK = 0,
MDA_COLOR_BLUE = 1,
MDA_COLOR_GREEN = 2,
MDA_COLOR_CYAN = 3,
MDA_COLOR_RED = 4,
MDA_COLOR_MAGENTA = 5,
MDA_COLOR_BROWN = 6,
MDA_COLOR_WHITE = 7,
MDA_COLOR_GREY = 8,
MDA_COLOR_BRIGHT_BLUE = 9,
MDA_COLOR_BRIGHT_GREEN = 10,
MDA_COLOR_BRIGHT_CYAN = 11,
MDA_COLOR_BRIGHT_RED = 12,
MDA_COLOR_BRIGHT_MAGENTA = 13,
MDA_COLOR_BRIGHT_YELLOW = 14,
MDA_COLOR_BRIGHT_WHITE = 15,
} mda_colors;
typedef struct mda_t {
mem_mapping_t mapping;

12
src/video/vid_mda.c
View File

@@ -193,18 +193,18 @@ mda_poll(void *priv)
bool special_treatment = (color_bg != 0 && color_bg != 7);
if (color_fg == 8
if (color_fg == MDA_COLOR_GREY
&& special_treatment)
color_fg = 15;
color_fg = MDA_COLOR_BRIGHT_WHITE;
if (color_fg == 0
&& special_treatment)
color_fg = 8;
color_fg = MDA_COLOR_GREY;
// gray is black
if (color_fg == 8
&& (color_bg == 8 || color_bg == 0))
color_fg = 0;
if (color_fg == MDA_COLOR_GREY
&& (color_bg == MDA_COLOR_GREY || color_bg == MDA_COLOR_BLACK))
color_fg = MDA_COLOR_BLACK;
}
if (mda->scanline == 12