solids should now work with offsets

diff --git a/render/gradient.c b/render/gradient.c
index 4302cfa0c3bce2bdbf0ba4d7d17f37874a4f299a..97dbc7036636e596a086d6d0297887ec85a567ed 100644 (file)
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -230,23 +230,23 @@ void highlight(pixel32 *x, pixel32 *y, gboolean raised)
         + (b << default_blue_shift);
 }
 
-void gradient_solid(Appearance *l, int w, int h) 
+void gradient_solid(Appearance *l, int x, int y, int w, int h) 
 {
   int i;
   PlanarSurface *sp = &l->surface.data.planar;
-  int left = 0, top = 0, right = w - 1, bottom = h - 1;
+  int left = x, top = y, right = w - 1, bottom = h - 1;
 
   if (sp->primary->gc == None)
     color_allocate_gc(sp->primary);
   XFillRectangle(ob_display, l->pixmap, sp->primary->gc
-                 , 0, 0, w, h);
+                 , x, y, w, h);
 
   if (l->surface.data.planar.interlaced) {
     if (sp->secondary->gc == None)
       color_allocate_gc(sp->secondary);
-    for (i = 0; i < h; i += 2)
+    for (i = y; i < h; i += 2)
       XDrawLine(ob_display, l->pixmap, sp->secondary->gc,
-                0, i, w, i);
+                x, i, w, i);
   }
 /*
   switch (texture.relief()) {

diff --git a/render/gradient.h b/render/gradient.h
index 626278f52af18e726c0c509151db3ef8d210af7c..8c4e90f3d42892ff54f0baa3a76d5fb62e416b0f 100644 (file)
--- a/render/gradient.h
+++ b/render/gradient.h
@@ -8,7 +8,7 @@ void gradient_vertical(Surface *sf, int w, int h);
 void gradient_horizontal(Surface *sf, int w, int h);
 void gradient_diagonal(Surface *sf, int w, int h);
 void gradient_crossdiagonal(Surface *sf, int w, int h);
-void gradient_solid(Appearance *l, int w, int h); /* needs access to pixmap */
+void gradient_solid(Appearance *l, int x, int y, int w, int h);
 void highlight(pixel32 *x, pixel32 *y, gboolean raised);
 
 #endif /* __gradient_h */

diff --git a/render/render.c b/render/render.c
index 12b373ce70e7b0ad57efd36549559104526d19b1..481ef098c2059800a2ecdce44d374ff8f173ebce 100644 (file)
--- a/render/render.c
+++ b/render/render.c
@@ -80,7 +80,7 @@ void x_paint(Window win, Appearance *l, int x, int y, int w, int h)
     l->surface.data.planar.pixel_data = g_new(pixel32, w * h);
 
     if (l->surface.data.planar.grad == Background_Solid)
-        gradient_solid(l, w, h);
+        gradient_solid(l, x, y, w, h);
     else gradient_render(&l->surface, w, h);
 
 /*reduce depth here...