rename the 'root' context to 'desktop'

[chaz/openbox] / render / render.h

diff --git a/render/render.h b/render/render.h
index 8a1eda123168abe3474c984490e7254cbc2cddc3..3ddde716ee42b6ec8f0cfb8bc08a658f8ab267b8 100644 (file)
--- 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,7 +70,7 @@ struct _RrSurface {
     RrAppearance *parent;
     gint parentx;
     gint parenty;
-    RrPixel32 *RrPixel_data;
+    RrPixel32 *pixel_data;
 };
 
 struct _RrTextureText {
@@ -127,19 +127,12 @@ 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
+/* 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);