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

use RrColorGC

Browse source
This commit is contained in:
Dana Jansens 2003-08-31 17:02:10 +00:00
parent f90167d8b5
commit 6e86a42c4b
2 changed files with 25 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
render/gradient.c
View file

@ -134,7 +134,6 @@ static void create_bevel_colors(RrAppearance *l)
if (b > 0xFF) b = 0xFF; if (b > 0xFF) b = 0xFF;
g_assert(!l->surface.bevel_light); g_assert(!l->surface.bevel_light);
l->surface.bevel_light = RrColorNew(l->inst, r, g, b); l->surface.bevel_light = RrColorNew(l->inst, r, g, b);
RrColorAllocateGC(l->surface.bevel_light);
/* dark color */ /* dark color */
r = l->surface.primary->r; r = l->surface.primary->r;
@ -145,7 +144,6 @@ static void create_bevel_colors(RrAppearance *l)
b = (b >> 1) + (b >> 2); b = (b >> 1) + (b >> 2);
g_assert(!l->surface.bevel_dark); g_assert(!l->surface.bevel_dark);
l->surface.bevel_dark = RrColorNew(l->inst, r, g, b); 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, int w, int h)
@ -155,8 +153,6 @@ static void gradient_solid(RrAppearance *l, int w, int h)
RrSurface *sp = &l->surface; RrSurface *sp = &l->surface;
int left = 0, top = 0, right = w - 1, bottom = h - 1; int left = 0, top = 0, right = w - 1, bottom = h - 1;
if (sp->primary->gc == None)
RrColorAllocateGC(sp->primary);
pix = (sp->primary->r << RrDefaultRedOffset) pix = (sp->primary->r << RrDefaultRedOffset)
+ (sp->primary->g << RrDefaultGreenOffset) + (sp->primary->g << RrDefaultGreenOffset)
+ (sp->primary->b << RrDefaultBlueOffset); + (sp->primary->b << RrDefaultBlueOffset);
@ -165,14 +161,12 @@ static void gradient_solid(RrAppearance *l, int w, int h)
for (b = 0; b < h; b++) for (b = 0; b < h; b++)
sp->pixel_data[a + b * w] = pix; 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); 0, 0, w, h);
if (sp->interlaced) { if (sp->interlaced) {
if (sp->secondary->gc == None)
RrColorAllocateGC(sp->secondary);
for (i = 0; i < h; i += 2) for (i = 0; i < h; i += 2)
XDrawLine(RrDisplay(l->inst), l->pixmap, sp->secondary->gc, XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->secondary),
0, i, w, i); 0, i, w, i);
} }
@ -183,29 +177,25 @@ static void gradient_solid(RrAppearance *l, int w, int h)
switch (sp->bevel) { switch (sp->bevel) {
case RR_BEVEL_1: 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); 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); 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); 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); left, bottom, left, top);
break; break;
case RR_BEVEL_2: case RR_BEVEL_2:
XDrawLine(RrDisplay(l->inst), l->pixmap, XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
sp->bevel_dark->gc,
left + 1, bottom - 2, right - 2, bottom - 2); left + 1, bottom - 2, right - 2, bottom - 2);
XDrawLine(RrDisplay(l->inst), l->pixmap, XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
sp->bevel_dark->gc,
right - 2, bottom - 2, right - 2, top + 1); right - 2, bottom - 2, right - 2, top + 1);
XDrawLine(RrDisplay(l->inst), l->pixmap, XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
sp->bevel_light->gc,
left + 1, top + 1, right - 2, top + 1); left + 1, top + 1, right - 2, top + 1);
XDrawLine(RrDisplay(l->inst), l->pixmap, XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
sp->bevel_light->gc,
left + 1, bottom - 2, left + 1, top + 1); left + 1, bottom - 2, left + 1, top + 1);
break; break;
default: default:
@ -218,25 +208,25 @@ static void gradient_solid(RrAppearance *l, int w, int h)
switch (sp->bevel) { switch (sp->bevel) {
case RR_BEVEL_1: 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); 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); 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); 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); left, bottom, left, top);
break; break;
case RR_BEVEL_2: 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); 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); 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); 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); left + 1, bottom - 2, left + 1, top + 1);
break; break;
@ -246,9 +236,8 @@ static void gradient_solid(RrAppearance *l, int w, int h)
break; break;
case RR_RELIEF_FLAT: case RR_RELIEF_FLAT:
if (sp->border) { if (sp->border) {
if (sp->border_color->gc == None) XDrawRectangle(RrDisplay(l->inst), l->pixmap,
RrColorAllocateGC(sp->border_color); RrColorGC(sp->border_color),
XDrawRectangle(RrDisplay(l->inst), l->pixmap, sp->border_color->gc,
left, top, right, bottom); left, top, right, bottom);
} }
break; break;

10
render/mask.c
View file

@ -37,16 +37,16 @@ void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const RrRect *area)
if (x < 0) x = 0; if (x < 0) x = 0;
if (y < 0) y = 0; if (y < 0) y = 0;
XSetClipMask(RrDisplay(m->mask->inst), m->color->gc, m->mask->mask); XSetClipMask(RrDisplay(m->mask->inst), RrColorGC(m->color), m->mask->mask);
XSetClipOrigin(RrDisplay(m->mask->inst), m->color->gc, x, y); XSetClipOrigin(RrDisplay(m->mask->inst), RrColorGC(m->color), x, y);
/* fill in the clipped region */ /* fill in the clipped region */
XFillRectangle(RrDisplay(m->mask->inst), p, m->color->gc, x, y, XFillRectangle(RrDisplay(m->mask->inst), p, RrColorGC(m->color), x, y,
x + m->mask->width, y + m->mask->height); x + m->mask->width, y + m->mask->height);
/* unset the clip region */ /* unset the clip region */
XSetClipMask(RrDisplay(m->mask->inst), m->color->gc, None); XSetClipMask(RrDisplay(m->mask->inst), RrColorGC(m->color), None);
XSetClipOrigin(RrDisplay(m->mask->inst), m->color->gc, 0, 0); XSetClipOrigin(RrDisplay(m->mask->inst), RrColorGC(m->color), 0, 0);
} }
RrPixmapMask *RrPixmapMaskCopy(const RrPixmapMask *src) RrPixmapMask *RrPixmapMaskCopy(const RrPixmapMask *src)