all repos — openbox @ 92feea765a59a7b3ab3b3c0babda4bfd0cf91d7f

openbox fork - make it a bit more like ryudo

move some internal functions from render.h to instance.h
add a color hash table to the RrInstance
Dana Jansens danakj@orodu.net
commit

92feea765a59a7b3ab3b3c0babda4bfd0cf91d7f

parent

2755cf85fc7d0f088a060f59e4d31b112daeb81d

3 files changed, 14 insertions(+), 2 deletions(-)

jump to
M render/instance.crender/instance.c

@@ -18,6 +18,8 @@ definst->colormap = DefaultColormap(display, screen);

definst->pseudo_colors = NULL; + definst->color_hash = g_hash_table_new(g_int_hash, g_int_equal); + switch (definst->visual->class) { case TrueColor: RrTrueColorSetup(definst);

@@ -157,6 +159,7 @@ {

if (inst) { if (inst == definst) definst = NULL; 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; } + +GHashTable* RrColorHash (const RrInstance *inst) +{ + return (inst ? inst : definst)->color_hash; +}
M render/instance.hrender/instance.h

@@ -26,6 +26,12 @@ gint blue_mask;

gint pseudo_bpc; XColor *pseudo_colors; + + GHashTable *color_hash; }; + +guint RrPseudoBPC (const RrInstance *inst); +XColor* RrPseudoColors (const RrInstance *inst); +GHashTable* RrColorHash (const RrInstance *inst); #endif
M render/render.hrender/render.h

@@ -164,8 +164,6 @@ gint RrBlueShift (const RrInstance *inst);

gint RrRedMask (const RrInstance *inst); gint RrGreenMask (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 *RrColorParse (const RrInstance *inst, gchar *colorname);