X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cff3511b75d95143bcd315ade417a41aa1d8316e..eabe6b3063866f8e32eb2aed0131d5de498f1c8c:/lib/gdi/grc.h

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 57d3dce4..3b8201ad 100644
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -22,8 +22,8 @@
 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/region.h>
 #include <lib/gdi/gfont.h>
+#include <lib/gdi/compositing.h>
 
-#ifndef SWIG
 class eTextPara;
 
 class gDC;
@@ -61,7 +61,9 @@ struct gOpcode
 		
 		enableSpinner, disableSpinner, incrementSpinner,
 		
-		shutdown
+		shutdown,
+		
+		setCompositing,
 	} opcode;
 
 	gDC *dc;
@@ -103,8 +105,8 @@ struct gOpcode
 		struct pblit
 		{
 			gPixmap *pixmap;
-			ePoint position;
 			int flags;
+			eRect position;
 			eRect clip;
 		} *blit;
 
@@ -138,6 +140,8 @@ struct gOpcode
 			ePoint value;
 			int rel;
 		} *setOffset;
+		
+		gCompositingData *setCompositing;
 	} parm;
 };
 
@@ -146,8 +150,7 @@ struct gOpcode
 		/* gRC is the singleton which controls the fifo and dispatches commands */
 class gRC: public iObject, public Object
 {
-DECLARE_REF(gRC);
-private:
+	DECLARE_REF(gRC);
 	friend class gPainter;
 	static gRC *instance;
 
@@ -170,7 +173,10 @@ private:
 	
 	void enableSpinner();
 	void disableSpinner();
+	
+	ePtr<gCompositingData> m_compositing;
 
+	int m_prev_idle_count;
 public:
 	gRC();
 	virtual ~gRC();
@@ -231,10 +237,13 @@ public:
 
 	enum
 	{
-		BT_ALPHATEST = 1
+		BT_ALPHATEST = 1,
+		BT_ALPHABLEND = 2,
+		BT_SCALE = 4 /* will be automatically set by blitScale */
 	};
 
-	void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
+	void blit(gPixmap *pixmap, ePoint pos, const eRect &clip=eRect(), int flags=0);
+	void blitScale(gPixmap *pixmap, const eRect &pos, const eRect &clip=eRect(), int flags=0, int aflags = BT_SCALE);
 
 	void setPalette(gRGB *colors, int start=0, int len=256);
 	void setPalette(gPixmap *source);
@@ -250,18 +259,17 @@ public:
 	void clip(const gRegion &clip);
 	void clippop();
 
-	void flush();
-	
 	void waitVSync();
 	void flip();
 	void notify();
+	void setCompositing(gCompositingData *comp);
+	
+	void flush();
 };
-#endif
 
 class gDC: public iObject
 {
-DECLARE_REF(gDC);
-#ifndef SWIG
+	DECLARE_REF(gDC);
 protected:
 	ePtr<gPixmap> m_pixmap;
 
@@ -279,9 +287,6 @@ protected:
 	int m_spinner_num, m_spinner_i;
 public:
 	virtual void exec(gOpcode *opcode);
-#else
-public:
-#endif
 	gDC(gPixmap *pixmap);
 	gDC();
 	virtual ~gDC();