X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.h;h=8a1eda123168abe3474c984490e7254cbc2cddc3;hb=5be23ec5a4dcacb8b1adf1d352ad5600f426f3ed;hp=30bf484698e8ae3cc021f0cd4c002b891926c36c;hpb=092616de9a809a1c9a646901521ffcc1f337e913;p=chaz%2Fopenbox

diff --git a/render/render.h b/render/render.h
index 30bf4846..8a1eda12 100644
--- a/render/render.h
+++ b/render/render.h
@@ -40,8 +40,6 @@ typedef enum {
     RR_SURFACE_VERTICAL,
     RR_SURFACE_DIAGONAL,
     RR_SURFACE_CROSS_DIAGONAL,
-    RR_SURFACE_PIPECROSS,
-    RR_SURFACE_RECTANGLE,
     RR_SURFACE_PYRAMID
 } RrSurfaceColorType;
 
@@ -78,9 +76,6 @@ struct _RrSurface {
 struct _RrTextureText {
     RrFont *font;
     RrJustify justify;
-    gint shadow;
-    gchar tint;
-    guchar offset;
     RrColor *color;
     gchar *string;
 };
@@ -132,6 +127,20 @@ struct _RrAppearance {
     gint w, h;
 };
 
+#if (G_BYTE_ORDER == G_BIG_ENDIAN)
+#define RrDefaultAlphaOffset 0
+#define RrDefaultRedOffset 8
+#define RrDefaultGreenOffset 16
+#define RrDefaultBlueOffset 24
+#define RrEndian MSBFirst  
+#else
+#define RrDefaultAlphaOffset 24
+#define RrDefaultRedOffset 16
+#define RrDefaultGreenOffset 8
+#define RrDefaultBlueOffset 0
+#define RrEndian LSBFirst
+#endif /* G_BYTE_ORDER == G_BIG_ENDIAN */
+
 RrInstance* RrInstanceNew (Display *display, gint screen);
 void        RrInstanceFree (RrInstance *inst);
 
@@ -157,10 +166,19 @@ 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);
 
+int RrFontMeasureString (const RrFont *f, const gchar *str);
+int RrFontHeight        (const RrFont *f);
+int RrFontMaxCharWidth  (const RrFont *f);
+
 void RrPaint   (RrAppearance *l, Window win, gint w, gint h);
 void RrMinsize (RrAppearance *l, gint *w, gint *h);