/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
gradient.c for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2006 Mikael Magnusson
+ Copyright (c) 2003-2007 Dana Jansens
Copyright (c) 2003 Derek Foreman
This program is free software; you can redistribute it and/or modify
#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);
static void gradient_vertical(RrSurface *sf, gint w, gint h);
static void gradient_horizontal(RrSurface *sf, gint w, gint h);
+static void gradient_mirrorhorizontal(RrSurface *sf, gint w, gint h);
static void gradient_diagonal(RrSurface *sf, gint w, gint h);
static void gradient_crossdiagonal(RrSurface *sf, gint w, gint h);
static void gradient_pyramid(RrSurface *sf, gint inw, gint inh);
gint off, x;
switch (a->surface.grad) {
+ case RR_SURFACE_PARENTREL:
+ gradient_parentrelative(a, w, h);
+ break;
case RR_SURFACE_SOLID:
gradient_solid(a, w, h);
break;
+ case RR_SURFACE_SPLIT_VERTICAL:
+ gradient_splitvertical(a, w, h);
+ break;
case RR_SURFACE_VERTICAL:
gradient_vertical(&a->surface, w, h);
break;
case RR_SURFACE_HORIZONTAL:
gradient_horizontal(&a->surface, w, h);
break;
+ case RR_SURFACE_MIRROR_HORIZONTAL:
+ gradient_mirrorhorizontal(&a->surface, w, h);
+ break;
case RR_SURFACE_DIAGONAL:
gradient_diagonal(&a->surface, w, h);
break;
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;
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;
+ (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);
}
/* 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;
/* 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);
}
+static void gradient_parentrelative(RrAppearance *a, gint w, gint h)
+{
+ RrPixel32 *source, *dest;
+ gint sw, sh, partial_w, partial_h, i;
+
+ g_assert (a->surface.parent);
+ g_assert (a->surface.parent->w);
+
+ sw = a->surface.parent->w;
+ sh = a->surface.parent->h;
+
+ /* This is a little hack. When a texture is parentrelative, and the same
+ area as the parent, and has a bevel, it will draw its bevel on top
+ of the parent's, amplifying it. So instead, rerender the child with
+ the parent's settings, but the child's bevel and interlace */
+ if (a->surface.relief != RR_RELIEF_FLAT &&
+ (a->surface.parent->surface.relief != RR_RELIEF_FLAT ||
+ a->surface.parent->surface.border) &&
+ !a->surface.parentx && !a->surface.parenty &&
+ sw == w && sh == h)
+ {
+ RrSurface old = a->surface;
+ a->surface = a->surface.parent->surface;
+
+ /* turn these off for the parent */
+ a->surface.relief = RR_RELIEF_FLAT;
+ a->surface.border = FALSE;
+
+ a->surface.pixel_data = old.pixel_data;
+
+ RrRender(a, w, h);
+ a->surface = old;
+ } else {
+ 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;
+
+ for (i = 0; i < partial_h; i++, source += sw, dest += w) {
+ memcpy(dest, source, partial_w * sizeof(RrPixel32));
+ }
+ }
+}
+
static void gradient_solid(RrAppearance *l, gint w, gint h)
{
+ gint i;
RrPixel32 pix;
- gint i, a, b;
+ RrPixel32 *data = l->surface.pixel_data;
RrSurface *sp = &l->surface;
gint left = 0, top = 0, right = w - 1, bottom = h - 1;
+ (sp->primary->g << RrDefaultGreenOffset)
+ (sp->primary->b << RrDefaultBlueOffset);
- for (a = 0; a < w; a++)
- for (b = 0; b < h; b++)
- sp->pixel_data[a + b * w] = pix;
+ for (i = 0; i < w * h; i++)
+ *data++ = pix;
+
+ if (sp->interlaced)
+ return;
XFillRectangle(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->primary),
0, 0, w, h);
- if (sp->interlaced) {
- for (i = 0; i < h; i += 2)
- XDrawLine(RrDisplay(l->inst), l->pixmap,
- RrColorGC(sp->interlace_color),
- 0, i, w, i);
- }
-
switch (sp->relief) {
case RR_RELIEF_RAISED:
if (!sp->bevel_dark)
break;
case RR_BEVEL_2:
XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
- left + 1, bottom - 2, right - 2, bottom - 2);
+ left + 2, bottom - 1, right - 2, bottom - 1);
XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
- right - 2, bottom - 2, right - 2, top + 1);
+ right - 1, bottom - 1, right - 1, top + 1);
XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
- left + 1, top + 1, right - 2, top + 1);
+ left + 2, top + 1, right - 2, top + 1);
XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
- left + 1, bottom - 2, left + 1, top + 1);
+ left + 1, bottom - 1, left + 1, top + 1);
break;
default:
g_assert_not_reached(); /* unhandled BevelType */
break;
case RR_BEVEL_2:
XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
- left + 1, bottom - 2, right - 2, bottom - 2);
+ left + 2, bottom - 1, right - 2, bottom - 1);
XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
- right - 2, bottom - 2, right - 2, top + 1);
-
+ right - 1, bottom - 1, right - 1, top + 1);
+
XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
- left + 1, top + 1, right - 2, top + 1);
+ left + 2, top + 1, right - 2, top + 1);
XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
- left + 1, bottom - 2, left + 1, top + 1);
-
+ left + 1, bottom - 1, left + 1, top + 1);
break;
default:
g_assert_not_reached(); /* unhandled BevelType */
} \
}
+static void gradient_splitvertical(RrAppearance *a, gint w, gint h)
+{
+ gint x, y1, y2, y3;
+ RrSurface *sf = &a->surface;
+ RrPixel32 *data = sf->pixel_data;
+ RrPixel32 current;
+ gint y1sz, y2sz, y3sz;
+
+ VARS(y1);
+ VARS(y2);
+ VARS(y3);
+
+ /* if h <= 5, then a 0 or 1px middle gradient.
+ if h > 5, then always a 1px middle gradient.
+ */
+ if (h <= 5) {
+ y1sz = MAX(h/2, 0);
+ y2sz = (h < 3 ? 0 : h % 2);
+ y3sz = MAX(h/2, 1);
+ }
+ else {
+ y1sz = h/2 - (1 - (h % 2));
+ y2sz = 1;
+ y3sz = h/2;
+ }
+
+ SETUP(y1, sf->split_primary, sf->primary, y1sz);
+ if (y2sz) {
+ /* setup to get the colors _in between_ these other 2 */
+ SETUP(y2, sf->primary, sf->secondary, y2sz + 2);
+ NEXT(y2); /* skip the first one, its the same as the last of y1 */
+ }
+ SETUP(y3, sf->secondary, sf->split_secondary, y3sz);
+
+ for (y1 = y1sz; y1 > 0; --y1) {
+ current = COLOR(y1);
+ for (x = w - 1; x >= 0; --x)
+ *(data++) = current;
+
+ NEXT(y1);
+ }
+
+ for (y2 = y2sz; y2 > 0; --y2) {
+ current = COLOR(y2);
+ for (x = w - 1; x >= 0; --x)
+ *(data++) = current;
+
+ NEXT(y2);
+ }
+
+ for (y3 = y3sz; y3 > 0; --y3) {
+ current = COLOR(y3);
+ for (x = w - 1; x >= 0; --x)
+ *(data++) = current;
+
+ NEXT(y3);
+ }
+}
+
static void gradient_horizontal(RrSurface *sf, gint w, gint h)
{
gint x, y;
*(data + y * w) = current;
}
+static void gradient_mirrorhorizontal(RrSurface *sf, gint w, gint h)
+{
+ gint x, y;
+ RrPixel32 *data = sf->pixel_data, *datav;
+ RrPixel32 current;
+
+ VARS(x);
+ SETUP(x, sf->primary, sf->secondary, w/2);
+
+ if (w > 1) {
+ for (x = w - 1; x > w/2-1; --x) { /* 0 -> w-1 */
+ current = COLOR(x);
+ datav = data;
+ for (y = h - 1; y >= 0; --y) { /* 0 -> h */
+ *datav = current;
+ datav += w;
+ }
+ ++data;
+
+ NEXT(x);
+ }
+ SETUP(x, sf->secondary, sf->primary, w/2);
+ for (x = w/2 - 1; x > 0; --x) { /* 0 -> w-1 */
+ current = COLOR(x);
+ datav = data;
+ for (y = h - 1; y >= 0; --y) { /* 0 -> h */
+ *datav = current;
+ datav += w;
+ }
+ ++data;
+
+ NEXT(x);
+ }
+ }
+ current = COLOR(x);
+ for (y = h - 1; y >= 0; --y) /* 0 -> h */
+ *(data + y * w) = current;
+}
+
static void gradient_vertical(RrSurface *sf, gint w, gint h)
{
gint x, y;
projects / chaz / openbox / blobdiff