+/* -*- 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) 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"
return;
}
+ if (a->surface.interlaced) {
+ int 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;
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)
RrSurface *sp = &l->surface;
int 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 (b = 0; b < h; b++)
sp->pixel_data[a + b * w] = pix;
- XFillRectangle(RrDisplay(l->inst), l->pixmap, sp->primary->gc,
+ XFillRectangle(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->primary),
0, 0, w, h);
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,
+ XDrawLine(RrDisplay(l->inst), l->pixmap,
+ RrColorGC(sp->interlace_color),
0, i, w, i);
}
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,
+ XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
left + 1, bottom - 2, right - 2, bottom - 2);
- XDrawLine(RrDisplay(l->inst), l->pixmap,
- sp->bevel_dark->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
right - 2, bottom - 2, right - 2, top + 1);
- XDrawLine(RrDisplay(l->inst), l->pixmap,
- sp->bevel_light->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
left + 1, top + 1, right - 2, top + 1);
- XDrawLine(RrDisplay(l->inst), l->pixmap,
- sp->bevel_light->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
left + 1, bottom - 2, left + 1, top + 1);
break;
default:
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,
+ XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
left + 1, bottom - 2, right - 2, bottom - 2);
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
right - 2, bottom - 2, right - 2, top + 1);
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
left + 1, top + 1, right - 2, top + 1);
- XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+ XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
left + 1, bottom - 2, left + 1, top + 1);
break;
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;
projects / chaz / openbox / blobdiff