From 58be655de321369ceec5819a3516003a05ead575 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 10 Jul 2003 04:31:34 +0000 Subject: [PATCH] remove rependancy on geom.h from the kernel, provide what is used in its own geom.h --- render/color.c | 20 ++++++++++++++++++++ render/font.c | 7 ++----- render/font.h | 4 ++-- render/geom.h | 19 +++++++++++++++++++ render/image.c | 4 ++-- render/image.h | 4 ++-- render/mask.c | 2 +- render/mask.h | 4 ++-- render/render.c | 2 +- render/render.h | 5 +++++ 10 files changed, 56 insertions(+), 15 deletions(-) create mode 100644 render/geom.h diff --git a/render/color.c b/render/color.c index 46f81161..dfdd092c 100644 --- a/render/color.c +++ b/render/color.c @@ -242,3 +242,23 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) g_message("this image bit depth is currently unhandled\n"); } } + +int RrColorRed(const RrColor *c) +{ + return c->r; +} + +int RrColorGreen(const RrColor *c) +{ + return c->g; +} + +int RrColorBlue(const RrColor *c) +{ + return c->b; +} + +gulong RrColorPixel(const RrColor *c) +{ + return c->pixel; +} diff --git a/render/font.c b/render/font.c index 67e19ec2..d2a4acae 100644 --- a/render/font.c +++ b/render/font.c @@ -2,14 +2,11 @@ #include "color.h" #include "mask.h" #include "theme.h" -#include "kernel/geom.h" -#include "kernel/gettext.h" -#define _(str) gettext(str) +#include "gettext.h" #include #include #include -#include #define ELIPSES "..." #define ELIPSES_LENGTH(font) \ @@ -149,7 +146,7 @@ int RrFontMaxCharWidth(const RrFont *f) return (signed) f->xftfont->max_advance_width; } -void RrFontDraw(XftDraw *d, RrTextureText *t, Rect *area) +void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) { gint x,y,w,h; XftColor c; diff --git a/render/font.h b/render/font.h index 85aa9f3e..6a6f1909 100644 --- a/render/font.h +++ b/render/font.h @@ -3,7 +3,7 @@ #define _XFT_NO_COMPAT_ /* no Xft 1 API */ #include #include "render.h" -#include "kernel/geom.h" +#include "geom.h" struct _RrFont { const RrInstance *inst; @@ -16,5 +16,5 @@ struct _RrFont { RrFont *RrFontOpen(const RrInstance *inst, char *fontstring); void RrFontClose(RrFont *f); -void RrFontDraw(XftDraw *d, RrTextureText *t, Rect *position); +void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *position); #endif /* __font_h */ diff --git a/render/geom.h b/render/geom.h new file mode 100644 index 00000000..f6fa4f24 --- /dev/null +++ b/render/geom.h @@ -0,0 +1,19 @@ +#ifndef __geom_h +#define __geom_h + +typedef struct { + int width; + int height; +} RrSize; + +typedef struct { + int x; + int y; + int width; + int height; +} RrRect; + +#define RECT_SET(r, nx, ny, w, h) \ + (r).x = (nx), (r).y = (ny), (r).width = (w), (r).height = (h) + +#endif diff --git a/render/image.c b/render/image.c index acd11858..2ec71043 100644 --- a/render/image.c +++ b/render/image.c @@ -1,10 +1,10 @@ -#include "kernel/geom.h" +#include "geom.h" #include "image.h" #include "color.h" #include -void RrImageDraw(RrPixel32 *target, RrTextureRGBA *rgba, Rect *area) +void RrImageDraw(RrPixel32 *target, RrTextureRGBA *rgba, RrRect *area) { RrPixel32 *draw = rgba->data; gint c, i, e, t, sfw, sfh; diff --git a/render/image.h b/render/image.h index 9404e5fa..5bf6ea55 100644 --- a/render/image.h +++ b/render/image.h @@ -2,8 +2,8 @@ #define __image_h #include "render.h" -#include "../kernel/geom.h" +#include "geom.h" -void RrImageDraw(RrPixel32 *target, RrTextureRGBA *rgba, Rect *area); +void RrImageDraw(RrPixel32 *target, RrTextureRGBA *rgba, RrRect *area); #endif diff --git a/render/mask.c b/render/mask.c index 8b0f21c0..60e89d48 100644 --- a/render/mask.c +++ b/render/mask.c @@ -25,7 +25,7 @@ void RrPixmapMaskFree(RrPixmapMask *m) } } -void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const Rect *area) +void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const RrRect *area) { int x, y; if (m->mask == None) return; /* no mask given */ diff --git a/render/mask.h b/render/mask.h index b18baffc..dccb5a46 100644 --- a/render/mask.h +++ b/render/mask.h @@ -2,12 +2,12 @@ #define __mask_h #include "render.h" -#include "kernel/geom.h" +#include "geom.h" RrPixmapMask *RrPixmapMaskNew(const RrInstance *inst, gint w, gint h, const gchar *data); void RrPixmapMaskFree(RrPixmapMask *m); RrPixmapMask *RrPixmapMaskCopy(const RrPixmapMask *src); -void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const Rect *area); +void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const RrRect *area); #endif diff --git a/render/render.c b/render/render.c index 96866923..5245d306 100644 --- a/render/render.c +++ b/render/render.c @@ -23,7 +23,7 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h) int i, transferred = 0, sw; RrPixel32 *source, *dest; Pixmap oldp; - Rect tarea; /* area in which to draw textures */ + RrRect tarea; /* area in which to draw textures */ gboolean resized; if (w <= 0 || h <= 0) return; diff --git a/render/render.h b/render/render.h index 56ec29f1..8a1eda12 100644 --- a/render/render.h +++ b/render/render.h @@ -166,6 +166,11 @@ RrColor *RrColorNew (const RrInstance *inst, gint r, gint g, gint b); RrColor *RrColorParse (const RrInstance *inst, gchar *colorname); void RrColorFree (RrColor *in); +gint RrColorRed (const RrColor *c); +gint RrColorGreen (const RrColor *c); +gint RrColorBlue (const RrColor *c); +gulong RrColorPixel (const RrColor *c); + RrAppearance *RrAppearanceNew (const RrInstance *inst, gint numtex); RrAppearance *RrAppearanceCopy (RrAppearance *a); void RrAppearanceFree (RrAppearance *a); -- 2.39.2