X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLColor.C;h=5923d26ce8b83df3a5ac17933eb653a179b6e771;hb=3f8fa07c6ed38218d6a4048f2993a512aa942c96;hp=a1eca5898309fbe4f3a0ed1e1fb732395aa3fd27;hpb=fcdb71906b6f41dd5719608b1e57286037fc5f2c;p=lyx.git

diff --git a/src/LColor.C b/src/LColor.C
index a1eca58983..5923d26ce8 100644
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -17,21 +17,26 @@
 #include <config.h>
 
 #include "debug.h"
-#include "LColor.h"
 #include "gettext.h"
+#include "LColor.h"
 #include "support/lstrings.h"
 
 #include <map>
 
-using namespace lyx::support;
+
+namespace lyx {
+
+using support::compare_ascii_no_case;
+using support::ascii_lowercase;
 
 using std::endl;
+using std::string;
 
 
 namespace {
 
 struct ColorEntry {
-	int lcolor;
+	LColor::color lcolor;
 	char const * guiname;
 	char const * latexname;
 	char const * x11name;
@@ -40,15 +45,11 @@ struct ColorEntry {
 
 }
 
-struct TransformEntry {
-	char const * lyxname;
-	int ncolor;
-};
-
-
-struct LColor::Pimpl {
+class LColor::Pimpl {
+public:
 	///
-	struct information {
+	class information {
+	public:
 		/// the name as it appears in the GUI
 		string guiname;
 		/// the name used in LaTeX
@@ -63,22 +64,25 @@ struct LColor::Pimpl {
 	void fill(ColorEntry const & entry)
 	{
 		information in;
-		in.lyxname   = string(entry.lyxname);
-		in.latexname = string(entry.latexname);
-		in.x11name   = string(entry.x11name);
-		in.guiname   = string(entry.guiname);
+		in.lyxname   = entry.lyxname;
+		in.latexname = entry.latexname;
+		in.x11name   = entry.x11name;
+		in.guiname   = entry.guiname;
 		infotab[entry.lcolor] = in;
-		transform[string(entry.lyxname)] = int(entry.lcolor);
+		lyxcolors[entry.lyxname] = entry.lcolor;
+		latexcolors[entry.latexname] = entry.lcolor;
 	}
 
 	///
-	typedef std::map<int, information> InfoTab;
+	typedef std::map<LColor::color, information> InfoTab;
 	/// the table of color information
 	InfoTab infotab;
 
-	typedef std::map<string, int> Transform;
-	/// the transform between colour name string and integer code.
-	Transform transform;
+	typedef std::map<string, LColor::color> Transform;
+	/// the transform between LyX color name string and integer code.
+	Transform lyxcolors;
+	/// the transform between LaTeX color name string and integer code.
+	Transform latexcolors;
 
 };
 
@@ -103,12 +107,13 @@ LColor::LColor()
 	{ selection, N_("selection"), "selection", "LightBlue", "selection" },
 	{ latex, N_("LaTeX text"), "latex", "DarkRed", "latex" },
 	{ preview, N_("previewed snippet"), "preview", "black", "preview" },
-	{ note, N_("note"), "note", "yellow", "note" },
+	{ note, N_("note"), "note", "blue", "note" },
 	{ notebg, N_("note background"), "notebg", "yellow", "notebg" },
 	{ comment, N_("comment"), "comment", "magenta", "comment" },
 	{ commentbg, N_("comment background"), "commentbg", "linen", "commentbg" },
 	{ greyedout, N_("greyedout inset"), "greyedout", "red", "greyedout" },
 	{ greyedoutbg, N_("greyedout inset background"), "greyedoutbg", "linen", "greyedoutbg" },
+	{ shadedbg, N_("shaded box"), "shaded", "#ff0000", "shaded" },
 	{ depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" },
 	{ language, N_("language"), "language", "Blue", "language" },
 	{ command, N_("command inset"), "command", "black", "command" },
@@ -140,11 +145,9 @@ LColor::LColor()
 	     "LightSteelBlue", "tabularonoffline" },
 	{ bottomarea, N_("bottom area"), "bottomarea", "grey40", "bottomarea" },
 	{ pagebreak, N_("page break"), "pagebreak", "RoyalBlue", "pagebreak" },
-	{ top, N_("top of button"), "top", "grey90", "top" },
-	{ bottom, N_("bottom of button"), "bottom", "grey60", "bottom" },
-	{ left, N_("left of button"), "left", "grey90", "left" },
-	{ right, N_("right of button"), "right", "grey60", "right" },
-	{ buttonbg, N_("button background"), "buttonbg", "grey80", "buttonbg" },
+	{ buttonframe, N_("frame of button"), "buttonframe", "#dcd2c8", "buttonframe" },
+	{ buttonbg, N_("button background"), "buttonbg", "#dcd2c8", "buttonbg" },
+	{ buttonhoverbg, N_("button background under focus"), "buttonhoverbg", "#C7C7CA", "buttonhoverbg" },
 	{ inherit, N_("inherit"), "inherit", "black", "inherit" },
 	{ ignore, N_("ignore"), "ignore", "black", "ignore" },
 	{ ignore, 0, 0, 0, 0 }
@@ -164,160 +167,118 @@ LColor::~LColor()
 {}
 
 
-void LColor::operator=(LColor const & c)
+LColor & LColor::operator=(LColor tmp)
 {
-	LColor tmp(c);
 	boost::swap(pimpl_, tmp.pimpl_);
+	return *this;
 }
 
 
-void LColor::fill(LColor::color c,
-				string const & lyxname,
-				string const & x11name,
-				string const & latexname,
-				string const & guiname)
-{
-	ColorEntry ce;
-	ce.lcolor = c;
-	ce.guiname = guiname.c_str();
-	ce.latexname = latexname.c_str();
-	ce.x11name = x11name.c_str();
-	ce.lyxname = lyxname.c_str();
-	pimpl_->fill(ce);
-}
-
-
-string const LColor::getGUIName(LColor::color c) const
+docstring const LColor::getGUIName(LColor::color c) const
 {
-	Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c);
-	if (ici != pimpl_->infotab.end())
-		return _(ici->second.guiname);
-	return "none";
-}
-
-
-string const LColor::getGUIName(string const &  s) const
-{
-	Pimpl::Transform::const_iterator ici = pimpl_->transform.find(s);
-	if (ici != pimpl_->transform.end()) {
-		Pimpl::InfoTab::const_iterator
-			it = pimpl_->infotab.find(ici->second);
-		if (it != pimpl_->infotab.end())
-			return it->second.guiname;
-	}
-	return "none";
+	Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
+	if (it != pimpl_->infotab.end())
+		return _(it->second.guiname);
+	return from_ascii("none");
 }
 
 
 string const LColor::getX11Name(LColor::color c) const
 {
-	Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c);
-	if (ici != pimpl_->infotab.end())
-		return ici->second.x11name;
+	Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
+	if (it != pimpl_->infotab.end())
+		return it->second.x11name;
 
 	lyxerr << "LyX internal error: Missing color"
-		" entry in LColor.C for " << int(c) << endl;
-	lyxerr << "Using black." << endl;
+		  " entry in LColor.C for " << c << '\n'
+	       << "Using black." << endl;
 	return "black";
 }
 
 
-string const LColor::getX11Name(string const & s) const
+string const LColor::getLaTeXName(LColor::color c) const
 {
-	Pimpl::Transform::const_iterator ici = pimpl_->transform.find(s);
-	if (ici != pimpl_->transform.end()) {
-		Pimpl::InfoTab::const_iterator
-			it = pimpl_->infotab.find(ici->second);
-		if (it != pimpl_->infotab.end())
-			return it->second.x11name;
-	}
-	lyxerr << "LyX internal error: Missing color"
-		" entry in LColor.C for " << s << endl;
-	lyxerr << "Using black." << endl;
+	Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
+	if (it != pimpl_->infotab.end())
+		return it->second.latexname;
 	return "black";
 }
 
 
-string const LColor::getLaTeXName(LColor::color c) const
+string const LColor::getLyXName(LColor::color c) const
 {
-	Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c);
-	if (ici != pimpl_->infotab.end())
-		return ici->second.latexname;
+	Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
+	if (it != pimpl_->infotab.end())
+		return it->second.lyxname;
 	return "black";
 }
 
 
-string const LColor::getLaTeXName(string const & s) const
+bool LColor::setColor(LColor::color col, string const & x11name)
 {
-	Pimpl::Transform::const_iterator ici = pimpl_->transform.find(s);
-	if (ici != pimpl_->transform.end()) {
-		Pimpl::InfoTab::const_iterator
-			it = pimpl_->infotab.find(ici->second);
-		if (it != pimpl_->infotab.end())
-			return it->second.latexname;
+	Pimpl::InfoTab::iterator it = pimpl_->infotab.find(col);
+	if (it == pimpl_->infotab.end()) {
+		lyxerr << "Color " << col << " not found in database."
+		       << std::endl;
+		return false;
 	}
-	return "black";
-}
 
+	// "inherit" is returned for colors not in the database
+	// (and anyway should not be redefined)
+	if (col == none || col == inherit || col == ignore) {
+		lyxerr << "Color " << getLyXName(col)
+		       << " may not be redefined" << endl;
+		return false;
+	}
 
-string const LColor::getLyXName(LColor::color c) const
-{
-	Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c);
-	if (ici != pimpl_->infotab.end())
-		return ici->second.lyxname;
-	return "black";
+	it->second.x11name = x11name;
+	return true;
 }
 
 
-size_t LColor::size() const
+bool LColor::setColor(string const & lyxname, string const &x11name)
 {
-	return pimpl_->infotab.size();
+	string const lcname = ascii_lowercase(lyxname);
+	if (pimpl_->lyxcolors.find(lcname) == pimpl_->lyxcolors.end()) {
+		lyxerr[Debug::GUI]
+			<< "LColor::setColor: Unknown color \""
+		       << lyxname << '"' << endl;
+		addColor(static_cast<color>(pimpl_->infotab.size()), lcname);
+	}
+
+	return setColor(pimpl_->lyxcolors[lcname], x11name);
 }
 
 
-void LColor::setColor(LColor::color col, string const & x11name)
+void LColor::addColor(LColor::color c, string const & lyxname) const
 {
-	Pimpl::InfoTab::iterator iti = pimpl_->infotab.find(col);
-	if (iti != pimpl_->infotab.end()) {
-		iti->second.x11name = x11name;
-		return;
-	}
-	lyxerr << "LyX internal error: color and such." << endl;
-	BOOST_ASSERT(false);
+	ColorEntry ce = { c, "", "", "", lyxname.c_str() };
+	pimpl_->fill(ce);
 }
 
 
-bool LColor::setColor(string const & lyxname, string const & x11name)
+LColor::color LColor::getFromLyXName(string const & lyxname) const
 {
-	color col = getFromLyXName(lyxname);
-
-	// "inherit" is returned for colors not in the database
-	// (and anyway should not be redefined)
-	if (col == inherit || col == ignore) {
-		lyxerr << "Color " << lyxname << " is undefined or may not be"
-			" redefined" << endl;
-		return false;
+	string const lcname = ascii_lowercase(lyxname);
+	if (pimpl_->lyxcolors.find(lcname) == pimpl_->lyxcolors.end()) {
+		lyxerr << "LColor::getFromLyXName: Unknown color \""
+		       << lyxname << '"' << endl;
+		return none;
 	}
-	setColor(col, x11name);
-	return true;
+
+	return pimpl_->lyxcolors[lcname];
 }
 
 
-LColor::color LColor::getFromGUIName(string const & guiname) const
+LColor::color LColor::getFromLaTeXName(string const & latexname) const
 {
-	Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.begin();
-	Pimpl::InfoTab::const_iterator end = pimpl_->infotab.end();
-	for (; ici != end; ++ici) {
-		if (!compare_ascii_no_case(_(ici->second.guiname), guiname))
-			return static_cast<LColor::color>(ici->first);
+	if (pimpl_->latexcolors.find(latexname) == pimpl_->latexcolors.end()) {
+		lyxerr << "LColor::getFromLaTeXName: Unknown color \""
+		       << latexname << '"' << endl;
+		return none;
 	}
-	return LColor::inherit;
-}
-
 
-LColor::color LColor::getFromLyXName(string const & lyxname) const
-{
-	return static_cast<LColor::color>(pimpl_->transform[lyxname]);
+	return pimpl_->latexcolors[latexname];
 }
 
 
@@ -325,3 +286,6 @@ LColor::color LColor::getFromLyXName(string const & lyxname) const
 LColor lcolor;
 // An equally evil global system LColor instance
 LColor system_lcolor;
+
+
+} // namespace lyx