static void pixel_data_to_pixmap(RrAppearance *l,
gint x, gint y, gint w, gint h);
-void RrPaint(RrAppearance *a, Window win, gint w, gint h)
+Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h)
{
gint i, transferred = 0, sw, sh, partial_w, partial_h;
RrPixel32 *source, *dest;
RrRect tarea; /* area in which to draw textures */
gboolean resized;
- if (w <= 0 || h <= 0) return;
+ if (w <= 0 || h <= 0) return None;
if (a->surface.parentx < 0 || a->surface.parenty < 0) {
/* ob_debug("Invalid parent co-ordinates\n"); */
- return;
+ return None;
}
resized = (a->w != w || a->h != h);
sh = a->surface.parent->h;
if (a->surface.parentx >= sw || a->surface.parenty >= sh) {
- return;
+ return oldp;
}
source = (a->surface.parent->surface.pixel_data +
pixel_data_to_pixmap(a, 0, 0, w, h);
}
+ return oldp;
+}
+
+void RrPaint(RrAppearance *a, Window win, gint w, gint h)
+{
+ Pixmap oldp;
+
+ oldp = RrPaintPixmap(a, w, h);
XSetWindowBackgroundPixmap(RrDisplay(a->inst), win, a->pixmap);
XClearWindow(RrDisplay(a->inst), win);
+ /* free this after changing the visible pixmap */
if (oldp) XFreePixmap(RrDisplay(a->inst), oldp);
}
gint RrFontHeight (const RrFont *f, gint shadow_offset_y);
gint RrFontMaxCharWidth (const RrFont *f);
-void RrPaint (RrAppearance *a, Window win, gint w, gint h);
-void RrMinsize (RrAppearance *a, gint *w, gint *h);
-void RrMargins (RrAppearance *a, gint *l, gint *t, gint *r, gint *b);
+/* Paint into the appearance. The old pixmap is returned (if there was one). It
+ is the responsibility of the caller to call XFreePixmap on the return when
+ it is non-null. */
+Pixmap RrPaintPixmap (RrAppearance *a, gint w, gint h);
+void RrPaint (RrAppearance *a, Window win, gint w, gint h);
+void RrMinsize (RrAppearance *a, gint *w, gint *h);
+void RrMargins (RrAppearance *a, gint *l, gint *t, gint *r, gint *b);
gboolean RrPixmapToRGBA(const RrInstance *inst,
Pixmap pmap, Pixmap mask,