X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Finstance.c;h=91f9db77934ff309d8f8ef05ea67041b21b68d21;hb=8bcd349e4e7078e663d3092a6ad6c7aff8eb05a0;hp=76c09a36d7158250f1c00d97282d901ad58fa4e8;hpb=f8c81e8ca4ffb8421f823e40178f4ddafd868c68;p=chaz%2Fopenbox

diff --git a/render/instance.c b/render/instance.c
index 76c09a36..91f9db77 100644
--- a/render/instance.c
+++ b/render/instance.c
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    instance.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,12 +34,31 @@ dest(gpointer data)
 #ifdef DEBUG
     RrColor *c = data;
     if (c->refcount > 0)
-        g_error("removing color from hash table with references");
+        g_error("color %d (%d,%d,%d) in hash table with %d "
+                "leftover references",
+                c->id, RrColorRed(c), RrColorGreen(c), RrColorBlue(c),
+                c->refcount);
 #endif
 }
 
+#if 0
+static void f(gpointer key, gpointer value, gpointer n)
+{
+    RrColor *c = value;
+    if (c->id == *(gint*)n)
+        g_message("color %d has %d references", c->id, c->refcount);
+}
+
+void print_refs(gint id)
+{
+    g_hash_table_foreach(RrColorHash(definst), f, &id);
+}
+#endif
+
 RrInstance* RrInstanceNew (Display *display, gint screen)
 {
+    g_type_init(); /* supposedly needed for pango but seems to work without */
+
     definst = g_new (RrInstance, 1);
     definst->display = display;
     definst->screen = screen;
@@ -46,6 +66,7 @@ RrInstance* RrInstanceNew (Display *display, gint screen)
     definst->depth = DefaultDepth(display, screen);
     definst->visual = DefaultVisual(display, screen);
     definst->colormap = DefaultColormap(display, screen);
+    definst->pango = pango_xft_get_context(display, screen);
 
     definst->pseudo_colors = NULL;
 
@@ -72,7 +93,7 @@ RrInstance* RrInstanceNew (Display *display, gint screen)
 
 void RrTrueColorSetup (RrInstance *inst)
 {
-  unsigned long red_mask, green_mask, blue_mask;
+  gulong red_mask, green_mask, blue_mask;
   XImage *timage = NULL;
 
   timage = XCreateImage(inst->display, inst->visual, inst->depth,
@@ -98,14 +119,14 @@ void RrTrueColorSetup (RrInstance *inst)
   XFree(timage);
 }
 
-#define RrPseudoNcolors(isnt) (1 << (inst->pseudo_bpc * 3))
+#define RrPseudoNcolors(inst) (1 << (inst->pseudo_bpc * 3))
 
 void RrPseudoColorSetup (RrInstance *inst)
 {
     XColor icolors[256];
-    int tr, tg, tb, n, r, g, b, i, incolors, ii;
-    unsigned long dev;
-    int cpc, _ncolors;
+    gint tr, tg, tb, n, r, g, b, i, incolors, ii;
+    gulong dev;
+    gint cpc, _ncolors;
 
     /* determine the number of colors and the bits-per-color */
     inst->pseudo_bpc = 2; /* XXX THIS SHOULD BE A USER OPTION */
@@ -113,7 +134,7 @@ void RrPseudoColorSetup (RrInstance *inst)
     _ncolors = RrPseudoNcolors(inst);
 
     if (_ncolors > 1 << inst->depth) {
-        g_warning("PseudoRenderControl: Invalid colormap size. Resizing.\n");
+        g_message("Invalid colormap size. Resizing.");
         inst->pseudo_bpc = 1 << (inst->depth/3) >> 3;
         _ncolors = 1 << (inst->pseudo_bpc * 3);
     }
@@ -125,9 +146,9 @@ void RrPseudoColorSetup (RrInstance *inst)
     for (n = 0, r = 0; r < cpc; r++)
         for (g = 0; g < cpc; g++)
             for (b = 0; b < cpc; b++, n++) {
-                tr = (int)(((float)(r)/(float)(cpc-1)) * 0xFF);
-                tg = (int)(((float)(g)/(float)(cpc-1)) * 0xFF);
-                tb = (int)(((float)(b)/(float)(cpc-1)) * 0xFF);
+                tr = (gint)(((gfloat)(r)/(gfloat)(cpc-1)) * 0xFF);
+                tg = (gint)(((gfloat)(g)/(gfloat)(cpc-1)) * 0xFF);
+                tb = (gint)(((gfloat)(b)/(gfloat)(cpc-1)) * 0xFF);
                 inst->pseudo_colors[n].red = tr | tr << 8;
                 inst->pseudo_colors[n].green = tg | tg << 8;
                 inst->pseudo_colors[n].blue = tb | tb << 8;
@@ -154,7 +175,7 @@ void RrPseudoColorSetup (RrInstance *inst)
     /* try match unallocated ones */
     for (i = 0; i < _ncolors; i++) {
         if (!inst->pseudo_colors[i].flags) { /* if it wasn't allocated... */
-            unsigned long closest = 0xffffffff, close = 0;
+            gulong closest = 0xffffffff, close = 0;
             for (ii = 0; ii < incolors; ii++) {
                 /* find deviations */
                 r = (inst->pseudo_colors[i].red - icolors[ii].red) & 0xff;
@@ -192,6 +213,8 @@ void RrInstanceFree (RrInstance *inst)
         if (inst == definst) definst = NULL;
         g_free(inst->pseudo_colors);
         g_hash_table_destroy(inst->color_hash);
+        g_object_unref(inst->pango);
+        g_free(inst);
     }
 }