#include "font.h"
#include "mask.h"
#include "color.h"
+#include "image.h"
#include "../kernel/openbox.h"
int render_depth;
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;
- XImage *im = NULL;
+ 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) return;
+ if (w <= 0 || h <= 0 || x+w <= 0 || y+h <= 0) return;
g_assert(l->surface.type == Surface_Planar);
render_colormap);
g_assert(l->xftdraw != NULL);
- if (l->surface.data.planar.pixel_data != NULL)
- g_free(l->surface.data.planar.pixel_data);
+ g_free(l->surface.data.planar.pixel_data);
l->surface.data.planar.pixel_data = g_new(pixel32, w * h);
- if (l->surface.data.planar.grad == Background_Solid)
- gradient_solid(l, x, y, w, h);
- else gradient_render(&l->surface, w, h);
-/*this is not the right place for this code, it's only here so
- text rendering shows up for now.
-*/
- if (l->surface.data.planar.grad != Background_Solid) {
- im = XCreateImage(ob_display, render_visual, render_depth,
- ZPixmap, 0, NULL, w, h, 32, 0);
- g_assert(im != NULL);
- im->byte_order = endian;
- im->data = (char *)l->surface.data.planar.pixel_data;
- reduce_depth((pixel32*)im->data, im);
- XPutImage(ob_display, l->pixmap, DefaultGC(ob_display, ob_screen),
- im, 0, 0, x, y, w, h);
- im->data = NULL;
- XDestroyImage(im);
+ if (l->surface.data.planar.grad == Background_ParentRelative) {
+ 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);
+ else gradient_render(&l->surface, w, h);
for (i = 0; i < l->textures; i++) {
switch (l->texture[i].type) {
case Text:
+ if (!transferred) {
+ transferred = 1;
+ if (l->surface.data.planar.grad != Background_Solid)
+ pixel32_to_pixmap(l->surface.data.planar.pixel_data,
+ l->pixmap,x,y,w,h);
+ }
if (l->xftdraw == NULL) {
l->xftdraw = XftDrawCreate(ob_display, l->pixmap,
render_visual, render_colormap);
}
- font_draw(l->xftdraw, &l->texture[i].data.text, x, y, w, h);
+ font_draw(l->xftdraw, &l->texture[i].data.text,
+ &l->texture[i].position);
break;
case Bitmask:
+ if (!transferred) {
+ transferred = 1;
+ if (l->surface.data.planar.grad != Background_Solid)
+ pixel32_to_pixmap(l->surface.data.planar.pixel_data,
+ l->pixmap,x,y,w,h);
+ }
if (l->texture[i].data.mask.color->gc == None)
color_allocate_gc(l->texture[i].data.mask.color);
- mask_draw(l->pixmap, &l->texture[i].data.mask, w, h);
+ mask_draw(l->pixmap, &l->texture[i].data.mask,
+ &l->texture[i].position);
+ break;
+ case RGBA:
+ image_draw(l->surface.data.planar.pixel_data,
+ &l->texture[i].data.rgba,
+ &l->texture[i].position);
break;
}
}
+
+ if (!transferred) {
+ transferred = 1;
+ if (l->surface.data.planar.grad != Background_Solid)
+ pixel32_to_pixmap(l->surface.data.planar.pixel_data, l->pixmap
+ ,x,y,w,h);
+ }
+
+
XSetWindowBackgroundPixmap(ob_display, win, l->pixmap);
XClearWindow(ob_display, win);
if (oldp != None) XFreePixmap(ob_display, oldp);
out->surface.type = type;
out->textures = numtex;
out->xftdraw = NULL;
- if (numtex) out->texture = g_new(Texture, numtex);
+ if (numtex) out->texture = g_new0(Texture, numtex);
else out->texture = NULL;
out->pixmap = None;
}
g_free(a);
}
+
+
+void pixel32_to_pixmap(pixel32 *in, Pixmap out, int x, int y, int w, int h)
+{
+ XImage *im = NULL;
+ im = XCreateImage(ob_display, render_visual, render_depth,
+ ZPixmap, 0, NULL, w, h, 32, 0);
+ g_assert(im != NULL);
+ im->byte_order = endian;
+ im->data = (char *)in;
+ reduce_depth((pixel32*)im->data, im);
+ XPutImage(ob_display, out, DefaultGC(ob_display, ob_screen),
+ im, 0, 0, x, y, w, h);
+ im->data = NULL;
+ XDestroyImage(im);
+}