External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finalize review comments.

Browse Source
This commit is contained in:
Nicolas Lesser 2018-12-06 14:53:27 +01:00
parent 394e987350
commit c020c6f385
No known key found for this signature in database
GPG Key ID: 55F9BC675F85A2DF
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/fmt/color.h
View File

@ -289,6 +289,9 @@ public:
FMT_CONSTEXPR_DECL bool has_background() const FMT_NOEXCEPT { FMT_CONSTEXPR_DECL bool has_background() const FMT_NOEXCEPT {
return set_background_color; return set_background_color;
} }
FMT_CONSTEXPR_DECL bool has_emphasis() const FMT_NOEXCEPT {
return static_cast<uint8_t>(ems);
}
FMT_CONSTEXPR_DECL rgb get_foreground() const FMT_NOEXCEPT { FMT_CONSTEXPR_DECL rgb get_foreground() const FMT_NOEXCEPT {
assert(set_foreground_color); assert(set_foreground_color);
return foreground_color; return foreground_color;
@ -298,6 +301,7 @@ public:
return background_color; return background_color;
} }
FMT_CONSTEXPR emphasis get_emphasis() const FMT_NOEXCEPT { FMT_CONSTEXPR emphasis get_emphasis() const FMT_NOEXCEPT {
assert(ems);
return ems; return ems;
} }
@ -352,13 +356,14 @@ struct ansi_color_escape {
} }
FMT_CONSTEXPR ansi_color_escape(emphasis em) FMT_NOEXCEPT { FMT_CONSTEXPR ansi_color_escape(emphasis em) FMT_NOEXCEPT {
uint8_t em_codes[4] = {}; uint8_t em_codes[4] = {};
if ((uint32_t)em & (uint32_t)emphasis::bold) uint8_t em_bits = static_cast<uint8_t>(em);
if (em_bits & static_cast<uint8_t>(emphasis::bold))
em_codes[0] = 1; em_codes[0] = 1;
if ((uint32_t)em & (uint32_t)emphasis::italic) if (em_bits & static_cast<uint8_t>(emphasis::italic))
em_codes[1] = 3; em_codes[1] = 3;
if ((uint32_t)em & (uint32_t)emphasis::underline) if (em_bits & static_cast<uint8_t>(emphasis::underline))
em_codes[2] = 4; em_codes[2] = 4;
if ((uint32_t)em & (uint32_t)emphasis::strikethrough) if (em_bits & static_cast<uint8_t>(emphasis::strikethrough))
em_codes[3] = 9; em_codes[3] = 9;
std::size_t index = 0; std::size_t index = 0;
@ -428,7 +433,8 @@ template <
typename S, typename Char = typename internal::char_t<S>::type> typename S, typename Char = typename internal::char_t<S>::type>
void vprint(const text_style &tf, const S &format, void vprint(const text_style &tf, const S &format,
basic_format_args<typename buffer_context<Char>::type> args) { basic_format_args<typename buffer_context<Char>::type> args) {
internal::fputs<Char>(internal::make_emphasis<Char>(tf.get_emphasis()), stdout); if (tf.has_emphasis())
internal::fputs<Char>(internal::make_emphasis<Char>(tf.get_emphasis()), stdout);
if (tf.has_foreground()) if (tf.has_foreground())
internal::fputs<Char>( internal::fputs<Char>(
internal::make_foreground_color<Char>(tf.get_foreground()), stdout); internal::make_foreground_color<Char>(tf.get_foreground()), stdout);