#include <assert.h>
#include "color.hh"
-#include "basedisplay.hh"
+#include "display.hh"
+#include "screeninfo.hh"
+namespace otk {
BColor::ColorCache BColor::colorcache;
bool BColor::cleancache = false;
-BColor::BColor(const BaseDisplay * const _display, unsigned int _screen)
- : allocated(false), r(-1), g(-1), b(-1), p(0), dpy(_display), scrn(_screen)
+BColor::BColor(unsigned int _screen)
+ : allocated(false), r(-1), g(-1), b(-1), p(0), scrn(_screen)
{}
-BColor::BColor(int _r, int _g, int _b,
- const BaseDisplay * const _display, unsigned int _screen)
- : allocated(false), r(_r), g(_g), b(_b), p(0), dpy(_display), scrn(_screen)
+BColor::BColor(int _r, int _g, int _b, unsigned int _screen)
+ : allocated(false), r(_r), g(_g), b(_b), p(0), scrn(_screen)
{}
-BColor::BColor(const std::string &_name,
- const BaseDisplay * const _display, unsigned int _screen)
- : allocated(false), r(-1), g(-1), b(-1), p(0), dpy(_display), scrn(_screen),
+BColor::BColor(const std::string &_name, unsigned int _screen)
+ : allocated(false), r(-1), g(-1), b(-1), p(0), scrn(_screen),
colorname(_name) {
parseColorName();
}
}
-void BColor::setDisplay(const BaseDisplay * const _display,
- unsigned int _screen) {
- if (_display == display() && _screen == screen()) {
+void BColor::setScreen(unsigned int _screen) {
+ if (_screen == screen()) {
// nothing to do
return;
}
deallocate();
- dpy = _display;
scrn = _screen;
if (! colorname.empty()) {
void BColor::parseColorName(void) {
- assert(dpy != 0);
-
if (colorname.empty()) {
fprintf(stderr, "BColor: empty colorname, cannot parse (using black)\n");
setRGB(0, 0, 0);
}
if (scrn == ~(0u))
- scrn = DefaultScreen(display()->getXDisplay());
- Colormap colormap = display()->getScreenInfo(scrn)->getColormap();
+ scrn = DefaultScreen(OBDisplay::display);
+ Colormap colormap = OBDisplay::screenInfo(scrn)->colormap();
// get rgb values from colorname
XColor xcol;
xcol.blue = 0;
xcol.pixel = 0;
- if (! XParseColor(display()->getXDisplay(), colormap,
+ if (! XParseColor(OBDisplay::display, colormap,
colorname.c_str(), &xcol)) {
fprintf(stderr, "BColor::allocate: color parse error: \"%s\"\n",
colorname.c_str());
void BColor::allocate(void) {
- assert(dpy != 0);
-
- if (scrn == ~(0u)) scrn = DefaultScreen(display()->getXDisplay());
- Colormap colormap = display()->getScreenInfo(scrn)->getColormap();
+ if (scrn == ~(0u)) scrn = DefaultScreen(OBDisplay::display);
+ Colormap colormap = OBDisplay::screenInfo(scrn)->colormap();
if (! isValid()) {
if (colorname.empty()) {
}
// see if we have allocated this color before
- RGB rgb(display(), scrn, r, g, b);
+ RGB rgb(scrn, r, g, b);
ColorCache::iterator it = colorcache.find(rgb);
if (it != colorcache.end()) {
// found
xcol.blue = b | b << 8;
xcol.pixel = 0;
- if (! XAllocColor(display()->getXDisplay(), colormap, &xcol)) {
+ if (! XAllocColor(OBDisplay::display, colormap, &xcol)) {
fprintf(stderr, "BColor::allocate: color alloc error: rgb:%x/%x/%x\n",
r, g, b);
xcol.pixel = 0;
if (! allocated)
return;
- assert(dpy != 0);
-
- ColorCache::iterator it = colorcache.find(RGB(display(), scrn, r, g, b));
+ ColorCache::iterator it = colorcache.find(RGB(scrn, r, g, b));
if (it != colorcache.end()) {
if ((*it).second.count >= 1)
(*it).second.count--;
setRGB(c.r, c.g, c.b);
colorname = c.colorname;
- dpy = c.dpy;
scrn = c.scrn;
return *this;
}
return;
}
- const BaseDisplay* const display = (*it).first.display;
unsigned long *pixels = new unsigned long[ colorcache.size() ];
- unsigned int i, count;
+ int i;
+ unsigned count;
- for (i = 0; i < display->getNumberOfScreens(); i++) {
+ for (i = 0; i < ScreenCount(OBDisplay::display); i++) {
count = 0;
it = colorcache.begin();
}
if (count > 0)
- XFreeColors(display->getXDisplay(),
- display->getScreenInfo(i)->getColormap(),
+ XFreeColors(OBDisplay::display,
+ OBDisplay::screenInfo(i)->colormap(),
pixels, count, 0);
}
delete [] pixels;
cleancache = false;
}
+
+}