nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allocate colors right away instead of delaying it, since they get allocated out of the rendercontrol, and it will never fail.

Browse source
This commit is contained in:
Dana Jansens 2003-02-17 16:36:35 +00:00
parent 716ab805a0
commit 8bf56a288f
2 changed files with 20 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
otk/rendercolor.cc
View file

@ -28,23 +28,21 @@ RenderColor::RenderColor(int screen, unsigned char red,
: _screen(screen), : _screen(screen),
_red(red), _red(red),
_green(green), _green(green),
_blue(blue), _blue(blue)
_allocated(false),
_created(false)
{ {
create();
} }
RenderColor::RenderColor(int screen, RGB rgb) RenderColor::RenderColor(int screen, RGB rgb)
: _screen(screen), : _screen(screen),
_red(rgb.r), _red(rgb.r),
_green(rgb.g), _green(rgb.g),
_blue(rgb.b), _blue(rgb.b)
_allocated(false),
_created(false)
{ {
create();
} }
void RenderColor::create() const void RenderColor::create()
{ {
unsigned long color = _blue | _green << 8 | _red << 16; unsigned long color = _blue | _green << 8 | _red << 16;
@ -67,7 +65,6 @@ void RenderColor::create() const
xcol.blue = (_blue << 8) | _blue; xcol.blue = (_blue << 8) | _blue;
display->renderControl(_screen)->allocateColor(&xcol); display->renderControl(_screen)->allocateColor(&xcol);
_allocated = true;
_pixel = xcol.pixel; _pixel = xcol.pixel;
gcv.foreground = _pixel; gcv.foreground = _pixel;
@ -81,27 +78,12 @@ void RenderColor::create() const
_cache[_screen][color] = item; _cache[_screen][color] = item;
++item->count; ++item->count;
} }
_created = true;
}
unsigned long RenderColor::pixel() const
{
if (!_created) create();
return _pixel;
}
GC RenderColor::gc() const
{
if (!_created) create();
return _gc;
} }
RenderColor::~RenderColor() RenderColor::~RenderColor()
{ {
unsigned long color = _blue | _green << 8 | _red << 16; unsigned long color = _blue | _green << 8 | _red << 16;
if (_created) {
CacheItem *item = _cache[_screen][color]; CacheItem *item = _cache[_screen][color];
assert(item); // better be... assert(item); // better be...
@ -111,12 +93,9 @@ RenderColor::~RenderColor()
_cache[_screen][color] = 0; _cache[_screen][color] = 0;
delete item; delete item;
if (_allocated) {
const ScreenInfo *info = display->screenInfo(_screen); const ScreenInfo *info = display->screenInfo(_screen);
XFreeColors(**display, info->colormap(), &_pixel, 1, 0); XFreeColors(**display, info->colormap(), &_pixel, 1, 0);
} }
}
}
} }
} }

13
otk/rendercolor.hh
View file

@ -37,13 +37,10 @@ private:
unsigned char _green; unsigned char _green;
unsigned char _blue; unsigned char _blue;
mutable unsigned long _pixel; unsigned long _pixel;
mutable GC _gc; GC _gc;
mutable bool _allocated; void create();
mutable bool _created;
void create() const;
public: public:
static void initialize(); static void initialize();
@ -58,8 +55,8 @@ public:
inline unsigned char red() const { return _red; } inline unsigned char red() const { return _red; }
inline unsigned char green() const { return _green; } inline unsigned char green() const { return _green; }
inline unsigned char blue() const { return _blue; } inline unsigned char blue() const { return _blue; }
unsigned long pixel() const; unsigned long pixel() const { return _pixel; }
GC gc() const; GC gc() const { return _gc; }
}; };
} }