X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FColor.cpp;h=b405dc49123f78340fb33fa532f171c96eda7c2c;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=780a5ce9eadfd2e2f8ad6868619701c88d2acd99;hpb=9b4a26a252b2da164fcd6aa84feed0a738b16c10;p=lyx.git diff --git a/src/Color.cpp b/src/Color.cpp index 780a5ce9ea..b405dc4912 100644 --- a/src/Color.cpp +++ b/src/Color.cpp @@ -4,11 +4,11 @@ * Licence details can be found in the file COPYING. * * \author Asger Alstrup - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Matthias Ettrich * \author Jean-Marc Lasgouttes * \author John Levon - * \author André Pönitz + * \author André Pönitz * \author Martin Vermeer * * Full author contact details are available in file CREDITS. @@ -17,11 +17,12 @@ #include #include "Color.h" +#include "ColorSet.h" +#include "support/convert.h" #include "support/debug.h" #include "support/gettext.h" #include "support/lstrings.h" - #include "support/lassert.h" #include @@ -77,26 +78,147 @@ string const X11hexname(RGBColor const & col) RGBColor rgbFromHexName(string const & x11hexname) { RGBColor c; - LASSERT(x11hexname.size() == 7 && x11hexname[0] == '#', /**/); - c.r = hexstrToInt(x11hexname.substr(1,2)); - c.g = hexstrToInt(x11hexname.substr(3,2)); - c.b = hexstrToInt(x11hexname.substr(5,2)); + LASSERT(x11hexname.size() == 7 && x11hexname[0] == '#', + return c); + c.r = hexstrToInt(x11hexname.substr(1, 2)); + c.g = hexstrToInt(x11hexname.substr(3, 2)); + c.b = hexstrToInt(x11hexname.substr(5, 2)); + return c; +} + + +string const outputLaTeXColor(RGBColor const & color) +{ + // this routine returns a LaTeX readable color string in the form + // "red, green, blue" where the colors are a number in the range 0-1 + int red = color.r; + int green = color.g; + int blue = color.b; +#ifdef USE_CORRECT_RGB_CONVERSION + int const scale = 255; +#else + // the color values are given in the range of 0-255, so to get + // an output of "0.5" for the value 127 we need to do the following + // FIXME: This is wrong, since it creates a nonlinear mapping: + // There is a gap between 0/256 and 2/256! + // 0.5 cannot be represented in 8bit hex RGB, it would be 127.5. + if (red != 0) + ++red; + if (green != 0) + ++green; + if (blue != 0) + ++blue; + int const scale = 256; +#endif + string output; + output = convert(float(red) / scale) + ", " + + convert(float(green) / scale) + ", " + + convert(float(blue) / scale); + return output; +} + + +RGBColor const RGBColorFromLaTeX(string const & color) +{ + vector rgb = getVectorFromString(color); + while (rgb.size() < 3) + rgb.push_back("0"); + RGBColor c; + for (int i = 0; i < 3; ++i) { + rgb[i] = trim(rgb[i]); + if (!isStrDbl(rgb[i])) + return c; + } +#ifdef USE_CORRECT_RGB_CONVERSION + int const scale = 255; +#else + // FIXME: This is wrong, since it creates a nonlinear mapping: + // Both 0/256 and 1/256 are mapped to 0! + // The wrong code exists only to match outputLaTeXColor(). + int const scale = 256; +#endif + c.r = static_cast(scale * convert(rgb[0]) + 0.5); + c.g = static_cast(scale * convert(rgb[1]) + 0.5); + c.b = static_cast(scale * convert(rgb[2]) + 0.5); +#ifndef USE_CORRECT_RGB_CONVERSION + if (c.r != 0) + c.r--; + if (c.g != 0) + c.g--; + if (c.b != 0) + c.b--; +#endif return c; } +Color::Color(ColorCode base_color) : baseColor(base_color), + mergeColor(Color_ignore) +{} + + +bool Color::operator==(Color const & color) const +{ + return baseColor == color.baseColor; +} + + +bool Color::operator!=(Color const & color) const +{ + return baseColor != color.baseColor; +} + + +bool Color::operator<(Color const & color) const +{ + return baseColor < color.baseColor; +} + + +bool Color::operator<=(Color const & color) const +{ + return baseColor <= color.baseColor; +} + + +std::ostream & operator<<(std::ostream & os, Color color) +{ + os << to_ascii(lcolor.getGUIName(color.baseColor)); + if (color.mergeColor != Color_ignore) + os << "[merged with:" + << to_ascii(lcolor.getGUIName(color.mergeColor)) << "]"; + return os; +} + + ColorSet::ColorSet() { + char const * grey40 = "#666666"; + char const * grey60 = "#999999"; + char const * grey80 = "#cccccc"; + //char const * grey90 = "#e5e5e5"; // ColorCode, gui, latex, x11, lyx + // Warning: several of these entries are overridden in GuiApplication constructor static ColorEntry const items[] = { { Color_none, N_("none"), "none", "black", "none" }, { Color_black, N_("black"), "black", "black", "black" }, { Color_white, N_("white"), "white", "white", "white" }, - { Color_red, N_("red"), "red", "red", "red" }, - { Color_green, N_("green"), "green", "green", "green" }, { Color_blue, N_("blue"), "blue", "blue", "blue" }, + { Color_brown, N_("brown"), "brown", "brown", "brown" }, { Color_cyan, N_("cyan"), "cyan", "cyan", "cyan" }, + { Color_darkgray, N_("darkgray"), "darkgray", "darkgray", "darkgray" }, + { Color_gray, N_("gray"), "gray", "gray", "gray" }, + { Color_green, N_("green"), "green", "green", "green" }, + { Color_lightgray, N_("lightgray"), "lightgray", "lightgray", "lightgray" }, + { Color_lime, N_("lime"), "lime", "lime", "lime" }, { Color_magenta, N_("magenta"), "magenta", "magenta", "magenta" }, + { Color_olive, N_("olive"), "olive", "olive", "olive" }, + { Color_orange, N_("orange"), "orange", "orange", "orange" }, + { Color_pink, N_("pink"), "pink", "pink", "pink" }, + { Color_purple, N_("purple"), "purple", "purple", "purple" }, + { Color_red, N_("red"), "red", "red", "red" }, + { Color_teal, N_("teal"), "teal", "teal", "teal" }, + { Color_violet, N_("violet"), "violet", "violet", "violet" }, { Color_yellow, N_("yellow"), "yellow", "yellow", "yellow" }, { Color_cursor, N_("cursor"), "cursor", "black", "cursor" }, { Color_background, N_("background"), "background", "linen", "background" }, @@ -106,17 +228,20 @@ ColorSet::ColorSet() "selectiontext", "black", "selectiontext" }, { Color_latex, N_("LaTeX text"), "latex", "DarkRed", "latex" }, { Color_inlinecompletion, N_("inline completion"), - "inlinecompletion", "grey60", "inlinecompletion" }, + "inlinecompletion", grey60, "inlinecompletion" }, { Color_nonunique_inlinecompletion, N_("non-unique inline completion"), - "nonuniqueinlinecompletion", "grey80", "nonuniqueinlinecompletion" }, + "nonuniqueinlinecompletion", grey80, "nonuniqueinlinecompletion" }, { Color_preview, N_("previewed snippet"), "preview", "black", "preview" }, { Color_notelabel, N_("note label"), "note", "yellow", "note" }, { Color_notebg, N_("note background"), "notebg", "yellow", "notebg" }, { Color_commentlabel, N_("comment label"), "comment", "magenta", "comment" }, { Color_commentbg, N_("comment background"), "commentbg", "linen", "commentbg" }, { Color_greyedoutlabel, N_("greyedout inset label"), "greyedout", "#ff0080", "greyedout" }, + { Color_greyedouttext, N_("greyedout inset text"), "greyedouttext", grey80, "greyedouttext" }, { Color_greyedoutbg, N_("greyedout inset background"), "greyedoutbg", "linen", "greyedoutbg" }, + { Color_phantomtext, N_("phantom inset text"), "phantomtext", "#7f7f7f", "phantomtext" }, { Color_shadedbg, N_("shaded box"), "shaded", "#ff0000", "shaded" }, + { Color_listingsbg, N_("listings background"), "listingsbg", "white", "listingsbg" }, { Color_branchlabel, N_("branch label"), "branchlabel", "#c88000", "branchlabel" }, { Color_footlabel, N_("footnote label"), "footlabel", "#00aaff", "footlabel" }, { Color_indexlabel, N_("index label"), "indexlabel", "green", "indexlabel" }, @@ -124,6 +249,7 @@ ColorSet::ColorSet() { Color_urllabel, N_("URL label"), "urllabel", "blue", "urllabel" }, { Color_urltext, N_("URL text"), "urltext", "blue", "urltext" }, { Color_depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" }, + { Color_scroll, N_("scroll indicator"), "scroll", "IndianRed", "scroll" }, { Color_language, N_("language"), "language", "Blue", "language" }, { Color_command, N_("command inset"), "command", "black", "command" }, { Color_commandbg, N_("command inset background"), "commandbg", "azure", "commandbg" }, @@ -132,40 +258,47 @@ ColorSet::ColorSet() { Color_math, N_("math"), "math", "DarkBlue", "math" }, { Color_mathbg, N_("math background"), "mathbg", "linen", "mathbg" }, { Color_graphicsbg, N_("graphics background"), "graphicsbg", "linen", "graphicsbg" }, - { Color_mathmacrobg, N_("Math macro background"), "mathmacrobg", "linen", "mathmacrobg" }, + { Color_mathmacrobg, N_("math macro background"), "mathmacrobg", "linen", "mathmacrobg" }, { Color_mathframe, N_("math frame"), "mathframe", "Magenta", "mathframe" }, { Color_mathcorners, N_("math corners"), "mathcorners", "linen", "mathcorners" }, { Color_mathline, N_("math line"), "mathline", "Blue", "mathline" }, - { Color_mathmacrobg, N_("Math macro background"), "mathmacrobg", "#ede2d8", "mathmacrobg" }, - { Color_mathmacrohoverbg, N_("Math macro hovered background"), "mathmacrohoverbg", "#cdc3b8", "mathmacrohoverbg" }, - { Color_mathmacrolabel, N_("Math macro label"), "mathmacrolabel", "#a19992", "mathmacrolabel" }, - { Color_mathmacroframe, N_("Math macro frame"), "mathmacroframe", "#ede2d8", "mathmacroframe" }, - { Color_mathmacroblend, N_("Math macro blended out"), "mathmacroblend", "black", "mathmacroblend" }, - { Color_mathmacrooldarg, N_("Math macro old parameter"), "mathmacrooldarg", "grey80", "mathmacrooldarg" }, - { Color_mathmacronewarg, N_("Math macro new parameter"), "mathmacronewarg", "black", "mathmacronewarg" }, - { Color_captionframe, N_("caption frame"), "captionframe", "DarkRed", "captionframe" }, + { Color_mathmacrobg, N_("math macro background"), "mathmacrobg", "#ede2d8", "mathmacrobg" }, + { Color_mathmacrohoverbg, N_("math macro hovered background"), "mathmacrohoverbg", "#cdc3b8", "mathmacrohoverbg" }, + { Color_mathmacrolabel, N_("math macro label"), "mathmacrolabel", "#a19992", "mathmacrolabel" }, + { Color_mathmacroframe, N_("math macro frame"), "mathmacroframe", "#ede2d8", "mathmacroframe" }, + { Color_mathmacroblend, N_("math macro blended out"), "mathmacroblend", "black", "mathmacroblend" }, + { Color_mathmacrooldarg, N_("math macro old parameter"), "mathmacrooldarg", grey80, "mathmacrooldarg" }, + { Color_mathmacronewarg, N_("math macro new parameter"), "mathmacronewarg", "black", "mathmacronewarg" }, { Color_collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" }, { Color_collapsableframe, N_("collapsable inset frame"), "collapsableframe", "IndianRed", "collapsableframe" }, - { Color_insetbg, N_("inset background"), "insetbg", "grey80", "insetbg" }, + { Color_insetbg, N_("inset background"), "insetbg", grey80, "insetbg" }, { Color_insetframe, N_("inset frame"), "insetframe", "IndianRed", "insetframe" }, { Color_error, N_("LaTeX error"), "error", "Red", "error" }, { Color_eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" }, { Color_appendix, N_("appendix marker"), "appendix", "Brown", "appendix" }, { Color_changebar, N_("change bar"), "changebar", "Blue", "changebar" }, - { Color_deletedtext, N_("Deleted text"), "deletedtext", "red", "deletedtext" }, - { Color_addedtext, N_("Added text"), "addedtext", "blue", "addedtext" }, + { Color_deletedtext, N_("deleted text"), "deletedtext", "#ff0000", "deletedtext" }, + { Color_addedtext, N_("added text"), "addedtext", "#0000ff", "addedtext" }, + { Color_changedtextauthor1, N_("changed text 1st author"), "changedtextauthor1", "#0000ff", "changedtextauthor1" }, + { Color_changedtextauthor2, N_("changed text 2nd author"), "changedtextauthor2", "#ff00ff", "changedtextauthor2" }, + { Color_changedtextauthor3, N_("changed text 3rd author"), "changedtextauthor3", "#ff0000", "changedtextauthor3" }, + { Color_changedtextauthor4, N_("changed text 4th author"), "changedtextauthor4", "#aa00ff", "changedtextauthor4" }, + { Color_changedtextauthor5, N_("changed text 5th author"), "changedtextauthor5", "#55aa00", "changedtextauthor5" }, + { Color_deletedtextmodifier, N_("deleted text modifier"), "deletedtextmodifier", "white", "deletedtextmodifier" }, { Color_added_space, N_("added space markers"), "added_space", "Brown", "added_space" }, - { Color_topline, N_("top/bottom line"), "topline", "Brown", "topline" }, { Color_tabularline, N_("table line"), "tabularline", "black", "tabularline" }, { Color_tabularonoffline, N_("table on/off line"), "tabularonoffline", "LightSteelBlue", "tabularonoffline" }, - { Color_bottomarea, N_("bottom area"), "bottomarea", "grey40", "bottomarea" }, + { Color_bottomarea, N_("bottom area"), "bottomarea", grey40, "bottomarea" }, { Color_newpage, N_("new page"), "newpage", "Blue", "newpage" }, { Color_pagebreak, N_("page break / line break"), "pagebreak", "RoyalBlue", "pagebreak" }, - { Color_buttonframe, N_("frame of button"), "buttonframe", "#dcd2c8", "buttonframe" }, + { Color_buttonframe, N_("button frame"), "buttonframe", "#dcd2c8", "buttonframe" }, { Color_buttonbg, N_("button background"), "buttonbg", "#dcd2c8", "buttonbg" }, { Color_buttonhoverbg, N_("button background under focus"), "buttonhoverbg", "#C7C7CA", "buttonhoverbg" }, + { Color_paragraphmarker, N_("paragraph marker"), "paragraphmarker", grey80, "paragraphmarker"}, + { Color_previewframe, N_("preview frame"), "previewframe", "black", "previewframe"}, { Color_inherit, N_("inherit"), "inherit", "black", "inherit" }, + { Color_regexpframe, N_("regexp frame"), "regexpframe", "green", "regexpframe" }, { Color_ignore, N_("ignore"), "ignore", "black", "ignore" }, { Color_ignore, 0, 0, 0, 0 } }; @@ -233,16 +366,14 @@ bool ColorSet::setColor(ColorCode col, string const & x11name) { InfoTab::iterator it = infotab.find(col); if (it == infotab.end()) { - lyxerr << "Color " << col << " not found in database." - << endl; + LYXERR0("Color " << col << " not found in database."); return false; } // "inherit" is returned for colors not in the database // (and anyway should not be redefined) if (col == Color_none || col == Color_inherit || col == Color_ignore) { - lyxerr << "Color " << getLyXName(col) - << " may not be redefined" << endl; + LYXERR0("Color " << getLyXName(col) << " may not be redefined."); return false; } @@ -276,8 +407,8 @@ ColorCode ColorSet::getFromLyXName(string const & lyxname) const string const lcname = ascii_lowercase(lyxname); Transform::const_iterator it = lyxcolors.find(lcname); if (it == lyxcolors.end()) { - lyxerr << "ColorSet::getFromLyXName: Unknown color \"" - << lyxname << '"' << endl; + LYXERR0("ColorSet::getFromLyXName: Unknown color \"" + << lyxname << '"'); return Color_none; }