remove test cruft, add possibility for a seperator

[enigma2.git] / lib / gdi / gpixmap.h

diff --git a/lib/gdi/gpixmap.h b/lib/gdi/gpixmap.h
index d598fdbd3786a9f78661f5a6917cad88d6ffec66..732ebf9a9f6f17b2a552852218bd4ee7a8e7ee4d 100644 (file)
--- a/lib/gdi/gpixmap.h
+++ b/lib/gdi/gpixmap.h
@@ -4,9 +4,11 @@
 #include <pthread.h>
 #include <string>
 #include <lib/base/object.h>
+#include <lib/base/smartptr.h>
 #include <lib/base/elock.h>
 #include <lib/gdi/erect.h>
 #include <lib/gdi/fb.h>
+#include <lib/gdi/region.h>
 
 struct gColor
 {
@@ -88,32 +90,28 @@ struct gSurface
        gPalette clut;
        
        void *data;
-       virtual ~gSurface();
-};
+       int data_phys;
+       int offset; // only for backbuffers
 
-struct gSurfaceSystem: gSurface
-{
-       gSurfaceSystem(eSize size, int bpp);
-       ~gSurfaceSystem();
+       gSurface();
+       gSurface(eSize size, int bpp, int accel);
+       ~gSurface();
 };
 
 class gPixmap: public iObject
 {
-private:
-DECLARE_REF(gPixmap);
-private:
-       friend class gDC;
-       void fill(const gRegion &clip, const gColor &color);
-       
+       DECLARE_REF(gPixmap);
+public:
        enum
        {
-               blitAlphaTest=1
+               blitAlphaTest=1,
+               blitAlphaBlend=2
        };
-       void blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flags=0);
-       
-       void mergePalette(const gPixmap &target);
-       void line(const gRegion &clip, ePoint start, ePoint end, gColor color);
-public:
+
+#ifndef SWIG
+       gPixmap(gSurface *surface);
+       gPixmap(eSize, int bpp, int accel = 0);
+
        gSurface *surface;
        
        eLock contentlock;
@@ -121,12 +119,24 @@ public:
        
        gPixmap *lock();
        void unlock();
+#endif
+       virtual ~gPixmap();
        
        eSize size() const { return eSize(surface->x, surface->y); }
        
-       gPixmap(gSurface *surface);
-       gPixmap(eSize, int bpp);
-       virtual ~gPixmap();
+private:
+#ifndef SWIG
+       friend class gDC;
+       void fill(const gRegion &clip, const gColor &color);
+       
+       void blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flags=0);
+       
+       void mergePalette(const gPixmap &target);
+       void line(const gRegion &clip, ePoint start, ePoint end, gColor color);
+#else
+       gPixmap();
+#endif
+
 };
 
 TEMPLATE_TYPEDEF(ePtr<gPixmap>, gPixmapPtr);