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

move some internal functions from render.h to instance.h

Browse source 
add a color hash table to the RrInstance
This commit is contained in:
Dana Jansens 2003-09-02 08:37:52 +00:00
parent 2755cf85fc
commit 92feea765a
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
render/instance.c
View file

@ -18,6 +18,8 @@ RrInstance* RrInstanceNew (Display *display, gint screen)
definst->pseudo_colors = NULL; definst->pseudo_colors = NULL;
definst->color_hash = g_hash_table_new(g_int_hash, g_int_equal);
switch (definst->visual->class) { switch (definst->visual->class) {
case TrueColor: case TrueColor:
RrTrueColorSetup(definst); RrTrueColorSetup(definst);
@ -157,6 +159,7 @@ void RrInstanceFree (RrInstance *inst)
if (inst) { if (inst) {
if (inst == definst) definst = NULL; if (inst == definst) definst = NULL;
g_free(inst->pseudo_colors); g_free(inst->pseudo_colors);
g_hash_table_destroy(inst->color_hash);
} }
} }
@ -244,3 +247,8 @@ XColor *RrPseudoColors (const RrInstance *inst)
{ {
return (inst ? inst : definst)->pseudo_colors; return (inst ? inst : definst)->pseudo_colors;
} }
GHashTable* RrColorHash (const RrInstance *inst)
{
return (inst ? inst : definst)->color_hash;
}

6
render/instance.h
View file

@ -26,6 +26,12 @@ struct _RrInstance {
gint pseudo_bpc; gint pseudo_bpc;
XColor *pseudo_colors; XColor *pseudo_colors;
GHashTable *color_hash;
}; };
guint RrPseudoBPC (const RrInstance *inst);
XColor* RrPseudoColors (const RrInstance *inst);
GHashTable* RrColorHash (const RrInstance *inst);
#endif #endif

2
render/render.h
View file

@ -164,8 +164,6 @@ gint RrBlueShift (const RrInstance *inst);
gint RrRedMask (const RrInstance *inst); gint RrRedMask (const RrInstance *inst);
gint RrGreenMask (const RrInstance *inst); gint RrGreenMask (const RrInstance *inst);
gint RrBlueMask (const RrInstance *inst); gint RrBlueMask (const RrInstance *inst);
guint RrPseudoBPC (const RrInstance *inst);
XColor* RrPseudoColors (const RrInstance *inst);
RrColor *RrColorNew (const RrInstance *inst, gint r, gint g, gint b); RrColor *RrColorNew (const RrInstance *inst, gint r, gint g, gint b);
RrColor *RrColorParse (const RrInstance *inst, gchar *colorname); RrColor *RrColorParse (const RrInstance *inst, gchar *colorname);