#pragma implementation
#endif
-#include <cmath>
-
-#include "frontends/GUIRunTime.h"
#include "ColorHandler.h"
#include "LColor.h"
#include "gettext.h"
#include "debug.h"
+#include "frontends/GUIRunTime.h"
+
+#include <cmath>
+
using std::endl;
+
LyXColorHandler::LyXColorHandler()
{
display = GUIRunTime::x11Display();
// lyxerr << "Painter drawable: " << drawable() << endl;
//}
- if (colorGCcache[c] != 0) return colorGCcache[c];
+ if (colorGCcache[c] != 0)
+ return colorGCcache[c];
- XColor xcol, ccol;
- string s = lcolor.getX11Name(c);
+ XColor xcol;
+ XColor ccol;
+ string const s = lcolor.getX11Name(c);
XGCValues val;
// Look up the RGB values for the color, and an approximate
// the color closest to the one we want.
Visual * vi = DefaultVisual(display, DefaultScreen(display));
- XColor * cmap = new XColor[vi->map_entries];
+ boost::scoped_array<XColor> cmap(new XColor[vi->map_entries]);
for (int i = 0; i < vi->map_entries; ++i) {
cmap[i].pixel = i;
}
- XQueryColors(display, colormap, cmap, vi->map_entries);
+ XQueryColors(display, colormap, cmap.get(), vi->map_entries);
// Walk through the cmap and look for close colors.
int closest_pixel = 0;
<< _("Pixel [") << closest_pixel << _("] is used.")
<< endl;
val.foreground = cmap[closest_pixel].pixel;
- delete[] cmap;
}
val.function = GXcopy;
// Gets GC for line
GC LyXColorHandler::getGCLinepars(PainterBase::line_style ls,
- PainterBase::line_width lw, LColor::color c)
+ PainterBase::line_width lw, LColor::color c)
{
//if (lyxerr.debugging()) {
// lyxerr << "Painter drawable: " << drawable() << endl;
//}
- int index = lw + (ls << 1) + (c << 3);
+ int index = lw + (ls << 1) + (c << 6);
- if (lineGCcache.find(index) != lineGCcache.end())
- return lineGCcache[index];
+ LineGCCache::iterator it = lineGCcache.find(index);
+ if (it != lineGCcache.end())
+ return it->second;
XGCValues val;
XGetGCValues(display, getGCForeground(c), GCForeground, &val);
switch (lw) {
- case PainterBase::line_thin: val.line_width = 0; break;
- case PainterBase::line_thick: val.line_width = 2; break;
+ case PainterBase::line_thin:
+ val.line_width = 0;
+ break;
+ case PainterBase::line_thick:
+ val.line_width = 2;
+ break;
}
switch (ls) {
- case PainterBase::line_solid: val.line_style = LineSolid; break;
- case PainterBase::line_onoffdash: val.line_style = LineOnOffDash; break;
- case PainterBase::line_doubledash: val.line_style = LineDoubleDash; break;
+ case PainterBase::line_solid:
+ val.line_style = LineSolid;
+ break;
+ case PainterBase::line_onoffdash:
+ val.line_style = LineOnOffDash;
+ break;
+ case PainterBase::line_doubledash:
+ val.line_style = LineDoubleDash;
+ break;
}
{
// color GC cache
GC gc = colorGCcache[c];
- if (gc != NULL) {
+ if (gc != 0) {
XFreeGC(display, gc);
colorGCcache[c] = NULL;
getGCForeground(c);
// line GC cache
- int index, ls, lw;
- for (ls=0; ls<3; ++ls)
- for (lw=0; lw<2; ++lw) {
- index = lw + (ls << 1) + (c << 3);
- if (lineGCcache.find(index) != lineGCcache.end()) {
- gc = lineGCcache[index];
- XFreeGC(display,gc);
- lineGCcache.erase(index);
+ for (int ls = 0; ls < 3; ++ls)
+ for (int lw = 0; lw < 2; ++lw) {
+ int const index = lw + (ls << 1) + (c << 6);
+ LineGCCache::iterator it = lineGCcache.find(index);
+ if (it != lineGCcache.end()) {
+ gc = it->second;
+ XFreeGC(display, gc);
+ lineGCcache.erase(it);
getGCLinepars(PainterBase::line_style(ls),
- PainterBase::line_width(lw), c);
+ PainterBase::line_width(lw), c);
}
}