M render/color.c → render/color.c

@@ -50,6 +50,8 @@ }
     return NULL;
 }
 
+//XXX same color could be pointed to twice, this might have to be a refcount
+
 void color_free(color_rgb *c)
 {
     if (c->gc != None)

M render/render.c → render/render.c

@@ -54,7 +54,7 @@ XFree(vinfo_return);
     }  
 }
 
-void x_paint(Window win, Appearance *l, int w, int h)
+void x_paint(Window win, Appearance *l, int x, int y, int w, int h)
 {
     int i;
     XImage *im;

M render/render.h → render/render.h

@@ -71,10 +71,6 @@ RGBA
 } TextureType;
 
 typedef struct PlanarSurface {
-    int x;
-    int y;
-    int width;
-    int height;
     SurfaceColorType grad;
     ReliefType relief;
     BevelType bevel;
@@ -158,7 +154,7 @@ extern Visual *render_visual;
 extern int render_depth;
 extern Colormap render_colormap;
 
-void (*paint)(Window win, Appearance *l, int w, int h);
+void (*paint)(Window win, Appearance *l, int x, int y, int w, int h);
 
 void render_startup(void);
 void init_appearance(Appearance *l);