X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Frender.c;h=dea04cf4bdfe94c6921481d0da549f3beaea266c;hb=768c3cd4a9fba291e49f4706829d2021d0952aa8;hp=82c9e26fe9b39bb382c9bb460c83710b0b2211f6;hpb=092616de9a809a1c9a646901521ffcc1f337e913;p=chaz%2Fopenbox

diff --git a/render/render.c b/render/render.c
index 82c9e26f..dea04cf4 100644
--- a/render/render.c
+++ b/render/render.c
@@ -100,7 +100,7 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h)
                                            RrVisual(l->inst),
                                            RrColormap(l->inst));
             }
-            font_draw(l->xftdraw, &l->texture[i].data.text, &tarea);
+            RrFontDraw(l->xftdraw, &l->texture[i].data.text, &tarea);
         break;
         case RR_TEXTURE_MASK:
             if (!transferred) {
@@ -109,12 +109,12 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h)
                     RrPixel32_to_pixmap(l, 0, 0, w, h);
             }
             if (l->texture[i].data.mask.color->gc == None)
-                color_allocate_gc(l->texture[i].data.mask.color);
+                RrColorAllocateGC(l->texture[i].data.mask.color);
             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;
         }
     }
@@ -236,13 +236,13 @@ static void RrPixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h)
     in = l->surface.RrPixel_data;
     out = l->pixmap;
 
-    im->byte_order = render_endian;
+    im->byte_order = RrEndian;
 /* this malloc is a complete waste of time on normal 32bpp
    as reduce_depth just sets im->data = data and returns
 */
     scratch = g_new(RrPixel32, im->width * im->height);
     im->data = (char*) scratch;
-    reduce_depth(l->inst, in, im);
+    RrReduceDepth(l->inst, in, im);
     XPutImage(RrDisplay(l->inst), out,
               DefaultGC(RrDisplay(l->inst), RrScreen(l->inst)),
               im, 0, 0, x, y, w, h);
@@ -266,14 +266,14 @@ void RrMinsize(RrAppearance *l, gint *w, gint *h)
             *h = MAX(*h, l->texture[i].data.mask.mask->height);
             break;
         case RR_TEXTURE_TEXT:
-            m = font_measure_string(l->texture[i].data.text.font,
+            m = RrFontMeasureString(l->texture[i].data.text.font,
                                     l->texture[i].data.text.string,
                                     l->texture[i].data.text.shadow,
                                     l->texture[i].data.text.offset);
             *w = MAX(*w, m);
-            m = font_height(l->texture[i].data.text.font,
-                            l->texture[i].data.text.shadow,
-                            l->texture[i].data.text.offset);
+            m = RrFontHeight(l->texture[i].data.text.font,
+                             l->texture[i].data.text.shadow,
+                             l->texture[i].data.text.offset);
             *h += MAX(*h, m);
             break;
         case RR_TEXTURE_RGBA:
@@ -336,7 +336,7 @@ gboolean RrPixmapToRGBA(const RrInstance *inst,
     }
 
     *data = g_new(RrPixel32, pw * ph);
-    increase_depth(inst, *data, xi);
+    RrIncreaseDepth(inst, *data, xi);
 
     if (mask) {
         /* apply transparency from the mask */
@@ -344,7 +344,7 @@ gboolean RrPixmapToRGBA(const RrInstance *inst,
         for (i = 0, y = 0; y < ph; ++y) {
             for (x = 0; x < pw; ++x, ++i) {
                 if (!((((unsigned)xm->data[di + x / 8]) >> (x % 8)) & 0x1))
-                    (*data)[i] &= ~(0xff << default_alpha_offset);
+                    (*data)[i] &= ~(0xff << RrDefaultAlphaOffset);
             }
             di += xm->bytes_per_line;
         }