-// -*- C++ -*-
/* This file is part of
* ======================================================
*
* LyX, The Document Processor
*
- * Copyright 1998-2000 The LyX Team
+ * Copyright 1998-2001 The LyX Team
*
*======================================================*/
#include <cmath>
-#include FORMS_H_LOCATION
-#include "debug.h"
-
+#include "frontends/GUIRunTime.h"
#include "ColorHandler.h"
+#include "LColor.h"
#include "gettext.h"
+#include "debug.h"
using std::endl;
LyXColorHandler::LyXColorHandler()
{
- display = fl_display;
- drawable = XCreatePixmap(display, fl_root, 10, 10,
- fl_get_visual_depth());
+ display = GUIRunTime::x11Display();
+ drawable = XCreatePixmap(display,
+ RootWindow(display, GUIRunTime::x11Screen()),
+ 10, 10,
+ GUIRunTime::x11VisualDepth());
- colormap = fl_state[fl_get_vclass()].colormap;
+ colormap = GUIRunTime::x11Colormap();
// Clear the GC cache
for (int i = 0; i <= LColor::ignore; ++i) {
colorGCcache[i] = 0;
// Iterate over the line cache and Free the GCs
for (LineGCCache::iterator lit = lineGCcache.begin();
lit != lineGCcache.end(); ++lit) {
- XFreeGC(display, (*lit).second);
+ XFreeGC(display, lit->second);
}
}
XColor * cmap = new XColor[vi->map_entries];
- for(int i = 0; i < vi->map_entries; ++i) {
+ for (int i = 0; i < vi->map_entries; ++i) {
cmap[i].pixel = i;
}
XQueryColors(display, colormap, cmap, vi->map_entries);
int closest_pixel = 0;
double closest_distance = 1e20; // we want to minimize this
double distance = 0;
- for(int t = 0; t < vi->map_entries; ++t) {
+ for (int t = 0; t < vi->map_entries; ++t) {
// The Euclidean distance between two points in
// a three-dimensional space, the RGB color-cube,
// is used as the distance measurement between two
GCCapStyle | GCJoinStyle | GCFunction, &val);
}
+
// update GC cache after color redefinition
void LyXColorHandler::updateColor (LColor::color c)
{
}
//
-LyXColorHandler * lyxColorHandler;
+boost::scoped_ptr<LyXColorHandler> lyxColorHandler;