X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d6f6602d7cea3a7899990fe79216af7d98d05917..62b8a649fcae500c983215fac2e5202916c0195f:/lib/gdi/gpixmap.h

diff --git a/lib/gdi/gpixmap.h b/lib/gdi/gpixmap.h
index 048b73a5..d598fdbd 100644
--- a/lib/gdi/gpixmap.h
+++ b/lib/gdi/gpixmap.h
@@ -2,7 +2,7 @@
 #define __gpixmap_h
 
 #include <pthread.h>
-#include <lib/base/estring.h>
+#include <string>
 #include <lib/base/object.h>
 #include <lib/base/elock.h>
 #include <lib/gdi/erect.h>
@@ -23,16 +23,23 @@ struct gColor
 
 struct gRGB
 {
-	int b, g, r, a;
+	unsigned char b, g, r, a;
 	gRGB(int r, int g, int b, int a=0): b(b), g(g), r(r), a(a)
 	{
 	}
 	gRGB(unsigned long val): b(val&0xFF), g((val>>8)&0xFF), r((val>>16)&0xFF), a((val>>24)&0xFF)		// ARGB
 	{
 	}
-	gRGB()
+	gRGB(): b(0), g(0), r(0), a(0)
 	{
 	}
+	void operator=(unsigned long val)
+	{
+		b = val&0xFF;
+		g = (val>>8)&0xFF;
+		r = (val>>16)&0xFF;
+		a = (val>>24)&0xFF;
+	}
 	bool operator < (const gRGB &c) const
 	{
 		if (b < c.b)
@@ -74,40 +81,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 virtual iObject
-{
-DECLARE_REF;
-public:
-
-	eString 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 eString &family, int pointSize):
-			family(family), pointSize(pointSize)
-	{
-	}
-	
-	virtual ~gFont()
-	{
-	}
-	
-	gFont()
-		:pointSize(0)
-	{
-	}
-};
-
 struct gSurface
 {
 	int type;
@@ -124,9 +97,22 @@ struct gSurfaceSystem: gSurface
 	~gSurfaceSystem();
 };
 
-struct gPixmap: public iObject
+class gPixmap: public iObject
 {
-DECLARE_REF;
+private:
+DECLARE_REF(gPixmap);
+private:
+	friend class gDC;
+	void fill(const gRegion &clip, const gColor &color);
+	
+	enum
+	{
+		blitAlphaTest=1
+	};
+	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:
 	gSurface *surface;
 	
@@ -136,22 +122,13 @@ public:
 	gPixmap *lock();
 	void unlock();
 	
-	eSize getSize() const { return eSize(surface->x, surface->y); }
-	
-	void fill(const eRect &area, const gColor &color);
+	eSize size() const { return eSize(surface->x, surface->y); }
 	
-	enum
-	{
-		blitAlphaTest=1
-	};
-	void blit(const gPixmap &src, ePoint pos, const eRect &clip=eRect(), int flags=0);
-	
-	void mergePalette(const gPixmap &target);
-	void line(ePoint start, ePoint end, gColor color);
-	void finalLock();
 	gPixmap(gSurface *surface);
 	gPixmap(eSize, int bpp);
 	virtual ~gPixmap();
 };
 
+TEMPLATE_TYPEDEF(ePtr<gPixmap>, gPixmapPtr);
+
 #endif