+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ gradient.c for the Openbox window manager
+ 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
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
#include "render.h"
#include "gradient.h"
#include "color.h"
#include <glib.h>
static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised);
-static void gradient_solid(RrAppearance *l, int w, int h);
-static void gradient_vertical(RrSurface *sf, int w, int h);
-static void gradient_horizontal(RrSurface *sf, int w, int h);
-static void gradient_diagonal(RrSurface *sf, int w, int h);
-static void gradient_crossdiagonal(RrSurface *sf, int w, int h);
-static void gradient_pyramid(RrSurface *sf, int inw, int inh);
-
-void RrRender(RrAppearance *a, int w, int 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);
+
+void RrRender(RrAppearance *a, gint w, gint h)
{
- RrPixel32 *data = a->surface.RrPixel_data;
+ RrPixel32 *data = a->surface.pixel_data;
RrPixel32 current;
- unsigned int r,g,b;
- int off, x;
+ guint r,g,b;
+ gint off, x;
switch (a->surface.grad) {
case RR_SURFACE_SOLID:
gradient_solid(a, w, h);
- return;
+ 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;
gradient_pyramid(&a->surface, w, h);
break;
default:
- g_message("unhandled gradient");
+ g_assert_not_reached(); /* unhandled gradient */
return;
}
+ if (a->surface.interlaced) {
+ gint i;
+ RrPixel32 *p;
+
+ r = a->surface.interlace_color->r;
+ g = a->surface.interlace_color->g;
+ b = a->surface.interlace_color->b;
+ current = (r << RrDefaultRedOffset)
+ + (g << RrDefaultGreenOffset)
+ + (b << RrDefaultBlueOffset);
+ p = data;
+ for (i = 0; i < h; i += 2, p += w)
+ for (x = 0; x < w; ++x, ++p)
+ *p = current;
+ }
+
if (a->surface.relief == RR_RELIEF_FLAT && a->surface.border) {
r = a->surface.border_color->r;
g = a->surface.border_color->g;
static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised)
{
- int r, g, b;
+ gint r, g, b;
RrPixel32 *up, *down;
if (raised) {
static void create_bevel_colors(RrAppearance *l)
{
- int r, g, b;
+ gint r, g, b;
/* light color */
r = l->surface.primary->r;
if (b > 0xFF) b = 0xFF;
g_assert(!l->surface.bevel_light);
l->surface.bevel_light = RrColorNew(l->inst, r, g, b);
- RrColorAllocateGC(l->surface.bevel_light);
/* dark color */
r = l->surface.primary->r;
b = (b >> 1) + (b >> 2);
g_assert(!l->surface.bevel_dark);
l->surface.bevel_dark = RrColorNew(l->inst, r, g, b);
- RrColorAllocateGC(l->surface.bevel_dark);
}
-static void gradient_solid(RrAppearance *l, int w, int h)
+static void gradient_solid(RrAppearance *l, gint w, gint h)
{
+ gint i;
RrPixel32 pix;
- int i, a, b;
+ RrPixel32 *data = l->surface.pixel_data;
RrSurface *sp = &l->surface;
- int left = 0, top = 0, right = w - 1, bottom = h - 1;
+ gint left = 0, top = 0, right = w - 1, bottom = h - 1;
- if (sp->primary->gc == None)
- RrColorAllocateGC(sp->primary);
pix = (sp->primary->r << RrDefaultRedOffset)
+ (sp->primary->g << RrDefaultGreenOffset)
+ (sp->primary->b << RrDefaultBlueOffset);
- for (a = 0; a < w; a++)
- for (b = 0; b < h; b++)
- sp->RrPixel_data[a + b * w] = pix;
+ for (i = 0; i < w * h; i++)
+ *data++ = pix;
- XFillRectangle(RrDisplay(l->inst), l->pixmap, sp->primary->gc,
- 0, 0, w, h);
+ if (sp->interlaced)
+ return;
- if (sp->interlaced) {
- if (sp->secondary->gc == None)
- RrColorAllocateGC(sp->secondary);
- for (i = 0; i < h; i += 2)
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->secondary->gc,
- 0, i, w, i);
- }
+ XFillRectangle(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->primary),
+ 0, 0, w, h);
switch (sp->relief) {
case RR_RELIEF_RAISED:
switch (sp->bevel) {
case RR_BEVEL_1:
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
left, bottom, right, bottom);
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
right, bottom, right, top);
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
left, top, right, top);
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
left, bottom, left, top);
break;
case RR_BEVEL_2:
- XDrawLine(RrDisplay(l->inst), l->pixmap,
- sp->bevel_dark->gc,
- left + 1, bottom - 2, right - 2, bottom - 2);
- XDrawLine(RrDisplay(l->inst), l->pixmap,
- sp->bevel_dark->gc,
- right - 2, bottom - 2, right - 2, top + 1);
-
- XDrawLine(RrDisplay(l->inst), l->pixmap,
- sp->bevel_light->gc,
- left + 1, top + 1, right - 2, top + 1);
- XDrawLine(RrDisplay(l->inst), l->pixmap,
- sp->bevel_light->gc,
- left + 1, bottom - 2, left + 1, top + 1);
+ XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
+ left + 2, bottom - 1, right - 2, bottom - 1);
+ XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
+ right - 1, bottom - 1, right - 1, top + 1);
+
+ XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
+ left + 2, top + 1, right - 2, top + 1);
+ XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
+ left + 1, bottom - 1, left + 1, top + 1);
break;
default:
g_assert_not_reached(); /* unhandled BevelType */
switch (sp->bevel) {
case RR_BEVEL_1:
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
left, bottom, right, bottom);
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
right, bottom, right, top);
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
left, top, right, top);
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
left, bottom, left, top);
break;
case RR_BEVEL_2:
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
- left + 1, bottom - 2, right - 2, bottom - 2);
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
- right - 2, bottom - 2, right - 2, top + 1);
-
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
- left + 1, top + 1, right - 2, top + 1);
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
- left + 1, bottom - 2, left + 1, top + 1);
-
+ XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
+ left + 2, bottom - 1, right - 2, bottom - 1);
+ XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
+ right - 1, bottom - 1, right - 1, top + 1);
+
+ XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
+ left + 2, top + 1, right - 2, top + 1);
+ XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
+ left + 1, bottom - 1, left + 1, top + 1);
break;
default:
g_assert_not_reached(); /* unhandled BevelType */
break;
case RR_RELIEF_FLAT:
if (sp->border) {
- if (sp->border_color->gc == None)
- RrColorAllocateGC(sp->border_color);
- XDrawRectangle(RrDisplay(l->inst), l->pixmap, sp->border_color->gc,
+ XDrawRectangle(RrDisplay(l->inst), l->pixmap,
+ RrColorGC(sp->border_color),
left, top, right, bottom);
}
break;
/* * * * * * * * * * * * * * GRADIENT MAGIC WOOT * * * * * * * * * * * * * * */
#define VARS(x) \
- unsigned int color##x[3]; \
- int len##x, cdelta##x[3], error##x[3] = { 0, 0, 0 }, inc##x[3]; \
+ guint color##x[3]; \
+ gint len##x, cdelta##x[3], error##x[3] = { 0, 0, 0 }, inc##x[3]; \
gboolean bigslope##x[3] /* color slope > 1 */
#define SETUP(x, from, to, w) \
(color##x[1] << RrDefaultGreenOffset) + \
(color##x[2] << RrDefaultBlueOffset))
+#define INCREMENT(x, i) \
+ (inc##x[i])
+
#define NEXT(x) \
{ \
- int i; \
+ gint i; \
for (i = 2; i >= 0; --i) { \
if (!cdelta##x[i]) continue; \
\
/* Y (color) is dependant on X */ \
error##x[i] += cdelta##x[i]; \
if ((error##x[i] << 1) >= len##x) { \
- color##x[i] += inc##x[i]; \
+ color##x[i] += INCREMENT(x, i); \
error##x[i] -= len##x; \
} \
} else { \
/* X is dependant on Y (color) */ \
while (1) { \
- color##x[i] += inc##x[i]; \
+ color##x[i] += INCREMENT(x, i); \
error##x[i] += len##x; \
if ((error##x[i] << 1) >= cdelta##x[i]) { \
error##x[i] -= cdelta##x[i]; \
} \
}
-static void gradient_horizontal(RrSurface *sf, int w, int h)
+static void gradient_splitvertical(RrAppearance *a, gint w, gint h)
{
- int x, y;
- RrPixel32 *data = sf->RrPixel_data;
+ gint x, y1, y3, r, g, b;
+ RrSurface *sf = &a->surface;
+ RrPixel32 *data = sf->pixel_data;
+ RrPixel32 current;
+ RrColor *primary_light, *secondary_light;
+
+ VARS(y1);
+ VARS(y3);
+
+ r = sf->primary->r;
+ r += r >> 2;
+ g = sf->primary->g;
+ g += g >> 2;
+ b = sf->primary->b;
+ b += b >> 2;
+ if (r > 0xFF) r = 0xFF;
+ if (g > 0xFF) g = 0xFF;
+ if (b > 0xFF) b = 0xFF;
+ primary_light = RrColorNew(a->inst, r, g, b);
+
+ r = sf->secondary->r;
+ r += r >> 4;
+ g = sf->secondary->g;
+ g += g >> 4;
+ b = sf->secondary->b;
+ b += b >> 4;
+ if (r > 0xFF) r = 0xFF;
+ if (g > 0xFF) g = 0xFF;
+ if (b > 0xFF) b = 0xFF;
+ secondary_light = RrColorNew(a->inst, r, g, b);
+
+ SETUP(y1, primary_light, sf->primary, (h / 2) -1);
+ SETUP(y3, sf->secondary, secondary_light, (h / 2) -1);
+
+ for (y1 = h - 1; y1 > (h / 2) -1; --y1) { /* 0 -> h-1 */
+ current = COLOR(y1);
+ for (x = w - 1; x >= 0; --x) /* 0 -> w */
+ *(data++) = current;
+
+ NEXT(y1);
+ }
+
+
+ for (y3 = (h / 2) - 1; y3 > 0; --y3) {
+ current = COLOR(y3);
+ for (x = w - 1; x >= 0; --x)
+ *(data++) = current;
+
+ NEXT(y3);
+ }
+
+ current = COLOR(y3);
+ for (x = w - 1; x >= 0; --x) /* 0 -> w */
+ *(data++) = current;
+
+ RrColorFree(primary_light);
+ RrColorFree(secondary_light);
+}
+
+static void gradient_horizontal(RrSurface *sf, gint w, gint h)
+{
+ gint x, y;
+ RrPixel32 *data = sf->pixel_data, *datav;
RrPixel32 current;
VARS(x);
for (x = w - 1; x > 0; --x) { /* 0 -> w-1 */
current = COLOR(x);
- for (y = h - 1; y >= 0; --y) /* 0 -> h */
- *(data + y * w) = current;
+ datav = data;
+ for (y = h - 1; y >= 0; --y) { /* 0 -> h */
+ *datav = current;
+ datav += w;
+ }
++data;
NEXT(x);
*(data + y * w) = current;
}
-static void gradient_vertical(RrSurface *sf, int w, int h)
+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)
{
- int x, y;
- RrPixel32 *data = sf->RrPixel_data;
+ gint x, y;
+ RrPixel32 *data = sf->pixel_data;
RrPixel32 current;
VARS(y);
}
-static void gradient_diagonal(RrSurface *sf, int w, int h)
+static void gradient_diagonal(RrSurface *sf, gint w, gint h)
{
- int x, y;
- RrPixel32 *data = sf->RrPixel_data;
+ gint x, y;
+ RrPixel32 *data = sf->pixel_data;
RrColor left, right;
RrColor extracorner;
*data = COLOR(x);
}
-static void gradient_crossdiagonal(RrSurface *sf, int w, int h)
+static void gradient_crossdiagonal(RrSurface *sf, gint w, gint h)
{
- int x, y;
- RrPixel32 *data = sf->RrPixel_data;
+ gint x, y;
+ RrPixel32 *data = sf->pixel_data;
RrColor left, right;
RrColor extracorner;
*data = COLOR(x);
}
-static void gradient_pyramid(RrSurface *sf, int inw, int inh)
+static void gradient_pyramid(RrSurface *sf, gint inw, gint inh)
{
- int x, y, w = (inw >> 1) + 1, h = (inh >> 1) + 1;
- RrPixel32 *data = sf->RrPixel_data;
+ gint x, y, w = (inw >> 1) + 1, h = (inh >> 1) + 1;
+ RrPixel32 *data = sf->pixel_data;
RrPixel32 *end = data + inw*inh - 1;
RrPixel32 current;
RrColor left, right;
NEXT(x);
}
+ current = COLOR(x);
*(data+x) = current;
*(data+inw-x) = current;
*(end-x) = current;
projects / chaz / openbox / blobdiff