From 31c73f69ef0f62e9d11c22ec97a6140f6938ccc8 Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Wed, 28 Aug 2013 23:40:55 +0200 Subject: [PATCH] use the same default colors as the first 256 colors --- src/bin/col.c | 65 ++++++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 42 deletions(-) diff --git a/src/bin/col.c b/src/bin/col.c index 41adcf63..cbe59b8d 100644 --- a/src/bin/col.c +++ b/src/bin/col.c @@ -16,27 +16,27 @@ static const Color colors[2][2][12] = { // normal { 0xaa, 0xaa, 0xaa, 0xff }, // COL_DEF { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK - { 0xcc, 0x33, 0x33, 0xff }, // COL_RED - { 0x33, 0xcc, 0x33, 0xff }, // COL_GREEN - { 0xcc, 0x88, 0x33, 0xff }, // COL_YELLOW - { 0x33, 0x33, 0xcc, 0xff }, // COL_BLUE - { 0xcc, 0x33, 0xcc, 0xff }, // COL_MAGENTA - { 0x33, 0xcc, 0xcc, 0xff }, // COL_CYAN - { 0xcc, 0xcc, 0xcc, 0xff }, // COL_WHITE + { 0xc0, 0x00, 0x00, 0xff }, // COL_RED + { 0x00, 0xc0, 0x00, 0xff }, // COL_GREEN + { 0xc0, 0xc0, 0x00, 0xff }, // COL_YELLOW + { 0x00, 0x00, 0xc0, 0xff }, // COL_BLUE + { 0xc0, 0x00, 0xc0, 0xff }, // COL_MAGENTA + { 0x00, 0xc0, 0xc0, 0xff }, // COL_CYAN + { 0xc0, 0xc0, 0xc0, 0xff }, // COL_WHITE { 0x00, 0x00, 0x00, 0x00 }, // COL_INVIS { 0x22, 0x22, 0x22, 0xff }, // COL_INVERSE { 0xaa, 0xaa, 0xaa, 0xff }, // COL_INVERSEBG }, { // bright/bold { 0xee, 0xee, 0xee, 0xff }, // COL_DEF - { 0x66, 0x66, 0x66, 0xff }, // COL_BLACK - { 0xff, 0x66, 0x66, 0xff }, // COL_RED - { 0x66, 0xff, 0x66, 0xff }, // COL_GREEN - { 0xff, 0xff, 0x66, 0xff }, // COL_YELLOW - { 0x66, 0x66, 0xff, 0xff }, // COL_BLUE - { 0xff, 0x66, 0xff, 0xff }, // COL_MAGENTA - { 0x66, 0xff, 0xff, 0xff }, // COL_CYAN - { 0xff, 0xff, 0xff, 0xff }, // COL_WHITE + { 0xcc, 0xcc, 0xcc, 0xff }, // COL_BLACK + { 0xcc, 0x88, 0x88, 0xff }, // COL_RED + { 0x88, 0xcc, 0x88, 0xff }, // COL_GREEN + { 0xcc, 0xaa, 0x88, 0xff }, // COL_YELLOW + { 0x88, 0x88, 0xcc, 0xff }, // COL_BLUE + { 0xcc, 0x88, 0xcc, 0xff }, // COL_MAGENTA + { 0x88, 0xcc, 0xcc, 0xff }, // COL_CYAN + { 0xcc, 0xcc, 0xcc, 0xff }, // COL_WHITE { 0x00, 0x00, 0x00, 0x00 }, // COL_INVIS { 0x11, 0x11, 0x11, 0xff }, // COL_INVERSE { 0xee, 0xee, 0xee, 0xff }, // COL_INVERSEBG @@ -45,14 +45,14 @@ static const Color colors[2][2][12] = { // intense { // normal { 0xdd, 0xdd, 0xdd, 0xff }, // COL_DEF - { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK - { 0xcc, 0x88, 0x88, 0xff }, // COL_RED - { 0x88, 0xcc, 0x88, 0xff }, // COL_GREEN - { 0xcc, 0xaa, 0x88, 0xff }, // COL_YELLOW - { 0x88, 0x88, 0xcc, 0xff }, // COL_BLUE - { 0xcc, 0x88, 0xcc, 0xff }, // COL_MAGENTA - { 0x88, 0xcc, 0xcc, 0xff }, // COL_CYAN - { 0xcc, 0xcc, 0xcc, 0xff }, // COL_WHITE + { 0x80, 0x80, 0x80, 0xff }, // COL_BLACK + { 0xff, 0x80, 0x80, 0xff }, // COL_RED + { 0x80, 0xff, 0x80, 0xff }, // COL_GREEN + { 0xff, 0xff, 0x80, 0xff }, // COL_YELLOW + { 0x80, 0x80, 0xff, 0xff }, // COL_BLUE + { 0xff, 0x80, 0xff, 0xff }, // COL_MAGENTA + { 0x80, 0xff, 0xff, 0xff }, // COL_CYAN + { 0xff, 0xff, 0xff, 0xff }, // COL_WHITE { 0x00, 0x00, 0x00, 0x00 }, // COL_INVIS { 0x11, 0x11, 0x11, 0xff }, // COL_INVERSE { 0xcc, 0xcc, 0xcc, 0xff }, // COL_INVERSEBG @@ -77,25 +77,6 @@ static const Color colors[2][2][12] = static const Color colors256[256] = { // basic 16 repeated -/* - { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK - { 0xcc, 0x33, 0x33, 0xff }, // COL_RED - { 0x33, 0xcc, 0x33, 0xff }, // COL_GREEN - { 0xcc, 0x88, 0x33, 0xff }, // COL_YELLOW - { 0x33, 0x33, 0xcc, 0xff }, // COL_BLUE - { 0xcc, 0x33, 0xcc, 0xff }, // COL_MAGENTA - { 0x33, 0xcc, 0xcc, 0xff }, // COL_CYAN - { 0xcc, 0xcc, 0xcc, 0xff }, // COL_WHITE - - { 0x66, 0x66, 0x66, 0xff }, // COL_BLACK - { 0xff, 0x66, 0x66, 0xff }, // COL_RED - { 0x66, 0xff, 0x66, 0xff }, // COL_GREEN - { 0xff, 0xff, 0x66, 0xff }, // COL_YELLOW - { 0x66, 0x66, 0xff, 0xff }, // COL_BLUE - { 0xff, 0x66, 0xff, 0xff }, // COL_MAGENTA - { 0x66, 0xff, 0xff, 0xff }, // COL_CYAN - { 0xff, 0xff, 0xff, 0xff }, // COL_WHITE - */ { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK { 0xc0, 0x00, 0x00, 0xff }, // COL_RED { 0x00, 0xc0, 0x00, 0xff }, // COL_GREEN