X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.h;h=4fe7db1ad1402126d35be2736a8983d18f532c38;hb=a12e73cf3741f91d9188bacbcc7733d5948c8156;hp=0e34c1973b7d69bea8536f3aee8a06f776890e89;hpb=dbe2851b910dcdb02afbb744dbb2926286ab8f65;p=chaz%2Fopenbox

diff --git a/render/render.h b/render/render.h
index 0e34c197..4fe7db1a 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 RrDefaultRedOffset 0
+#define RrDefaultGreenOffset 8
+#define RrDefaultBlueOffset 16
+#define RrDefaultAlphaOffset 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);
 
@@ -161,9 +170,8 @@ RrAppearance *RrAppearanceNew  (const RrInstance *inst, gint numtex);
 RrAppearance *RrAppearanceCopy (RrAppearance *a);
 void          RrAppearanceFree (RrAppearance *a);
 
-int RrFontMeasureString (const RrFont *f, const gchar *str,
-                         gint shadow, gint offset);
-int RrFontHeight        (const RrFont *f, gint shadow, gint offset);
+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);