h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-31 03:51:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix colors table (#3826)

Browse Source 
* color: make brgrey really grey

The 0055 value is actually 0x2d which isn't 0x55 mentioned further and is probably a typo

* color.cpp: reformat color table

Tidy color table up and also fix hex number case for grey color. This should ease spotting errors like one from previous commit.
This commit is contained in:
Andrei Dziahel
2017-02-09 00:49:19 +03:00
committed by Aaron Gyes
parent 9b24d26972
commit 85ba4e0142
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/color.cpp
View File

@@ -153,28 +153,28 @@ struct named_color_t {
};
static const named_color_t named_colors[] = {
{L"black", 0, {0, 0, 0}, false},
{L"red", 1, {0x80, 0, 0}, false},
{L"green", 2, {0, 0x80, 0}, false},
{L"brown", 3, {0x72, 0x50, 0}, true},
{L"yellow", 3, {0x80, 0x80, 0}, false},
{L"blue", 4, {0, 0, 0x80}, false},
{L"magenta", 5, {0x80, 0, 0x80}, false},
{L"purple", 5, {0x80, 0, 0x80}, true},
{L"cyan", 6, {0, 0x80, 0x80}, false},
{L"white", 7, {0xC0, 0xC0, 0xC0}, false},
{L"grey", 7, {0xe5, 0xe5, 0xe5}, true},
{L"brblack", 8, {0x80, 0x80, 0x80}, false},
{L"brgrey", 8, {0055, 0x55, 0x55}, true},
{L"brred", 9, {0xFF, 0x00, 0x00}, false},
{L"brgreen", 10, {0x00, 0xFF, 0x00}, false},
{L"brbrown", 11, {0xFF, 0xFF, 0x00}, true},
{L"bryellow", 11, {0xFF, 0xFF, 0x00}, false},
{L"brblue", 12, {0x00, 0, 0xFF}, false},
{L"brmagenta", 13, {0xFF, 0, 0xFF}, false},
{L"brpurple", 13, {0xFF, 0, 0xFF}, true},
{L"brcyan", 14, {0x00, 0xFF, 0xFF}, false},
{L"brwhite", 15, {0xFF, 0xFF, 0xFF}, false},
{L"black", 0, {0x00, 0x00, 0x00}, false},
{L"red", 1, {0x80, 0x00, 0x00}, false},
{L"green", 2, {0x00, 0x80, 0x00}, false},
{L"brown", 3, {0x72, 0x50, 0x00}, true},
{L"yellow", 3, {0x80, 0x80, 0x00}, false},
{L"blue", 4, {0x00, 0x00, 0x80}, false},
{L"magenta", 5, {0x80, 0x00, 0x80}, false},
{L"purple", 5, {0x80, 0x00, 0x80}, true},
{L"cyan", 6, {0x00, 0x80, 0x80}, false},
{L"white", 7, {0xC0, 0xC0, 0xC0}, false},
{L"grey", 7, {0xE5, 0xE5, 0xE5}, true},
{L"brblack", 8, {0x80, 0x80, 0x80}, false},
{L"brgrey", 8, {0x55, 0x55, 0x55}, true},
{L"brred", 9, {0xFF, 0x00, 0x00}, false},
{L"brgreen", 10, {0x00, 0xFF, 0x00}, false},
{L"brbrown", 11, {0xFF, 0xFF, 0x00}, true},
{L"bryellow", 11, {0xFF, 0xFF, 0x00}, false},
{L"brblue", 12, {0x00, 0x00, 0xFF}, false},
{L"brmagenta", 13, {0xFF, 0x00, 0xFF}, false},
{L"brpurple", 13, {0xFF, 0x00, 0xFF}, true},
{L"brcyan", 14, {0x00, 0xFF, 0xFF}, false},
{L"brwhite", 15, {0xFF, 0xFF, 0xFF}, false},
};
wcstring_list_t rgb_color_t::named_color_names(void) {