X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.c;h=962d3ec999d47b28b82575e22244fe5a886a7d70;hb=7744067b6b50124c31f647e2943ef1fce9fdec96;hp=b2c25ccf036eddb26130652b17cc7908778fa7a4;hpb=e8c19d0c99930e9bc495c0bf0cbe5d94e6d8dd0f;p=chaz%2Fopenbox

diff --git a/render/render.c b/render/render.c
index b2c25ccf..962d3ec9 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    render.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
    Copyright (c) 2003        Derek Foreman
 
@@ -113,7 +114,8 @@ void RrPaint(RrAppearance *a, Window win, gint w, gint h)
         case RR_TEXTURE_TEXT:
             if (!transferred) {
                 transferred = 1;
-                if ((a->surface.grad != RR_SURFACE_SOLID) || (a->surface.interlaced))
+                if ((a->surface.grad != RR_SURFACE_SOLID)
+                    || (a->surface.interlaced))
                     pixel_data_to_pixmap(a, 0, 0, w, h);
             }
             if (a->xftdraw == NULL) {
@@ -126,7 +128,8 @@ void RrPaint(RrAppearance *a, Window win, gint w, gint h)
         case RR_TEXTURE_LINE_ART:
             if (!transferred) {
                 transferred = 1;
-                if ((a->surface.grad != RR_SURFACE_SOLID) || (a->surface.interlaced))
+                if ((a->surface.grad != RR_SURFACE_SOLID)
+                    || (a->surface.interlaced))
                     pixel_data_to_pixmap(a, 0, 0, w, h);
             }
             XDrawLine(RrDisplay(a->inst), a->pixmap,
@@ -139,7 +142,8 @@ void RrPaint(RrAppearance *a, Window win, gint w, gint h)
         case RR_TEXTURE_MASK:
             if (!transferred) {
                 transferred = 1;
-                if ((a->surface.grad != RR_SURFACE_SOLID) || (a->surface.interlaced))
+                if ((a->surface.grad != RR_SURFACE_SOLID)
+                    || (a->surface.interlaced))
                     pixel_data_to_pixmap(a, 0, 0, w, h);
             }
             RrPixmapMaskDraw(a->pixmap, &a->texture[i].data.mask, &tarea);
@@ -344,9 +348,11 @@ void RrMinsize(RrAppearance *a, gint *w, gint *h)
             break;
         case RR_TEXTURE_TEXT:
             m = RrFontMeasureString(a->texture[i].data.text.font,
-                                    a->texture[i].data.text.string);
+                                    a->texture[i].data.text.string, 
+                                    a->texture[i].data.text.shadow_offset);
             *w = MAX(*w, m->width + 4);
-            m->height = RrFontHeight(a->texture[i].data.text.font);
+            m->height = RrFontHeight(a->texture[i].data.text.font,
+                                     a->texture[i].data.text.shadow_offset);
             *h += MAX(*h, m->height);
             g_free(m);
             break;
@@ -375,7 +381,7 @@ void RrMinsize(RrAppearance *a, gint *w, gint *h)
 static void reverse_bits(gchar *c, gint n)
 {
     gint i;
-    for (i = 0; i < n; i++, *c++)
+    for (i = 0; i < n; i++, c++)
         *c = (((*c * 0x0802UL & 0x22110UL) |
                (*c * 0x8020UL & 0x88440UL)) * 0x10101UL) >> 16;
 }