make the new placement restrictions not affect !normal windows like panels

[chaz/openbox] / render / render.c

diff --git a/render/render.c b/render/render.c
index 1d5b705c57aad901c32b28e7eb80454536931303..1fbfef672b09a83ffbc5533875c625d5a2448543 100644 (file)
--- a/render/render.c
+++ b/render/render.c
@@ -23,7 +23,7 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h)
     int i, transferred = 0, sw;
     RrPixel32 *source, *dest;
     Pixmap oldp;
-    Rect tarea; /* area in which to draw textures */
+    RrRect tarea; /* area in which to draw textures */
     gboolean resized;
 
     if (w <= 0 || h <= 0) return;
@@ -59,7 +59,7 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h)
         for (i = 0; i < h; i++, source += sw, dest += w) {
             memcpy(dest, source, w * sizeof(RrPixel32));
         }
-    }else
+    } else
         RrRender(l, w, h);
 
     RECT_SET(tarea, 0, 0, w, h);
@@ -188,6 +188,8 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig)
 
     spc->interlaced = spo->interlaced;
     spc->border = spo->border;
+    spc->parent = NULL;
+    spc->parentx = spc->parenty = 0;
     spc->RrPixel_data = NULL;
 
     copy->textures = orig->textures;
@@ -232,7 +234,7 @@ 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 = RrEndian;
+    im->byte_order = LSBFirst;
 /* this malloc is a complete waste of time on normal 32bpp
    as reduce_depth just sets im->data = data and returns
 */
@@ -263,13 +265,9 @@ void RrMinsize(RrAppearance *l, gint *w, gint *h)
             break;
         case RR_TEXTURE_TEXT:
             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);
+                                    l->texture[i].data.text.string);
             *w = MAX(*w, m);
-            m = RrFontHeight(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);
             *h += MAX(*h, m);
             break;
         case RR_TEXTURE_RGBA: