X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fsurface.hh;h=a44b9049740820e098fa5fb39cdf6deb9decabbc;hb=dca8c61a91cab29128a72f252b70f4bd9f7786ff;hp=7a202491f188392b5e0f5d7e354bf2ea6f6febb2;hpb=99cd843fc6dc7a7f55b6c90fd1162f233853aad2;p=chaz%2Fopenbox

diff --git a/otk/surface.hh b/otk/surface.hh
index 7a202491..a44b9049 100644
--- a/otk/surface.hh
+++ b/otk/surface.hh
@@ -3,23 +3,53 @@
 #define __surface_hh
 
 #include "size.hh"
-#include "truerendercontrol.hh"
-#include "pseudorendercontrol.hh"
 
 extern "C" {
 #include <X11/Xlib.h>
 #define _XFT_NO_COMPAT_ // no Xft 1 API
 #include <X11/Xft/Xft.h>
+
+#ifdef HAVE_STDINT_H
+#  include <stdint.h>
+#else
+#  ifdef HAVE_SYS_TYPES_H
+#    include <sys/types.h>
+#  endif
+#endif
 }
 
 namespace otk {
 
 class ScreenInfo;
 class RenderColor;
+class RenderControl;
+class TrueRenderControl;
+class PseudoRenderControl;
+
+#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 Surface {
   int _screen;
   Size _size;
+  pixel32 *_pixel_data;
   Pixmap _pixmap;
   XftDraw *_xftdraw;
 
@@ -36,9 +66,15 @@ public:
 
   inline int screen(void) const { return _screen; }
 
-  virtual const Size& size() const { return _size; }
+  const Size& size() const { return _size; }
+
+  Pixmap pixmap() const { return _pixmap; }
+
+  pixel32 *pixelData() { return _pixel_data; }
 
-  virtual Pixmap pixmap() const { return _pixmap; }
+  //! Frees the pixel data when it will no longer be needed. Only do this once
+  //! you have completed rendering onto the surface.
+  void freePixelData();
 
   // The RenderControl classes use the internal objects in this class to render
   // to it. Noone else needs them tho, so they are private.