h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-28 13:11:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

style cleanups

Browse Source
This commit is contained in:
Kurtis Rader
2017-03-15 14:06:58 -07:00
parent f0469d829a
commit 84cf391faa
7 changed files with 41 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/color.cpp
View File

@@ -153,28 +153,17 @@ struct named_color_t {
};
static const named_color_t named_colors[] = {
{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},
{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) {
@@ -340,8 +329,6 @@ wcstring rgb_color_t::description() const {
case type_normal: {
return L"normal";
}
default: {
DIE("unknown color type");
}
default: { DIE("unknown color type"); }
}
}