X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/dba614edd2aad3c17e244914eaef3809d8300cb1..06578d6778bff8aa2bd6a2387651dd0ba55aa27c:/lib/gdi/gpixmap.h

diff --git a/lib/gdi/gpixmap.h b/lib/gdi/gpixmap.h
index 396d92b7..e3798bf7 100644
--- a/lib/gdi/gpixmap.h
+++ b/lib/gdi/gpixmap.h
@@ -4,23 +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>
 
-struct gColor
-{
-	int color;
-	gColor(int color): color(color)
-	{
-	}
-	gColor(): color(0)
-	{
-	}
-	operator int() const { return color; }
-	bool operator==(const gColor &o) const { return o.color==color; }
-};
-
 struct gRGB
 {
 	unsigned char b, g, r, a;
@@ -33,6 +21,12 @@ struct gRGB
 	gRGB(): b(0), g(0), r(0), a(0)
 	{
 	}
+
+	unsigned long argb() const
+	{
+		return (a<<24)|(r<<16)|(g<<8)|b;
+	}
+
 	void operator=(unsigned long val)
 	{
 		b = val&0xFF;
@@ -64,6 +58,20 @@ struct gRGB
 	}
 };
 
+#ifndef SWIG
+struct gColor
+{
+	int color;
+	gColor(int color): color(color)
+	{
+	}
+	gColor(): color(0)
+	{
+	}
+	operator int() const { return color; }
+	bool operator==(const gColor &o) const { return o.color==color; }
+};
+
 struct gPalette
 {
 	int start, colors;
@@ -81,40 +89,6 @@ struct gLookup
 	void build(int size, const gPalette &pal, const gRGB &start, const gRGB &end);
 };
 
-/**
- * \brief A softreference to a font.
- *
- * The font is specified by a name and a size.
- * \c gFont is part of the \ref gdi.
- */
-class gFont: public iObject
-{
-DECLARE_REF(gFont);
-public:
-
-	std::string family;
-	int pointSize;
-	
-	/**
-	 * \brief Constructs a font with the given name and size.
-	 * \param family The name of the font, for example "NimbusSansL-Regular Sans L Regular".
-	 * \param pointSize the size of the font in PIXELS.
-	 */
-	gFont(const std::string &family, int pointSize):
-			family(family), pointSize(pointSize)
-	{
-	}
-	
-	virtual ~gFont()
-	{
-	}
-	
-	gFont()
-		:pointSize(0)
-	{
-	}
-};
-
 struct gSurface
 {
 	int type;
@@ -122,31 +96,32 @@ 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();
 };
+#endif
+
+class gRegion;
 
-struct gPixmap: public iObject
+SWIG_IGNORE(gPixmap);
+class gPixmap: public iObject
 {
-DECLARE_REF(gPixmap);
-private:
-	friend class gDC;
-	void fill(const gRegion &clip, const gColor &color);
-	
+	DECLARE_REF(gPixmap);
+public:
+#ifndef SWIG
 	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:
+
+	gPixmap(gSurface *surface);
+	gPixmap(eSize, int bpp, int accel = 0);
+
 	gSurface *surface;
 	
 	eLock contentlock;
@@ -154,12 +129,24 @@ public:
 	
 	gPixmap *lock();
 	void unlock();
+	inline bool needClut() const { return surface && surface->bpp <= 8; }
+#endif
+	virtual ~gPixmap();
+	eSize size() const { return eSize(surface->x, surface->y); }
+private:
+	bool must_delete_surface;
+	friend class gDC;
+	void fill(const gRegion &clip, const gColor &color);
+	void fill(const gRegion &clip, const gRGB &color);
 	
-	eSize getSize() const { return eSize(surface->x, surface->y); }
+	void blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flags=0);
 	
-	gPixmap(gSurface *surface);
-	gPixmap(eSize, int bpp);
-	virtual ~gPixmap();
+	void mergePalette(const gPixmap &target);
+	void line(const gRegion &clip, ePoint start, ePoint end, gColor color);
+#ifdef SWIG
+	gPixmap();
+#endif
 };
+SWIG_TEMPLATE_TYPEDEF(ePtr<gPixmap>, gPixmapPtr);
 
 #endif