X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=render%2Finstance.c;h=386c87a3e5d7477356607c0b1524d659960cacd6;hb=2b99b62abf3441bc69c7c189da05a709edbb49f3;hp=f4a2441eefe2604a79ca0c744748ba2236ff0818;hpb=4b0e4af80aaec5fed9ad0a369cd570fb3dee4cda;p=chaz%2Fopenbox

diff --git a/render/instance.c b/render/instance.c
index f4a2441e..386c87a3 100644
--- a/render/instance.c
+++ b/render/instance.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    instance.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -44,11 +45,11 @@ dest(gpointer data)
 static void f(gpointer key, gpointer value, gpointer n)
 {
     RrColor *c = value;
-    if (c->id == *(int*)n)
+    if (c->id == *(gint*)n)
         g_message("color %d has %d references", c->id, c->refcount);
 }
 
-void print_refs(int id)
+void print_refs(gint id)
 {
     g_hash_table_foreach(RrColorHash(definst), f, &id);
 }
@@ -89,7 +90,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,
@@ -115,14 +116,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 */
@@ -142,9 +143,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;
@@ -171,7 +172,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;