From: Dana Jansens <danakj@orodu.net>
Date: Sat, 21 Jun 2003 02:30:14 +0000 (+0000)
Subject: more namespacing with Rr*
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=33ec08ea2253a1692cac221f49dadda339371f66;p=chaz%2Fopenbox

more namespacing with Rr*
---

diff --git a/render/color.c b/render/color.c
index ee4ee30e..564fb7cf 100644
--- a/render/color.c
+++ b/render/color.c
@@ -7,7 +7,7 @@
 XColor *pseudo_colors;
 int pseudo_bpc;
 
-void color_allocate_gc(RrColor *in)
+void RrColorAllocateGC(RrColor *in)
 {
     XGCValues gcv;
 
@@ -66,7 +66,7 @@ void RrColorFree(RrColor *c)
     }
 }
 
-void reduce_depth(const RrInstance *inst, RrPixel32 *data, XImage *im)
+void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
 {
     int r, g, b;
     int x,y;
@@ -113,10 +113,10 @@ void reduce_depth(const RrInstance *inst, RrPixel32 *data, XImage *im)
         g_assert(RrVisual(inst)->class != TrueColor);
         for (y = 0; y < im->height; y++) {
             for (x = 0; x < im->width; x++) {
-                p8[x] = pickColor(inst,
-                                  data[x] >> RrDefaultRedOffset,
-                                  data[x] >> RrDefaultGreenOffset,
-                                  data[x] >> RrDefaultBlueOffset)->pixel;
+                p8[x] = RrPickColor(inst,
+                                    data[x] >> RrDefaultRedOffset,
+                                    data[x] >> RrDefaultGreenOffset,
+                                    data[x] >> RrDefaultBlueOffset)->pixel;
         }
         data += im->width;
         p8 += im->bytes_per_line;
@@ -128,7 +128,7 @@ void reduce_depth(const RrInstance *inst, RrPixel32 *data, XImage *im)
     }
 }
 
-XColor *pickColor(const RrInstance *inst, gint r, gint g, gint b) 
+XColor *RrPickColor(const RrInstance *inst, gint r, gint g, gint b) 
 {
   r = (r & 0xff) >> (8-pseudo_bpc);
   g = (g & 0xff) >> (8-pseudo_bpc);
@@ -174,7 +174,7 @@ static void swap_byte_order(XImage *im)
         im->byte_order = LSBFirst;
 }
 
-void increase_depth(const RrInstance *inst, RrPixel32 *data, XImage *im)
+void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
 {
     int r, g, b;
     int x,y;
diff --git a/render/color.h b/render/color.h
index 8e97eb2a..246af198 100644
--- a/render/color.h
+++ b/render/color.h
@@ -17,9 +17,9 @@ struct _RrColor {
     GC gc;
 };
 
-void color_allocate_gc(RrColor *in);
-XColor *pickColor(const RrInstance *inst, gint r, gint g, gint b);
-void reduce_depth(const RrInstance *inst, RrPixel32 *data, XImage *im);
-void increase_depth(const RrInstance *inst, RrPixel32 *data, XImage *im);
+void RrColorAllocateGC(RrColor *in);
+XColor *RrPickColor(const RrInstance *inst, gint r, gint g, gint b);
+void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im);
+void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im);
 
 #endif /* __color_h */
diff --git a/render/gradient.c b/render/gradient.c
index b4a28fba..c4281133 100644
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -267,7 +267,7 @@ static void create_bevel_colors(RrAppearance *l)
     if (b > 0xFF) b = 0xFF;
     g_assert(!l->surface.bevel_light);
     l->surface.bevel_light = RrColorNew(l->inst, r, g, b);
-    color_allocate_gc(l->surface.bevel_light);
+    RrColorAllocateGC(l->surface.bevel_light);
 
     /* dark color */
     r = l->surface.primary->r;
@@ -278,7 +278,7 @@ static void create_bevel_colors(RrAppearance *l)
     b = (b >> 1) + (b >> 2);
     g_assert(!l->surface.bevel_dark);
     l->surface.bevel_dark = RrColorNew(l->inst, r, g, b);
-    color_allocate_gc(l->surface.bevel_dark);
+    RrColorAllocateGC(l->surface.bevel_dark);
 }
 
 void gradient_solid(RrAppearance *l, int x, int y, int w, int h) 
@@ -289,7 +289,7 @@ void gradient_solid(RrAppearance *l, int x, int y, int w, int h)
     int left = x, top = y, right = x + w - 1, bottom = y + h - 1;
 
     if (sp->primary->gc == None)
-        color_allocate_gc(sp->primary);
+        RrColorAllocateGC(sp->primary);
     pix = (sp->primary->r << RrDefaultRedOffset)
         + (sp->primary->g << RrDefaultGreenOffset)
         + (sp->primary->b << RrDefaultBlueOffset);
@@ -303,7 +303,7 @@ void gradient_solid(RrAppearance *l, int x, int y, int w, int h)
 
     if (sp->interlaced) {
         if (sp->secondary->gc == None)
-            color_allocate_gc(sp->secondary);
+            RrColorAllocateGC(sp->secondary);
         for (i = y; i < h; i += 2)
             XDrawLine(RrDisplay(l->inst), l->pixmap, sp->secondary->gc,
                       x, i, w, i);
@@ -380,7 +380,7 @@ void gradient_solid(RrAppearance *l, int x, int y, int w, int h)
     case RR_RELIEF_FLAT:
         if (sp->border) {
             if (sp->border_color->gc == None)
-                color_allocate_gc(sp->border_color);
+                RrColorAllocateGC(sp->border_color);
             XDrawRectangle(RrDisplay(l->inst), l->pixmap, sp->border_color->gc,
                            left, top, right, bottom);
         }
diff --git a/render/image.c b/render/image.c
index 273879fa..acd11858 100644
--- a/render/image.c
+++ b/render/image.c
@@ -4,7 +4,7 @@
 
 #include <glib.h>
 
-void image_draw(RrPixel32 *target, RrTextureRGBA *rgba, Rect *area)
+void RrImageDraw(RrPixel32 *target, RrTextureRGBA *rgba, Rect *area)
 {
     RrPixel32 *draw = rgba->data;
     gint c, i, e, t, sfw, sfh;
diff --git a/render/render.c b/render/render.c
index acd39b23..5d444703 100644
--- a/render/render.c
+++ b/render/render.c
@@ -113,8 +113,8 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h)
             RrPixmapMaskDraw(l->pixmap, &l->texture[i].data.mask, &tarea);
         break;
         case RR_TEXTURE_RGBA:
-            image_draw(l->surface.RrPixel_data,
-                       &l->texture[i].data.rgba, &tarea);
+            RrImageDraw(l->surface.RrPixel_data,
+                        &l->texture[i].data.rgba, &tarea);
         break;
         }
     }