#include "mask.h"
#include "color.h"
#include "image.h"
-#include "../kernel/openbox.h"
+#include "kernel/openbox.h"
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
int render_depth;
Visual *render_visual;
int y = l->area.y;
int w = l->area.width;
int h = l->area.height;
+ Rect tarea; /* area in which to draw textures */
if (w <= 0 || h <= 0 || x+w <= 0 || y+h <= 0) return;
else gradient_render(&l->surface, w, h);
for (i = 0; i < l->textures; i++) {
+ tarea = l->texture[i].position;
+ if (l->surface.data.planar.relief != Flat) {
+ switch (l->surface.data.planar.bevel) {
+ case Bevel1:
+ tarea.x += 1; tarea.y += 1;
+ tarea.width -= 2; tarea.height -= 2;
+ break;
+ case Bevel2:
+ tarea.x += 2; tarea.y += 2;
+ tarea.width -= 4; tarea.height -= 4;
+ break;
+ }
+ } else if (l->surface.data.planar.border) {
+ tarea.x += 1; tarea.y += 1;
+ tarea.width -= 2; tarea.height -= 2;
+ }
+
switch (l->texture[i].type) {
case Text:
if (!transferred) {
render_visual, render_colormap);
}
font_draw(l->xftdraw, &l->texture[i].data.text,
- &l->texture[i].position);
+ &tarea);
break;
case Bitmask:
if (!transferred) {
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,
- &l->texture[i].position);
+ &tarea);
break;
case RGBA:
image_draw(l->surface.data.planar.pixel_data,
&l->texture[i].data.rgba,
- &l->texture[i].position);
+ &tarea);
break;
}
}
void appearance_free(Appearance *a)
{
- PlanarSurface *p;
- if (a->pixmap != None) XFreePixmap(ob_display, a->pixmap);
- if (a->xftdraw != NULL) XftDrawDestroy(a->xftdraw);
- if (a->textures)
- g_free(a->texture);
- if (a->surface.type == Surface_Planar) {
- p = &a->surface.data.planar;
- if (p->primary != NULL) color_free(p->primary);
- if (p->secondary != NULL) color_free(p->secondary);
- if (p->border_color != NULL) color_free(p->border_color);
- if (p->pixel_data != NULL) g_free(p->pixel_data);
+ if (a) {
+ PlanarSurface *p;
+ if (a->pixmap != None) XFreePixmap(ob_display, a->pixmap);
+ if (a->xftdraw != NULL) XftDrawDestroy(a->xftdraw);
+ if (a->textures)
+ g_free(a->texture);
+ if (a->surface.type == Surface_Planar) {
+ p = &a->surface.data.planar;
+ if (p->primary != NULL) color_free(p->primary);
+ if (p->secondary != NULL) color_free(p->secondary);
+ if (p->border_color != NULL) color_free(p->border_color);
+ if (p->pixel_data != NULL) g_free(p->pixel_data);
+ }
+ g_free(a);
}
- g_free(a);
}
void pixel32_to_pixmap(pixel32 *in, Pixmap out, int x, int y, int w, int h)
{
+ unsigned char *scratch;
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);
+/* this malloc is a complete waste of time on normal 32bpp
+ as reduce_depth just sets im->data = data and returns
+*/
+ scratch = malloc(im->width * im->height * sizeof(pixel32));
+ im->data = (char*) scratch;
+ reduce_depth(in, im);
XPutImage(ob_display, out, DefaultGC(ob_display, ob_screen),
im, 0, 0, x, y, w, h);
im->data = NULL;
XDestroyImage(im);
+ free(scratch);
+}
+
+void appearance_minsize(Appearance *l, Size *s)
+{
+ int i;
+ SIZE_SET(*s, 0, 0);
+
+ switch (l->surface.type) {
+ case Surface_Planar:
+ if (l->surface.data.planar.relief != Flat) {
+ switch (l->surface.data.planar.bevel) {
+ case Bevel1:
+ SIZE_SET(*s, 2, 2);
+ break;
+ case Bevel2:
+ SIZE_SET(*s, 4, 4);
+ break;
+ }
+ } else if (l->surface.data.planar.border)
+ SIZE_SET(*s, 2, 2);
+
+ for (i = 0; i < l->textures; ++i)
+ switch (l->texture[i].type) {
+ case Bitmask:
+ s->width += l->texture[i].data.mask.mask->w;
+ s->height += l->texture[i].data.mask.mask->h;
+ break;
+ case Text:
+ s->width +=font_measure_string(l->texture[i].data.text.font,
+ l->texture[i].data.text.string,
+ l->texture[i].data.text.shadow,
+ l->texture[i].data.text.offset);
+ s->height += font_height(l->texture[i].data.text.font,
+ l->texture[i].data.text.shadow,
+ l->texture[i].data.text.offset);
+ break;
+ case RGBA:
+ s->width += l->texture[i].data.rgba.width;
+ s->height += l->texture[i].data.rgba.height;
+ break;
+ case NoTexture:
+ break;
+ }
+ break;
+ }
}