store the pixel32 data in the surface so it can be reused

[chaz/openbox] / otk / truerendercontrol.hh

diff --git a/otk/truerendercontrol.hh b/otk/truerendercontrol.hh
index 3a5d3e5aa3847e8ce54f297e54e6e0f7e2205ffb..e0a0b31bc8fe75d45fc80280430914093dc85237 100644 (file)
--- a/otk/truerendercontrol.hh
+++ b/otk/truerendercontrol.hh
@@ -4,38 +4,20 @@
 
 #include "rendercontrol.hh"
 
-extern "C" {
-
-#ifdef HAVE_STDINT_H
-#  include <stdint.h>
-#else
-#  ifdef HAVE_SYS_TYPES_H
-#    include <sys/types.h>
-#  endif
-#endif
-
-}
-
 #include <vector>
 
 namespace otk {
 
-#ifdef HAVE_STDINT_H
-typedef uint32_t pixel32;
-typedef uint16_t pixel16;
-#else
-typedef u_int32_t pixel32;
-typedef u_int16_t pixel16;
-#endif /* HAVE_STDINT_H */
-
 #ifdef WORDS_BIGENDIAN
 const int default_red_shift=0;
 const int default_green_shift=8;
 const int default_blue_shift=16;
+const int endian=MSBFirst;
 #else
 const int default_red_shift=16;
 const int default_green_shift=8;
 const int default_blue_shift=0;
+const int endian=LSBFirst;
 #endif /* WORDS_BIGENDIAN */
 
 class TrueRenderControl : public RenderControl {
@@ -51,22 +33,19 @@ private:
   int _green_offset;
   int _blue_offset;
 
+  inline void highlight(pixel32 *x, pixel32 *y, bool raised) const;
+  void reduceDepth(Surface &sf, XImage *im) const;
+  void verticalGradient(Surface &sf, const RenderTexture &texture) const;
+  void diagonalGradient(Surface &sf, const RenderTexture &texture) const;
+  void crossDiagonalGradient(Surface &sf, const RenderTexture &texture) const;
+  virtual void drawGradientBackground(Surface &sf,
+                                      const RenderTexture &texture) const;
+  
 public:
   TrueRenderControl(int screen);
   virtual ~TrueRenderControl();
 
   virtual void drawBackground(Surface& sf, const RenderTexture &texture) const;
-  virtual void drawGradientBackground(Surface &sf,
-                                      const RenderTexture &texture) const;
-
-  inline void highlight(pixel32 *x, pixel32 *y, bool raised) const;
-  void reduceDepth(XImage *im, pixel32 *data) const;
-  void verticalGradient(Surface &sf, const RenderTexture &texture,
-                        pixel32 *data) const;
-  void diagonalGradient(Surface &sf, const RenderTexture &texture,
-                        pixel32 *data) const;
-  void crossDiagonalGradient(Surface &sf, const RenderTexture &texture,
-                        pixel32 *data) const;
 };
 
 }