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

diff --git a/otk/surface.hh b/otk/surface.hh
index 7a202491..40dfbf84 100644
--- a/otk/surface.hh
+++ b/otk/surface.hh
@@ -3,23 +3,41 @@
 #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 */
 
 class Surface {
   int _screen;
   Size _size;
+  pixel32 *_pixel_data;
   Pixmap _pixmap;
   XftDraw *_xftdraw;
 
@@ -36,9 +54,11 @@ 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; }
 
-  virtual Pixmap pixmap() const { return _pixmap; }
+  pixel32 *pixelData() { return _pixel_data; }
 
   // The RenderControl classes use the internal objects in this class to render
   // to it. Noone else needs them tho, so they are private.