From bdf8261052da145a31796227f0cf42848402db5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net> Date: Tue, 18 May 2021 23:16:32 -0400 Subject: [PATCH] Switch from "the CTerm palette" to the colodore one See https://www.pepto.de/projects/colorvic/ for details. --- src/conio/vidmodes.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/conio/vidmodes.c b/src/conio/vidmodes.c index 0f962438b4..2f9d05b0d1 100644 --- a/src/conio/vidmodes.c +++ b/src/conio/vidmodes.c @@ -233,6 +233,7 @@ struct dac_colors dac_default[TOTAL_DAC_SIZE] = { /* C64 colours */ /* Black, White, Red, Cyan, Purple, Green, Blue, Yellow */ /* Orange, Brown, Lt Red, Dk Grey, Grey, Lt Green, Lt Blue, Lt Grey */ +#if 0 /* Taken from CTerm source */ {0x00, 0x00, 0x00}, // Black {0xFD, 0xFE, 0xFC}, // White @@ -250,6 +251,29 @@ struct dac_colors dac_default[TOTAL_DAC_SIZE] = { {0x59, 0xFE, 0x59}, // Light Green {0x5F, 0x53, 0xFE}, // Light Blue {0xA4, 0xA7, 0xA2}, // Light Grey +#else + /* + * Taken from https://www.pepto.de/projects/colorvic/ + * a much more convincing source. + */ + {0x00, 0x00, 0x00}, + {0xFF, 0xFF, 0xFF}, + {0x81, 0x33, 0x38}, + {0x75, 0xCE, 0xC8}, + {0x8E, 0x3C, 0x97}, + {0x56, 0xAC, 0x4D}, + {0x2E, 0x2C, 0x9B}, + {0xED, 0xF1, 0x71}, + {0x8E, 0x50, 0x29}, + {0x55, 0x38, 0x00}, + {0xC4, 0x6C, 0x71}, + {0x4A, 0x4A, 0x4A}, + {0x7B, 0x7B, 0x7B}, + {0xA9, 0xFF, 0x9F}, + {0x70, 0x6D, 0xEB}, + {0xB2, 0xB2, 0xB2}, +#endif + /* Atari Colours */ /* BG, FG */ {0, 81, 129}, {96, 183, 231}, -- GitLab