*
* \author unknown
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "ColorHandler.h"
-#include "LColor.h"
-#include "gettext.h"
+
#include "debug.h"
+#include "gettext.h"
+#include "LColor.h"
+
+#include "support/lstrings.h"
+#include "support/tostr.h"
+
+#include "lyx_forms.h"
#include <boost/scoped_array.hpp>
-#include "BoostFormat.h"
#include <cmath>
+using lyx::support::bformat;
+
#ifndef CXX_GLOBAL_CSTD
using std::pow;
#endif
using std::endl;
+using std::string;
+
+
+namespace {
+
+ string tostr(XColor const & col)
+ {
+ return bformat("(%1$s,%2$s,%3$s)",
+ ::tostr(col.red), ::tostr(col.green), ::tostr(col.blue));
+ }
+
+}
-#include FORMS_H_LOCATION
LyXColorHandler::LyXColorHandler()
+ : colorGCcache(LColor::ignore + 1)
{
display = fl_get_display();
drawable = XCreatePixmap(display,
colormap = fl_state[fl_get_vclass()].colormap;
// Clear the GC cache
- for (int i = 0; i <= LColor::ignore; ++i) {
+ for (string::size_type i = 0; i < colorGCcache.size(); ++i) {
colorGCcache[i] = 0;
}
}
LyXColorHandler::~LyXColorHandler()
{
// Release all the registered GCs
- for (int i = 0; i <= LColor::ignore; ++i) {
+ for (unsigned i = 0; i < colorGCcache.size(); ++i) {
if (colorGCcache[i] != 0) {
XFreeGC(display, colorGCcache[i]);
}
}
-unsigned long LyXColorHandler::colorPixel(LColor::color c)
+unsigned long LyXColorHandler::colorPixel(LColor_color c)
{
XGCValues val;
XGetGCValues(display, getGCForeground(c), GCForeground, &val);
}
-// Gets GC according to color
-// Uses caching
-GC LyXColorHandler::getGCForeground(LColor::color c)
+GC LyXColorHandler::getGCForeground(string const & s)
{
- if (colorGCcache[c] != 0)
- return colorGCcache[c];
-
XColor xcol;
XColor ccol;
- string const s = lcolor.getX11Name(c);
XGCValues val;
-
// Look up the RGB values for the color, and an approximate
// color that we can hope to get on this display.
if (XLookupColor(display, colormap, s.c_str(), &xcol, &ccol) == 0) {
-#if USE_BOOST_FORMAT
- lyxerr << boost::format(
- _("LyX: Unknown X11 color %1$s for %2$s\n"
- " Using black instead, sorry!"))
- % s
- % lcolor.getGUIName(c)
- << endl;
-#else
- lyxerr << _("LyX: Unknown X11 color ") << s << _(" for ")
- << lcolor.getGUIName(c)
- << _("\n Using black instead, sorry!") << endl;
-#endif
+ lyxerr << bformat(
+ _("LyX: Unknown X11 color %1$s\n"
+ " Using black instead, sorry!"),
+ s) << endl;
unsigned long bla = BlackPixel(display,
DefaultScreen(display));
val.foreground = bla;
// Try the exact RGB values first, then the approximate.
} else if (XAllocColor(display, colormap, &xcol) != 0) {
if (lyxerr.debugging(Debug::GUI)) {
-#if USE_BOOST_FORMAT
- lyxerr << boost::format(
- _("LyX: X11 color %1$s allocated for %2$s"))
- % s
- % lcolor.getGUIName(c)
- << endl;
-#else
- lyxerr << _("LyX: X11 color ") << s
- << _(" allocated for ") << lcolor.getGUIName(c)
- << endl;
-#endif
+ lyxerr << bformat(_("LyX: X11 color %1$s allocated"),
+ s) << endl;
}
val.foreground = xcol.pixel;
- } else if (XAllocColor(display, colormap, &ccol)) {
-#if USE_BOOST_FORMAT
- lyxerr << boost::format(
- _("LyX: Using approximated X11 color %1$s"
- " allocated for %2$s"))
- % s
- % lcolor.getGUIName(c)
- << endl;
-#else
- lyxerr << _("LyX: Using approximated X11 color ") << s
- << _(" allocated for ") << lcolor.getGUIName(c)
- << endl;
-#endif
- val.foreground = xcol.pixel;
} else {
// Here we are traversing the current colormap to find
// the color closest to the one we want.
}
}
-#if USE_BOOST_FORMAT
- lyxerr << boost::format(
- _("LyX: Couldn't allocate '%1$s' for %2$s"
- " with (r,g,b)=(%3$d,%4$d,%5$d).\n"
- " Using closest allocated color"
- " with (r,g,b)=(%6$d,%7$d,%8$d) instead.\n"
- "Pixel [%9$d] is used."))
- % s
- % lcolor.getGUIName(c)
- % xcol.red % xcol.green % xcol.blue
- % cmap[closest_pixel].red
- % cmap[closest_pixel].green
- % cmap[closest_pixel].blue
- % closest_pixel
- << endl;
-#else
- lyxerr << _("LyX: Couldn't allocate '") << s
- << _("' for ") << lcolor.getGUIName(c)
- << _(" with (r,g,b)=(")
- << xcol.red << ',' << xcol.green << ',' << xcol.blue
- << _(").\n")
- << _(" Using closest allocated color with (r,g,b)=(")
- << cmap[closest_pixel].red << ','
- << cmap[closest_pixel].green << ','
- << cmap[closest_pixel].blue
- << _(") instead.\nPixel [")
- << closest_pixel << _("] is used.")
- << endl;
-#endif
+ lyxerr << bformat(
+ _("LyX: Couldn't allocate '%1$s' with (r,g,b)=%3$s.\n"),
+ s, tostr(xcol));
+
+ lyxerr << bformat(
+ _(" Using closest allocated color with (r,g,b)=%1$s instead.\n"
+ "Pixel [%2$s] is used."),
+ tostr(cmap[closest_pixel]), tostr(closest_pixel)) << endl;
+
val.foreground = cmap[closest_pixel].pixel;
}
-
val.function = GXcopy;
- return colorGCcache[c] = XCreateGC(display, drawable,
+ return XCreateGC(display, drawable,
GCForeground | GCFunction, &val);
}
+// Gets GC according to color
+// Uses caching
+GC LyXColorHandler::getGCForeground(LColor_color c)
+{
+ if (static_cast<unsigned>(c) >= colorGCcache.size()) {
+ colorGCcache.resize(c + 1, 0);
+ }
+
+ if (colorGCcache[c] != 0) {
+ return colorGCcache[c];
+ }
+ XColor xcol;
+ XColor ccol;
+ string const s = lcolor.getX11Name(c);
+ // Look up the RGB values for the color, and an approximate
+ // color that we can hope to get on this display.
+ if (XLookupColor(display, colormap, s.c_str(), &xcol, &ccol) == 0) {
+ lyxerr << bformat(
+ _("LyX: Unknown X11 color %1$s for %2$s\n"),
+ s, lcolor.getGUIName(c)) << endl;
+ }
+ return colorGCcache[c] = getGCForeground(s);
+}
+
// Gets GC for line
GC LyXColorHandler::getGCLinepars(Painter::line_style ls,
- Painter::line_width lw, LColor::color c)
+ Painter::line_width lw, LColor_color c)
{
//if (lyxerr.debugging()) {
// lyxerr << "Painter drawable: " << drawable() << endl;
// update GC cache after color redefinition
-void LyXColorHandler::updateColor (LColor::color c)
+void LyXColorHandler::updateColor (LColor_color c)
{
// color GC cache
GC gc = colorGCcache[c];
projects / lyx.git / blobdiff