moved paint's arguments into the appearance struct

[chaz/openbox] / render / render.c

diff --git a/render/render.c b/render/render.c
index f446a75d0e18b0efb7ee3fc7f2ba75d6b1c1ab17..9d4a2c67eabe0c151070ccf6c0e2f023417bd80e 100644 (file)
--- a/render/render.c
+++ b/render/render.c
@@ -87,10 +87,15 @@ void truecolor_startup(void)
   XFree(timage);
 }
 
-void x_paint(Window win, Appearance *l, int x, int y, int w, int h)
+void x_paint(Window win, Appearance *l)
 {
-    int i, transferred = 0;
+    int i, transferred = 0, sw, sh;
+    pixel32 *source;
     Pixmap oldp;
+    int x = l->area.x;
+    int y = l->area.y;
+    int w = l->area.width;
+    int h = l->area.height;
 
     if (w <= 0 || h <= 0 || x+w <= 0 || y+h <= 0) return;
 
@@ -111,7 +116,9 @@ void x_paint(Window win, Appearance *l, int x, int y, int w, int h)
 
 
     if (l->surface.data.planar.grad == Background_ParentRelative) {
-        memset(l->surface.data.planar.pixel_data, 0, w*h*4);
+        sw = l->surface.data.planar.parent->area.width;
+        source = l->surface.data.planar.pixel_data;
+/*        for (i = */
     }
     else if (l->surface.data.planar.grad == Background_Solid)
         gradient_solid(l, x, y, w, h);