From f55afe33d710672e0d05e67d740dac546db1fa93 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Thu, 10 Sep 2015 22:17:25 -0400 Subject: [PATCH] Color: Removed FEATURE_COLOR conditional compile - No need any more. --- src/Color.cpp | 30 ------------------------------ src/Color.h | 2 -- src/Context.cpp | 4 ---- src/commands/CmdColor.cpp | 5 ----- src/main.h | 2 -- 5 files changed, 43 deletions(-) diff --git a/src/Color.cpp b/src/Color.cpp index 4f5fecc5a..7c9798bb5 100644 --- a/src/Color.cpp +++ b/src/Color.cpp @@ -74,14 +74,12 @@ Color::Color (const Color& other) Color::Color (unsigned int c) : _value (0) { -#ifdef FEATURE_COLOR if (!(c & _COLOR_HASFG)) _value &= ~_COLOR_FG; if (!(c & _COLOR_HASBG)) _value &= ~_COLOR_BG; _value = c & (_COLOR_256 | _COLOR_HASBG | _COLOR_HASFG |_COLOR_UNDERLINE | _COLOR_INVERSE | _COLOR_BOLD | _COLOR_BRIGHT | _COLOR_BG | _COLOR_FG); -#endif } //////////////////////////////////////////////////////////////////////////////// @@ -99,7 +97,6 @@ Color::Color (unsigned int c) Color::Color (const std::string& spec) : _value (0) { -#ifdef FEATURE_COLOR // Split spec into words. std::vector words; split (words, spec, ' '); @@ -224,27 +221,23 @@ Color::Color (const std::string& spec) // Now combine the fg and bg into a single color. _value = fg_value; blend (Color (bg_value)); -#endif } //////////////////////////////////////////////////////////////////////////////// Color::Color (color_id fg) : _value (0) { -#ifdef FEATURE_COLOR if (fg != Color::nocolor) { _value |= _COLOR_HASFG; _value |= fg; } -#endif } //////////////////////////////////////////////////////////////////////////////// Color::Color (color_id fg, color_id bg) : _value (0) { -#ifdef FEATURE_COLOR if (bg != Color::nocolor) { _value |= _COLOR_HASBG; @@ -256,14 +249,12 @@ Color::Color (color_id fg, color_id bg) _value |= _COLOR_HASFG; _value |= fg; } -#endif } //////////////////////////////////////////////////////////////////////////////// Color::Color (color_id fg, color_id bg, bool underline, bool bold, bool bright) : _value (0) { -#ifdef FEATURE_COLOR _value |= ((underline ? 1 : 0) << 18) | ((bold ? 1 : 0) << 17) | ((bright ? 1 : 0) << 16); @@ -279,7 +270,6 @@ Color::Color (color_id fg, color_id bg, bool underline, bool bold, bool bright) _value |= _COLOR_HASFG; _value |= fg; } -#endif } //////////////////////////////////////////////////////////////////////////////// @@ -300,7 +290,6 @@ Color& Color::operator= (const Color& other) Color::operator std::string () const { std::string description; -#ifdef FEATURE_COLOR if (_value & _COLOR_BOLD) description += "bold"; if (_value & _COLOR_UNDERLINE) @@ -321,7 +310,6 @@ Color::operator std::string () const description += " " + bg (); } -#endif return description; } @@ -337,7 +325,6 @@ Color::operator int () const // other take precedence. void Color::blend (const Color& other) { -#ifdef FEATURE_COLOR if (!other.nontrivial ()) return; @@ -389,13 +376,11 @@ void Color::blend (const Color& other) _value |= (c._value & _COLOR_BG); // Apply other color. } } -#endif } //////////////////////////////////////////////////////////////////////////////// void Color::upgrade () { -#ifdef FEATURE_COLOR if (!(_value & _COLOR_256)) { if (_value & _COLOR_HASFG) @@ -418,7 +403,6 @@ void Color::upgrade () _value |= _COLOR_256; } -#endif } //////////////////////////////////////////////////////////////////////////////// @@ -435,7 +419,6 @@ void Color::upgrade () // 256 bg \033[48;5;Nm std::string Color::colorize (const std::string& input) { -#ifdef FEATURE_COLOR if (!nontrivial ()) return input; @@ -500,7 +483,6 @@ std::string Color::colorize (const std::string& input) result << "m" << input << "\033[0m"; return result.str (); } -#endif return input; } @@ -509,7 +491,6 @@ std::string Color::colorize (const std::string& input) // Remove color codes from a string. std::string Color::strip (const std::string& input) { -#ifdef FEATURE_COLOR int length = input.length (); bool inside = false; std::string output; @@ -530,20 +511,13 @@ std::string Color::strip (const std::string& input) } return output; -#else - return input; -#endif } //////////////////////////////////////////////////////////////////////////////// std::string Color::colorize (const std::string& input, const std::string& spec) { -#ifdef FEATURE_COLOR Color c (spec); return c.colorize (input); -#else - return input; -#endif } //////////////////////////////////////////////////////////////////////////////// @@ -565,7 +539,6 @@ int Color::find (const std::string& input) //////////////////////////////////////////////////////////////////////////////// std::string Color::fg () const { -#ifdef FEATURE_COLOR int index = _value & _COLOR_FG; if (_value & _COLOR_256) @@ -583,7 +556,6 @@ std::string Color::fg () const if (allColors[i].index == index) return allColors[i].english_name; } -#endif return ""; } @@ -591,7 +563,6 @@ std::string Color::fg () const //////////////////////////////////////////////////////////////////////////////// std::string Color::bg () const { -#ifdef FEATURE_COLOR int index = (_value & _COLOR_BG) >> 8; if (_value & _COLOR_256) @@ -609,7 +580,6 @@ std::string Color::bg () const if (allColors[i].index == index) return allColors[i].english_name; } -#endif return ""; } diff --git a/src/Color.h b/src/Color.h index 68ff1a292..5ed2e260f 100644 --- a/src/Color.h +++ b/src/Color.h @@ -29,8 +29,6 @@ #include -#define FEATURE_COLOR 1 - //////////////////////////////////////////////////////////////////////////////// #define _COLOR_INVERSE 0x00400000 // Inverse attribute. #define _COLOR_256 0x00200000 // 256-color mode. diff --git a/src/Context.cpp b/src/Context.cpp index 3fe59548a..eead28b77 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -467,7 +467,6 @@ int Context::dispatch (std::string &out) //////////////////////////////////////////////////////////////////////////////// bool Context::color () { -#ifdef FEATURE_COLOR if (determine_color_use) { // What the config says. @@ -497,9 +496,6 @@ bool Context::color () // Cached result. return use_color; -#else - return false; -#endif } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp index fbcf705e8..bc5b56369 100644 --- a/src/commands/CmdColor.cpp +++ b/src/commands/CmdColor.cpp @@ -57,7 +57,6 @@ int CmdColor::execute (std::string& output) { int rc = 0; -#ifdef FEATURE_COLOR // Get the non-attribute, non-fancy command line arguments. bool legend = false; std::vector words = context.cli2.getWords (); @@ -263,10 +262,6 @@ int CmdColor::execute (std::string& output) } output = out.str (); -#else - output = "Color not supported.\n"; -#endif - return rc; } diff --git a/src/main.h b/src/main.h index 16d1f854d..da73bc75b 100644 --- a/src/main.h +++ b/src/main.h @@ -27,8 +27,6 @@ #ifndef INCLUDED_MAIN #define INCLUDED_MAIN -#define FEATURE_COLOR 1 // Enable color. - #include #include #include