X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.h;h=3ddde716ee42b6ec8f0cfb8bc08a658f8ab267b8;hb=c0c06e3828981cacc96b27a87d7803f603241d15;hp=8469c69ee04c71a559b5d24e4a9a2dc35b86a07d;hpb=1e882b62718e4d6a4a149b415964646ad424fbfd;p=chaz%2Fopenbox

diff --git a/render/render.h b/render/render.h
index 8469c69e..3ddde716 100644
--- a/render/render.h
+++ b/render/render.h
@@ -1,9 +1,9 @@
 #ifndef __render_h
 #define __render_h
 
+#include <X11/Xlib.h> /* some platforms dont include this as needed for Xft */
 #define _XFT_NO_COMPAT_ /* no Xft 1 API */
 #include <X11/Xft/Xft.h>
-#include <X11/Xlib.h>
 #include <glib.h>
 
 typedef union  _RrTextureData      RrTextureData;
@@ -70,15 +70,12 @@ struct _RrSurface {
     RrAppearance *parent;
     gint parentx;
     gint parenty;
-    RrPixel32 *RrPixel_data;
+    RrPixel32 *pixel_data;
 };
 
 struct _RrTextureText {
     RrFont *font;
     RrJustify justify;
-    gint shadow;
-    gchar tint;
-    guchar offset;
     RrColor *color;
     gchar *string;
 };
@@ -130,19 +127,12 @@ 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
+/* these are the same on all endian machines because it seems to be dependant
+   on the endianness of the gfx card, not the cpu. */
 #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);
@@ -169,13 +159,17 @@ 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,
-                         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);