kill some whitespace

[chaz/openbox] / otk / surface.hh

diff --git a/otk/surface.hh b/otk/surface.hh
index 7289b14aaebac8bd7a1c13bc987b51f8dd298eed..a44b9049740820e098fa5fb39cdf6deb9decabbc 100644 (file)
--- a/otk/surface.hh
+++ b/otk/surface.hh
@@ -2,30 +2,85 @@
 #ifndef __surface_hh
 #define __surface_hh
 
-#include "point.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 {
-  Point _size;
-  Pixmap _pm;
+  int _screen;
+  Size _size;
+  pixel32 *_pixel_data;
+  Pixmap _pixmap;
+  XftDraw *_xftdraw;
 
 protected:
-  Surface();
-  Surface(const Point &size);
-
-  virtual void setSize(int w, int h);
+  void createObjects();
+  void destroyObjects();
 
+  void setPixmap(XImage *image);
+  void setPixmap(const RenderColor &color);
+  
 public:
+  Surface(int screen, const Size &size);
   virtual ~Surface();
 
-  virtual const Point& size() const { return _size; }
-  virtual int width() const { return _size.x(); }
-  virtual int height() const { return _size.y(); }
+  inline int screen(void) const { return _screen; }
+
+  const Size& size() const { return _size; }
+
+  Pixmap pixmap() const { return _pixmap; }
+
+  pixel32 *pixelData() { return _pixel_data; }
+
+  //! 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.
+  friend class RenderControl;
+  friend class TrueRenderControl;
+  friend class PseudoRenderControl;
 };
 
 }