X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fsurface.hh;h=a44b9049740820e098fa5fb39cdf6deb9decabbc;hb=77a46782db2996c0bc662c0f6d191df7a39c2cce;hp=112bb39233f74ba30b50403b69239357e910c8f8;hpb=e6bfddf849009bef7bbb75be5147b4a533fa1ad2;p=chaz%2Fopenbox

diff --git a/otk/surface.hh b/otk/surface.hh
index 112bb392..a44b9049 100644
--- a/otk/surface.hh
+++ b/otk/surface.hh
@@ -2,24 +2,54 @@
 #ifndef __surface_hh
 #define __surface_hh
 
-#include "point.hh"
-#include "truerendercontrol.hh"
-#include "pseudorendercontrol.hh"
+#include "size.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;
-  Point _size;
+  Size _size;
+  pixel32 *_pixel_data;
   Pixmap _pixmap;
   XftDraw *_xftdraw;
 
@@ -31,16 +61,20 @@ protected:
   void setPixmap(const RenderColor &color);
   
 public:
-  Surface(int screen, const Point &size);
+  Surface(int screen, const Size &size);
   virtual ~Surface();
 
   inline int screen(void) const { return _screen; }
 
-  virtual const Point& size() const { return _size; }
-  virtual int width() const { return _size.x(); }
-  virtual int height() const { return _size.y(); }
+  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.