nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make bevel strengths theme-selectable

Browse source
This commit is contained in:
Dana Jansens 2007-06-10 21:38:29 +00:00
parent 03d1c08dfe
commit 89b7311d8d
4 changed files with 35 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
render/gradient.c
View file

@ -23,7 +23,7 @@
#include "color.h"
#include <glib.h>
static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised);
static void highlight(RrSurface *s, RrPixel32 *x, RrPixel32 *y, gboolean raised);
static void gradient_parentrelative(RrAppearance *a, gint w, gint h);
static void gradient_solid(RrAppearance *l, gint w, gint h);
static void gradient_splitvertical(RrAppearance *a, gint w, gint h);
@ -110,29 +110,29 @@ void RrRender(RrAppearance *a, gint w, gint h)
if (a->surface.relief != RR_RELIEF_FLAT) {
if (a->surface.bevel == RR_BEVEL_1) {
for (off = 1, x = 1; x < w - 1; ++x, off++)
highlight(data + off,
highlight(&a->surface, data + off,
data + off + (h-1) * w,
a->surface.relief==RR_RELIEF_RAISED);
for (off = 0, x = 0; x < h; ++x, off++)
highlight(data + off * w,
highlight(&a->surface, data + off * w,
data + off * w + w - 1,
a->surface.relief==RR_RELIEF_RAISED);
}
if (a->surface.bevel == RR_BEVEL_2) {
for (off = 2, x = 2; x < w - 2; ++x, off++)
highlight(data + off + w,
highlight(&a->surface, data + off + w,
data + off + (h-2) * w,
a->surface.relief==RR_RELIEF_RAISED);
for (off = 1, x = 1; x < h-1; ++x, off++)
highlight(data + off * w + 1,
highlight(&a->surface, data + off * w + 1,
data + off * w + w - 2,
a->surface.relief==RR_RELIEF_RAISED);
}
}
}
static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised)
static void highlight(RrSurface *s, RrPixel32 *x, RrPixel32 *y, gboolean raised)
{
gint r, g, b;
@ -144,12 +144,13 @@ static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised)
up = y;
down = x;
}
r = (*up >> RrDefaultRedOffset) & 0xFF;
r += r >> 1;
r += (r * s->bevel_light_adjust) >> 8;
g = (*up >> RrDefaultGreenOffset) & 0xFF;
g += g >> 1;
g += (g * s->bevel_light_adjust) >> 8;
b = (*up >> RrDefaultBlueOffset) & 0xFF;
b += b >> 1;
b += (b * s->bevel_light_adjust) >> 8;
if (r > 0xFF) r = 0xFF;
if (g > 0xFF) g = 0xFF;
if (b > 0xFF) b = 0xFF;
@ -157,11 +158,11 @@ static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised)
+ (b << RrDefaultBlueOffset);
r = (*down >> RrDefaultRedOffset) & 0xFF;
r = (r >> 1) + (r >> 2);
r -= (r * s->bevel_dark_adjust) >> 8;
g = (*down >> RrDefaultGreenOffset) & 0xFF;
g = (g >> 1) + (g >> 2);
g -= (g * s->bevel_dark_adjust) >> 8;
b = (*down >> RrDefaultBlueOffset) & 0xFF;
b = (b >> 1) + (b >> 2);
b -= (b * s->bevel_dark_adjust) >> 8;
*down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset)
+ (b << RrDefaultBlueOffset);
}
@ -172,11 +173,11 @@ static void create_bevel_colors(RrAppearance *l)
/* light color */
r = l->surface.primary->r;
r += r >> 1;
r += (r * l->surface.bevel_light_adjust) >> 8;
g = l->surface.primary->g;
g += g >> 1;
g += (g * l->surface.bevel_light_adjust) >> 8;
b = l->surface.primary->b;
b += b >> 1;
b += (b * l->surface.bevel_light_adjust) >> 8;
if (r > 0xFF) r = 0xFF;
if (g > 0xFF) g = 0xFF;
if (b > 0xFF) b = 0xFF;
@ -185,11 +186,11 @@ static void create_bevel_colors(RrAppearance *l)
/* dark color */
r = l->surface.primary->r;
r = (r >> 1) + (r >> 2);
r -= (r * l->surface.bevel_dark_adjust) >> 8;
g = l->surface.primary->g;
g = (g >> 1) + (g >> 2);
g -= (g * l->surface.bevel_dark_adjust) >> 8;
b = l->surface.primary->b;
b = (b >> 1) + (b >> 2);
b -= (b * l->surface.bevel_dark_adjust) >> 8;
g_assert(!l->surface.bevel_dark);
l->surface.bevel_dark = RrColorNew(l->inst, r, g, b);
}

4
render/render.c
View file

@ -171,6 +171,8 @@ RrAppearance *RrAppearanceNew(const RrInstance *inst, gint numtex)
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;
@ -240,6 +242,8 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig)
else spc->bevel_light = 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;

2
render/render.h
View file

@ -117,6 +117,8 @@ struct _RrSurface {
RrColor *bevel_dark;
RrColor *bevel_light;
RrColor *interlace_color;
gint bevel_dark_adjust; /* 0-255, default is 64 */
gint bevel_light_adjust; /* 0-255, default is 128 */
gboolean interlaced;
gboolean border;
RrAppearance *parent;

11
render/theme.c
View file

@ -1760,14 +1760,17 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
{
gboolean ret = FALSE;
gchar *rclass = create_class_name(rname);
gchar *cname, *ctoname, *bcname, *icname;
gchar *cname, *ctoname, *bcname, *icname, *hname, *sname;
gchar *rettype;
XrmValue retvalue;
gint i;
cname = g_strconcat(rname, ".color", NULL);
ctoname = g_strconcat(rname, ".colorTo", NULL);
bcname = g_strconcat(rname, ".border.color", NULL);
icname = g_strconcat(rname, ".interlace.color", NULL);
hname = g_strconcat(rname, ".highlight", NULL);
sname = g_strconcat(rname, ".shadow", NULL);
if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
retvalue.addr != NULL) {
@ -1790,9 +1793,15 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
if (!read_color(db, inst, icname,
&value->surface.interlace_color))
value->surface.interlace_color = RrColorNew(inst, 0, 0, 0);
if (read_int(db, hname, &i) && i >= 0 && i <= 255)
value->surface.bevel_light_adjust = i;
if (read_int(db, sname, &i) && i >= 0 && i <= 255)
value->surface.bevel_dark_adjust = i;
ret = TRUE;
}
g_free(sname);
g_free(hname);
g_free(icname);
g_free(bcname);
g_free(ctoname);