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

move the dekstop file to data/

Browse source
This commit is contained in:
Dana Jansens 2003-08-01 15:00:22 +00:00
parent c05ad7a36a
commit 3a26c8aa8e
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
openbox/openbox.desktop → data/openbox.desktop
View file

14
render/gradient.c
View file

@ -13,7 +13,7 @@ static void gradient_pyramid(RrSurface *sf, int inw, int inh);
void RrRender(RrAppearance *a, int w, int h) void RrRender(RrAppearance *a, int w, int h)
{ {
RrPixel32 *data = a->surface.RrPixel_data; RrPixel32 *data = a->surface.pixel_data;
RrPixel32 current; RrPixel32 current;
unsigned int r,g,b; unsigned int r,g,b;
int off, x; int off, x;
@ -163,7 +163,7 @@ static void gradient_solid(RrAppearance *l, int w, int h)
for (a = 0; a < w; a++) for (a = 0; a < w; a++)
for (b = 0; b < h; b++) for (b = 0; b < h; b++)
sp->RrPixel_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, sp->primary->gc,
0, 0, w, h); 0, 0, w, h);
@ -334,7 +334,7 @@ static void gradient_solid(RrAppearance *l, int w, int h)
static void gradient_horizontal(RrSurface *sf, int w, int h) static void gradient_horizontal(RrSurface *sf, int w, int h)
{ {
int x, y; int x, y;
RrPixel32 *data = sf->RrPixel_data, *datav; RrPixel32 *data = sf->pixel_data, *datav;
RrPixel32 current; RrPixel32 current;
VARS(x); VARS(x);
@ -359,7 +359,7 @@ static void gradient_horizontal(RrSurface *sf, int w, int h)
static void gradient_vertical(RrSurface *sf, int w, int h) static void gradient_vertical(RrSurface *sf, int w, int h)
{ {
int x, y; int x, y;
RrPixel32 *data = sf->RrPixel_data; RrPixel32 *data = sf->pixel_data;
RrPixel32 current; RrPixel32 current;
VARS(y); VARS(y);
@ -381,7 +381,7 @@ static void gradient_vertical(RrSurface *sf, int w, int h)
static void gradient_diagonal(RrSurface *sf, int w, int h) static void gradient_diagonal(RrSurface *sf, int w, int h)
{ {
int x, y; int x, y;
RrPixel32 *data = sf->RrPixel_data; RrPixel32 *data = sf->pixel_data;
RrColor left, right; RrColor left, right;
RrColor extracorner; RrColor extracorner;
@ -428,7 +428,7 @@ static void gradient_diagonal(RrSurface *sf, int w, int h)
static void gradient_crossdiagonal(RrSurface *sf, int w, int h) static void gradient_crossdiagonal(RrSurface *sf, int w, int h)
{ {
int x, y; int x, y;
RrPixel32 *data = sf->RrPixel_data; RrPixel32 *data = sf->pixel_data;
RrColor left, right; RrColor left, right;
RrColor extracorner; RrColor extracorner;
@ -475,7 +475,7 @@ static void gradient_crossdiagonal(RrSurface *sf, int w, int h)
static void gradient_pyramid(RrSurface *sf, int inw, int inh) static void gradient_pyramid(RrSurface *sf, int inw, int inh)
{ {
int x, y, w = (inw >> 1) + 1, h = (inh >> 1) + 1; int x, y, w = (inw >> 1) + 1, h = (inh >> 1) + 1;
RrPixel32 *data = sf->RrPixel_data; RrPixel32 *data = sf->pixel_data;
RrPixel32 *end = data + inw*inh - 1; RrPixel32 *end = data + inw*inh - 1;
RrPixel32 current; RrPixel32 current;
RrColor left, right; RrColor left, right;

16
render/render.c
View file

@ -45,17 +45,17 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h)
RrVisual(l->inst), RrColormap(l->inst)); RrVisual(l->inst), RrColormap(l->inst));
g_assert(l->xftdraw != NULL); g_assert(l->xftdraw != NULL);
g_free(l->surface.RrPixel_data); g_free(l->surface.pixel_data);
l->surface.RrPixel_data = g_new(RrPixel32, w * h); l->surface.pixel_data = g_new(RrPixel32, w * h);
if (l->surface.grad == RR_SURFACE_PARENTREL) { if (l->surface.grad == RR_SURFACE_PARENTREL) {
g_assert (l->surface.parent); g_assert (l->surface.parent);
g_assert (l->surface.parent->w); g_assert (l->surface.parent->w);
sw = l->surface.parent->w; sw = l->surface.parent->w;
source = (l->surface.parent->surface.RrPixel_data + source = (l->surface.parent->surface.pixel_data +
l->surface.parentx + sw * l->surface.parenty); l->surface.parentx + sw * l->surface.parenty);
dest = l->surface.RrPixel_data; dest = l->surface.pixel_data;
for (i = 0; i < h; i++, source += sw, dest += w) { for (i = 0; i < h; i++, source += sw, dest += w) {
memcpy(dest, source, w * sizeof(RrPixel32)); memcpy(dest, source, w * sizeof(RrPixel32));
} }
@ -109,7 +109,7 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h)
RrPixmapMaskDraw(l->pixmap, &l->texture[i].data.mask, &tarea); RrPixmapMaskDraw(l->pixmap, &l->texture[i].data.mask, &tarea);
break; break;
case RR_TEXTURE_RGBA: case RR_TEXTURE_RGBA:
RrImageDraw(l->surface.RrPixel_data, RrImageDraw(l->surface.pixel_data,
&l->texture[i].data.rgba, &tarea); &l->texture[i].data.rgba, &tarea);
break; break;
} }
@ -190,7 +190,7 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig)
spc->border = spo->border; spc->border = spo->border;
spc->parent = NULL; spc->parent = NULL;
spc->parentx = spc->parenty = 0; spc->parentx = spc->parenty = 0;
spc->RrPixel_data = NULL; spc->pixel_data = NULL;
copy->textures = orig->textures; copy->textures = orig->textures;
copy->texture = g_memdup(orig->texture, copy->texture = g_memdup(orig->texture,
@ -215,7 +215,7 @@ void RrAppearanceFree(RrAppearance *a)
RrColorFree(p->border_color); RrColorFree(p->border_color);
RrColorFree(p->bevel_dark); RrColorFree(p->bevel_dark);
RrColorFree(p->bevel_light); RrColorFree(p->bevel_light);
g_free(p->RrPixel_data); g_free(p->pixel_data);
g_free(a); g_free(a);
} }
@ -231,7 +231,7 @@ static void RrPixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h)
ZPixmap, 0, NULL, w, h, 32, 0); ZPixmap, 0, NULL, w, h, 32, 0);
g_assert(im != NULL); g_assert(im != NULL);
in = l->surface.RrPixel_data; in = l->surface.pixel_data;
out = l->pixmap; out = l->pixmap;
im->byte_order = LSBFirst; im->byte_order = LSBFirst;

2
render/render.h
View file

@ -70,7 +70,7 @@ struct _RrSurface {
RrAppearance *parent; RrAppearance *parent;
gint parentx; gint parentx;
gint parenty; gint parenty;
RrPixel32 *RrPixel_data; RrPixel32 *pixel_data;
}; };
struct _RrTextureText { struct _RrTextureText {