Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h)
{
- gint i, transferred = 0, sw, sh, partial_w, partial_h;
- RrPixel32 *source, *dest;
- Pixmap oldp;
+ gint i, transferred = 0, force_transfer = 0;
+ Pixmap oldp = None;
RrRect tarea; /* area in which to draw textures */
gboolean resized;
RrVisual(a->inst), RrColormap(a->inst));
g_assert(a->xftdraw != NULL);
- g_free(a->surface.pixel_data);
- a->surface.pixel_data = g_new(RrPixel32, w * h);
-
- if (a->surface.grad == RR_SURFACE_PARENTREL) {
- g_assert (a->surface.parent);
- g_assert (a->surface.parent->w);
-
- sw = a->surface.parent->w;
- sh = a->surface.parent->h;
-
- source = (a->surface.parent->surface.pixel_data +
- a->surface.parentx + sw * a->surface.parenty);
- dest = a->surface.pixel_data;
-
- if (a->surface.parentx + w > sw) {
- partial_w = sw - a->surface.parentx;
- } else partial_w = w;
-
- if (a->surface.parenty + h > sh) {
- partial_h = sh - a->surface.parenty;
- } else partial_h = h;
+ if (resized) {
+ g_free(a->surface.pixel_data);
+ a->surface.pixel_data = g_new(RrPixel32, w * h);
+ }
- for (i = 0; i < partial_h; i++, source += sw, dest += w) {
- memcpy(dest, source, partial_w * sizeof(RrPixel32));
- }
- } else
- RrRender(a, w, h);
+ RrRender(a, w, h);
{
gint l, t, r, b;
RrMargins(a, &l, &t, &r, &b);
- RECT_SET(tarea, l, t, w - l - r, h - t - b);
- }
+ RECT_SET(tarea, l, t, w - l - r, h - t - b);
+ }
for (i = 0; i < a->textures; i++) {
switch (a->texture[i].type) {
pixel_data_to_pixmap(a, 0, 0, w, h);
}
if (a->xftdraw == NULL) {
- a->xftdraw = XftDrawCreate(RrDisplay(a->inst), a->pixmap,
+ a->xftdraw = XftDrawCreate(RrDisplay(a->inst), a->pixmap,
RrVisual(a->inst),
RrColormap(a->inst));
}
&a->texture[i].data.rgba,
a->w, a->h,
&tarea);
+ force_transfer = 1;
break;
}
}
if (!transferred) {
transferred = 1;
- if ((a->surface.grad != RR_SURFACE_SOLID) || (a->surface.interlaced))
+ if ((a->surface.grad != RR_SURFACE_SOLID) || (a->surface.interlaced) ||
+ force_transfer)
+ {
pixel_data_to_pixmap(a, 0, 0, w, h);
+ }
}
return oldp;
out = g_new0(RrAppearance, 1);
out->inst = inst;
out->textures = numtex;
+ out->surface.bevel_light_adjust = 128;
+ out->surface.bevel_dark_adjust = 64;
if (numtex) out->texture = g_new0(RrTexture, numtex);
return out;
}
+void RrAppearanceRemoveTextures(RrAppearance *a)
+{
+ g_free(a->texture);
+ a->textures = 0;
+}
+
+void RrAppearanceAddTextures(RrAppearance *a, gint numtex)
+{
+ g_assert(a->textures == 0);
+
+ a->textures = numtex;
+ if (numtex) a->texture = g_new0(RrTexture, numtex);
+}
+
RrAppearance *RrAppearanceCopy(RrAppearance *orig)
{
RrSurface *spo, *spc;
if (spo->primary != NULL)
spc->primary = RrColorNew(copy->inst,
spo->primary->r,
- spo->primary->g,
+ spo->primary->g,
spo->primary->b);
else spc->primary = NULL;
spo->bevel_light->b);
else spc->bevel_light = NULL;
+ if (spo->split_primary != NULL)
+ spc->split_primary = RrColorNew(copy->inst,
+ spo->split_primary->r,
+ spo->split_primary->g,
+ spo->split_primary->b);
+ else spc->split_primary = NULL;
+
+ if (spo->split_secondary != NULL)
+ spc->split_secondary = RrColorNew(copy->inst,
+ spo->split_secondary->r,
+ spo->split_secondary->g,
+ spo->split_secondary->b);
+ else spc->split_secondary = NULL;
+
spc->interlaced = spo->interlaced;
+ spc->bevel_light_adjust = spo->bevel_light_adjust;
+ spc->bevel_dark_adjust = spo->bevel_dark_adjust;
spc->border = spo->border;
spc->parent = NULL;
spc->parentx = spc->parenty = 0;
RrColorFree(p->interlace_color);
RrColorFree(p->bevel_dark);
RrColorFree(p->bevel_light);
+ RrColorFree(p->split_primary);
+ RrColorFree(p->split_secondary);
g_free(p->pixel_data);
p->pixel_data = NULL;
g_free(a);
gint l, t, r, b;
gint w = 0;
+ RrMargins(a, &l, &t, &r, &b);
+
for (i = 0; i < a->textures; ++i) {
switch (a->texture[i].type) {
case RR_TEXTURE_NONE:
break;
case RR_TEXTURE_TEXT:
m = RrFontMeasureString(a->texture[i].data.text.font,
- a->texture[i].data.text.string,
+ a->texture[i].data.text.string,
a->texture[i].data.text.shadow_offset_x,
- a->texture[i].data.text.shadow_offset_y);
+ a->texture[i].data.text.shadow_offset_y,
+ a->texture[i].data.text.flow,
+ a->texture[i].data.text.maxwidth);
w = MAX(w, m->width);
g_free(m);
break;
w += MAX(w, a->texture[i].data.rgba.width);
break;
case RR_TEXTURE_LINE_ART:
- w += MAX(w, MAX(a->texture[i].data.lineart.x1,
- a->texture[i].data.lineart.x2));
+ w = MAX(w, MAX(a->texture[i].data.lineart.x1 - l - r,
+ a->texture[i].data.lineart.x2 - l - r));
break;
}
}
- RrMargins(a, &l, &t, &r, &b);
-
w += l + r;
if (w < 1) w = 1;
{
gint i;
gint l, t, r, b;
+ RrSize *m;
gint h = 0;
+ RrMargins(a, &l, &t, &r, &b);
+
for (i = 0; i < a->textures; ++i) {
switch (a->texture[i].type) {
case RR_TEXTURE_NONE:
h = MAX(h, a->texture[i].data.mask.mask->height);
break;
case RR_TEXTURE_TEXT:
- h += MAX(h, RrFontHeight(a->texture[i].data.text.font,
- a->texture[i].data.text.shadow_offset_y));
+ if (a->texture[i].data.text.flow) {
+ g_assert(a->texture[i].data.text.string != NULL);
+
+ m = RrFontMeasureString
+ (a->texture[i].data.text.font,
+ a->texture[i].data.text.string,
+ a->texture[i].data.text.shadow_offset_x,
+ a->texture[i].data.text.shadow_offset_y,
+ a->texture[i].data.text.flow,
+ a->texture[i].data.text.maxwidth);
+ h += MAX(h, m->height);
+ g_free(m);
+ }
+ else
+ h += MAX(h,
+ RrFontHeight
+ (a->texture[i].data.text.font,
+ a->texture[i].data.text.shadow_offset_y));
break;
case RR_TEXTURE_RGBA:
h += MAX(h, a->texture[i].data.rgba.height);
break;
case RR_TEXTURE_LINE_ART:
- h += MAX(h, MAX(a->texture[i].data.lineart.y1,
- a->texture[i].data.lineart.y2));
+ h = MAX(h, MAX(a->texture[i].data.lineart.y1 - t - b,
+ a->texture[i].data.lineart.y2 - t - b));
break;
}
}
- RrMargins(a, &l, &t, &r, &b);
-
h += t + b;
if (h < 1) h = 1;
projects / mikachu / openbox.git / blobdiff