scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 21:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rang: enable also other 3-/4-bit ANSI colors

Browse Source 
Enabled remaining 3-/4-bit ANSI colors as per:
https://en.wikipedia.org/wiki/ANSI_escape_code#3-bit_and_4-bit

rang.hpp header is now synced with:
https://github.com/MartinPulec/rang/blob/master/include/rang.hpp
This commit is contained in:
Martin Pulec
2021-11-09 07:51:54 +01:00
parent 01d69310ae
commit b273b3597f
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/rang.hpp
View File

@@ -1,7 +1,3 @@
/*
* Header is obtained from here:
* https://github.com/agauniyal/rang
*/
#ifndef RANG_DOT_HPP
#define RANG_DOT_HPP
@@ -74,7 +70,15 @@ enum class fg {
magenta = 35,
cyan = 36,
gray = 37,
reset = 39
reset = 39,
bright_black = 90,
bright_red,
bright_green,
bright_yellow,
bright_blue,
bright_magenta,
bright_cyan,
bright_white,
};
enum class bg {
@@ -86,7 +90,15 @@ enum class bg {
magenta = 45,
cyan = 46,
gray = 47,
reset = 49
reset = 49,
bright_black = 100,
bright_red,
bright_green,
bright_yellow,
bright_blue,
bright_magenta,
bright_cyan,
bright_white,
};
enum class fgB {
@@ -356,7 +368,8 @@ namespace rang_implementation {
inline void setWinSGR(rang::bg col, SGR &state) noexcept
{
if (col != rang::bg::reset) {
state.bgColor = ansi2attr(static_cast<BYTE>(col) - 40);
auto val = static_cast<BYTE>(col);
state.bgColor = ansi2attr(val - (val < static_cast<BYTE>(rang::fg::reset) ? 40 : 100));
} else {
state.bgColor = defaultState().bgColor;
}
@@ -365,7 +378,8 @@ namespace rang_implementation {
inline void setWinSGR(rang::fg col, SGR &state) noexcept
{
if (col != rang::fg::reset) {
state.fgColor = ansi2attr(static_cast<BYTE>(col) - 30);
auto val = static_cast<BYTE>(col);
state.fgColor = ansi2attr(val - (val < static_cast<BYTE>(rang::fg::reset) ? 30 : 90));
} else {
state.fgColor = defaultState().fgColor;
}