Introduce LFUN_PRINT.

[lyx.git] / src / frontends / xforms / Color.C

diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C
index 25c9d3dcd84cca7425100aa9de13fdc2c3722879..fdb6ed963b7d84066bd8fc99e1970dd034695f8c 100644 (file)
--- a/src/frontends/xforms/Color.C
+++ b/src/frontends/xforms/Color.C
@@ -5,16 +5,22 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-
 #include "Color.h"
-#include <algorithm> // max
-#include <cmath> // floor
-#include FORMS_H_LOCATION
+
+#include "lyx_forms.h"
+
+#include "LColor.h"
+
+#include "support/std_sstream.h"
+
+#include <cmath>
+#include <iomanip>
+
 
 #ifndef CXX_GLOBAL_CSTD
 using std::floor;
@@ -22,15 +28,30 @@ using std::floor;
 
 using std::max;
 using std::min;
+using std::setw;
+
+using std::istringstream;
+using std::ostringstream;
+using std::string;
+
 
 namespace {
 
 int const nohue = -1;
 
+int hexstrToInt(string const & str)
+{
+        int val = 0;
+        istringstream is(str);
+        is >> std::setbase(16) >> val;
+        return val;
+}
+
 } // namespace anon
 
 
-bool getRGBColor(LColor::color col,
+
+bool getRGBColor(LColor_color col,
                 unsigned int & r, unsigned int & g, unsigned int & b)
 {
        string const name = lcolor.getX11Name(col);
@@ -52,6 +73,29 @@ bool getRGBColor(LColor::color col,
 }
 
 
+string const X11hexname(RGBColor const & col)
+{
+       ostringstream ostr;
+
+       ostr << '#' << std::setbase(16) << std::setfill('0')
+            << setw(2) << col.r
+            << setw(2) << col.g
+            << setw(2) << col.b;
+
+       return ostr.str();
+}
+
+
+RGBColor::RGBColor(string const & x11hexname)
+       : r(0), g(0), b(0)
+{
+       BOOST_ASSERT(x11hexname.size() == 7 && x11hexname[0] == '#');
+       r = hexstrToInt(x11hexname.substr(1,2));
+       g = hexstrToInt(x11hexname.substr(3,2));
+       b = hexstrToInt(x11hexname.substr(5,2));
+}
+
+
 RGBColor::RGBColor(HSVColor const & hsv)
 {
        double h = hsv.h;