summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2013-08-28 23:40:55 +0200
committerBoris Faure <billiob@gmail.com>2013-08-28 23:40:55 +0200
commit31c73f69ef0f62e9d11c22ec97a6140f6938ccc8 (patch)
tree50ad36398ec53f62f82977ddb90fdaf0a84c59d0
parent75021221d8c092848b872db75f1b4b1c8704d154 (diff)
use the same default colors as the first 256 colors
-rw-r--r--src/bin/col.c65
1 files changed, 23 insertions, 42 deletions
diff --git a/src/bin/col.c b/src/bin/col.c
index 41adcf6..cbe59b8 100644
--- a/src/bin/col.c
+++ b/src/bin/col.c
@@ -16,27 +16,27 @@ static const Color colors[2][2][12] =
16 { // normal 16 { // normal
17 { 0xaa, 0xaa, 0xaa, 0xff }, // COL_DEF 17 { 0xaa, 0xaa, 0xaa, 0xff }, // COL_DEF
18 { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK 18 { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK
19 { 0xcc, 0x33, 0x33, 0xff }, // COL_RED 19 { 0xc0, 0x00, 0x00, 0xff }, // COL_RED
20 { 0x33, 0xcc, 0x33, 0xff }, // COL_GREEN 20 { 0x00, 0xc0, 0x00, 0xff }, // COL_GREEN
21 { 0xcc, 0x88, 0x33, 0xff }, // COL_YELLOW 21 { 0xc0, 0xc0, 0x00, 0xff }, // COL_YELLOW
22 { 0x33, 0x33, 0xcc, 0xff }, // COL_BLUE 22 { 0x00, 0x00, 0xc0, 0xff }, // COL_BLUE
23 { 0xcc, 0x33, 0xcc, 0xff }, // COL_MAGENTA 23 { 0xc0, 0x00, 0xc0, 0xff }, // COL_MAGENTA
24 { 0x33, 0xcc, 0xcc, 0xff }, // COL_CYAN 24 { 0x00, 0xc0, 0xc0, 0xff }, // COL_CYAN
25 { 0xcc, 0xcc, 0xcc, 0xff }, // COL_WHITE 25 { 0xc0, 0xc0, 0xc0, 0xff }, // COL_WHITE
26 { 0x00, 0x00, 0x00, 0x00 }, // COL_INVIS 26 { 0x00, 0x00, 0x00, 0x00 }, // COL_INVIS
27 { 0x22, 0x22, 0x22, 0xff }, // COL_INVERSE 27 { 0x22, 0x22, 0x22, 0xff }, // COL_INVERSE
28 { 0xaa, 0xaa, 0xaa, 0xff }, // COL_INVERSEBG 28 { 0xaa, 0xaa, 0xaa, 0xff }, // COL_INVERSEBG
29 }, 29 },
30 { // bright/bold 30 { // bright/bold
31 { 0xee, 0xee, 0xee, 0xff }, // COL_DEF 31 { 0xee, 0xee, 0xee, 0xff }, // COL_DEF
32 { 0x66, 0x66, 0x66, 0xff }, // COL_BLACK 32 { 0xcc, 0xcc, 0xcc, 0xff }, // COL_BLACK
33 { 0xff, 0x66, 0x66, 0xff }, // COL_RED 33 { 0xcc, 0x88, 0x88, 0xff }, // COL_RED
34 { 0x66, 0xff, 0x66, 0xff }, // COL_GREEN 34 { 0x88, 0xcc, 0x88, 0xff }, // COL_GREEN
35 { 0xff, 0xff, 0x66, 0xff }, // COL_YELLOW 35 { 0xcc, 0xaa, 0x88, 0xff }, // COL_YELLOW
36 { 0x66, 0x66, 0xff, 0xff }, // COL_BLUE 36 { 0x88, 0x88, 0xcc, 0xff }, // COL_BLUE
37 { 0xff, 0x66, 0xff, 0xff }, // COL_MAGENTA 37 { 0xcc, 0x88, 0xcc, 0xff }, // COL_MAGENTA
38 { 0x66, 0xff, 0xff, 0xff }, // COL_CYAN 38 { 0x88, 0xcc, 0xcc, 0xff }, // COL_CYAN
39 { 0xff, 0xff, 0xff, 0xff }, // COL_WHITE 39 { 0xcc, 0xcc, 0xcc, 0xff }, // COL_WHITE
40 { 0x00, 0x00, 0x00, 0x00 }, // COL_INVIS 40 { 0x00, 0x00, 0x00, 0x00 }, // COL_INVIS
41 { 0x11, 0x11, 0x11, 0xff }, // COL_INVERSE 41 { 0x11, 0x11, 0x11, 0xff }, // COL_INVERSE
42 { 0xee, 0xee, 0xee, 0xff }, // COL_INVERSEBG 42 { 0xee, 0xee, 0xee, 0xff }, // COL_INVERSEBG
@@ -45,14 +45,14 @@ static const Color colors[2][2][12] =
45 { // intense 45 { // intense
46 { // normal 46 { // normal
47 { 0xdd, 0xdd, 0xdd, 0xff }, // COL_DEF 47 { 0xdd, 0xdd, 0xdd, 0xff }, // COL_DEF
48 { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK 48 { 0x80, 0x80, 0x80, 0xff }, // COL_BLACK
49 { 0xcc, 0x88, 0x88, 0xff }, // COL_RED 49 { 0xff, 0x80, 0x80, 0xff }, // COL_RED
50 { 0x88, 0xcc, 0x88, 0xff }, // COL_GREEN 50 { 0x80, 0xff, 0x80, 0xff }, // COL_GREEN
51 { 0xcc, 0xaa, 0x88, 0xff }, // COL_YELLOW 51 { 0xff, 0xff, 0x80, 0xff }, // COL_YELLOW
52 { 0x88, 0x88, 0xcc, 0xff }, // COL_BLUE 52 { 0x80, 0x80, 0xff, 0xff }, // COL_BLUE
53 { 0xcc, 0x88, 0xcc, 0xff }, // COL_MAGENTA 53 { 0xff, 0x80, 0xff, 0xff }, // COL_MAGENTA
54 { 0x88, 0xcc, 0xcc, 0xff }, // COL_CYAN 54 { 0x80, 0xff, 0xff, 0xff }, // COL_CYAN
55 { 0xcc, 0xcc, 0xcc, 0xff }, // COL_WHITE 55 { 0xff, 0xff, 0xff, 0xff }, // COL_WHITE
56 { 0x00, 0x00, 0x00, 0x00 }, // COL_INVIS 56 { 0x00, 0x00, 0x00, 0x00 }, // COL_INVIS
57 { 0x11, 0x11, 0x11, 0xff }, // COL_INVERSE 57 { 0x11, 0x11, 0x11, 0xff }, // COL_INVERSE
58 { 0xcc, 0xcc, 0xcc, 0xff }, // COL_INVERSEBG 58 { 0xcc, 0xcc, 0xcc, 0xff }, // COL_INVERSEBG
@@ -77,25 +77,6 @@ static const Color colors[2][2][12] =
77static const Color colors256[256] = 77static const Color colors256[256] =
78{ 78{
79 // basic 16 repeated 79 // basic 16 repeated
80/*
81 { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK
82 { 0xcc, 0x33, 0x33, 0xff }, // COL_RED
83 { 0x33, 0xcc, 0x33, 0xff }, // COL_GREEN
84 { 0xcc, 0x88, 0x33, 0xff }, // COL_YELLOW
85 { 0x33, 0x33, 0xcc, 0xff }, // COL_BLUE
86 { 0xcc, 0x33, 0xcc, 0xff }, // COL_MAGENTA
87 { 0x33, 0xcc, 0xcc, 0xff }, // COL_CYAN
88 { 0xcc, 0xcc, 0xcc, 0xff }, // COL_WHITE
89
90 { 0x66, 0x66, 0x66, 0xff }, // COL_BLACK
91 { 0xff, 0x66, 0x66, 0xff }, // COL_RED
92 { 0x66, 0xff, 0x66, 0xff }, // COL_GREEN
93 { 0xff, 0xff, 0x66, 0xff }, // COL_YELLOW
94 { 0x66, 0x66, 0xff, 0xff }, // COL_BLUE
95 { 0xff, 0x66, 0xff, 0xff }, // COL_MAGENTA
96 { 0x66, 0xff, 0xff, 0xff }, // COL_CYAN
97 { 0xff, 0xff, 0xff, 0xff }, // COL_WHITE
98 */
99 { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK 80 { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK
100 { 0xc0, 0x00, 0x00, 0xff }, // COL_RED 81 { 0xc0, 0x00, 0x00, 0xff }, // COL_RED
101 { 0x00, 0xc0, 0x00, 0xff }, // COL_GREEN 82 { 0x00, 0xc0, 0x00, 0xff }, // COL_GREEN